mirror of
https://github.com/JKorf/CryptoExchange.Net
synced 2025-07-18 07:25:50 +00:00
Compare commits
No commits in common. "master" and "7.2.0" have entirely different histories.
2
.github/workflows/dotnet.yml
vendored
2
.github/workflows/dotnet.yml
vendored
@ -16,7 +16,7 @@ jobs:
|
|||||||
- name: Setup .NET
|
- name: Setup .NET
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: 9.0.x
|
dotnet-version: 6.0.x
|
||||||
- name: Restore dependencies
|
- name: Restore dependencies
|
||||||
run: dotnet restore
|
run: dotnet restore
|
||||||
- name: Build
|
- name: Build
|
||||||
|
|||||||
@ -1,530 +0,0 @@
|
|||||||
using CryptoExchange.Net.Converters.MessageParsing;
|
|
||||||
using CryptoExchange.Net.Interfaces;
|
|
||||||
using CryptoExchange.Net.Objects;
|
|
||||||
using ProtoBuf;
|
|
||||||
using ProtoBuf.Meta;
|
|
||||||
using System;
|
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
using System.IO;
|
|
||||||
using System.Runtime.InteropServices.ComTypes;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.Protobuf
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// System.Text.Json message accessor
|
|
||||||
/// </summary>
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
public abstract class ProtobufMessageAccessor<
|
|
||||||
[DynamicallyAccessedMembers(
|
|
||||||
#if NET8_0_OR_GREATER
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicConstructors |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicProperties |
|
|
||||||
#endif
|
|
||||||
DynamicallyAccessedMemberTypes.PublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicMethods |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicMethods
|
|
||||||
)]
|
|
||||||
TIntermediateType> : IMessageAccessor
|
|
||||||
#else
|
|
||||||
public abstract class ProtobufMessageAccessor<TIntermediateType> : IMessageAccessor
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// The intermediate deserialization object
|
|
||||||
/// </summary>
|
|
||||||
protected TIntermediateType? _intermediateType;
|
|
||||||
/// <summary>
|
|
||||||
/// Runtime type model
|
|
||||||
/// </summary>
|
|
||||||
protected RuntimeTypeModel _model;
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public bool IsValid { get; set; }
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public abstract bool OriginalDataAvailable { get; }
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public object? Underlying => _intermediateType;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
public ProtobufMessageAccessor(RuntimeTypeModel model)
|
|
||||||
{
|
|
||||||
_model = model;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public NodeType? GetNodeType()
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public NodeType? GetNodeType(MessagePath path)
|
|
||||||
{
|
|
||||||
if (_intermediateType == null)
|
|
||||||
throw new InvalidOperationException("Data not read");
|
|
||||||
|
|
||||||
object? value = _intermediateType;
|
|
||||||
foreach (var step in path)
|
|
||||||
{
|
|
||||||
if (value == null)
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (step.Type == 0)
|
|
||||||
{
|
|
||||||
// array index
|
|
||||||
}
|
|
||||||
else if (step.Type == 1)
|
|
||||||
{
|
|
||||||
// property value
|
|
||||||
#pragma warning disable IL2075 // Type is already annotated
|
|
||||||
value = value.GetType().GetProperty(step.Property!)?.GetValue(value);
|
|
||||||
#pragma warning restore
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// property name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (value == null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
var valueType = value.GetType();
|
|
||||||
if (valueType.IsArray)
|
|
||||||
return NodeType.Array;
|
|
||||||
|
|
||||||
if (IsSimple(valueType))
|
|
||||||
return NodeType.Value;
|
|
||||||
|
|
||||||
return NodeType.Object;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static bool IsSimple(Type type)
|
|
||||||
{
|
|
||||||
if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
|
|
||||||
{
|
|
||||||
// nullable type, check if the nested type is simple.
|
|
||||||
return IsSimple(type.GetGenericArguments()[0]);
|
|
||||||
}
|
|
||||||
return type.IsPrimitive
|
|
||||||
|| type.IsEnum
|
|
||||||
|| type == typeof(string)
|
|
||||||
|| type == typeof(decimal);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2075:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
public T? GetValue<T>(MessagePath path)
|
|
||||||
{
|
|
||||||
if (_intermediateType == null)
|
|
||||||
throw new InvalidOperationException("Data not read");
|
|
||||||
|
|
||||||
object? value = _intermediateType;
|
|
||||||
foreach(var step in path)
|
|
||||||
{
|
|
||||||
if (value == null)
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (step.Type == 0)
|
|
||||||
{
|
|
||||||
// array index
|
|
||||||
}
|
|
||||||
else if (step.Type == 1)
|
|
||||||
{
|
|
||||||
// property value
|
|
||||||
#pragma warning disable IL2075 // Type is already annotated
|
|
||||||
value = value.GetType().GetProperty(step.Property!)?.GetValue(value);
|
|
||||||
#pragma warning restore
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// property name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (T?)value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public T?[]? GetValues<T>(MessagePath path)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public abstract string GetOriginalString();
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public abstract void Clear();
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
public abstract CallResult<object> Deserialize(
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[DynamicallyAccessedMembers(
|
|
||||||
#if NET8_0_OR_GREATER
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicConstructors |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicConstructors |
|
|
||||||
#endif
|
|
||||||
DynamicallyAccessedMemberTypes.PublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicMethods |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicMethods
|
|
||||||
)]
|
|
||||||
#endif
|
|
||||||
Type type, MessagePath? path = null);
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
public abstract CallResult<T> Deserialize<
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[DynamicallyAccessedMembers(
|
|
||||||
#if NET8_0_OR_GREATER
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicConstructors |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicConstructors |
|
|
||||||
#endif
|
|
||||||
DynamicallyAccessedMemberTypes.PublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicMethods |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicMethods
|
|
||||||
)]
|
|
||||||
#endif
|
|
||||||
T>(MessagePath? path = null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// System.Text.Json stream message accessor
|
|
||||||
/// </summary>
|
|
||||||
public class ProtobufStreamMessageAccessor<
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[DynamicallyAccessedMembers(
|
|
||||||
#if NET8_0_OR_GREATER
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicConstructors |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicConstructors |
|
|
||||||
#endif
|
|
||||||
DynamicallyAccessedMemberTypes.PublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicMethods |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicMethods
|
|
||||||
)]
|
|
||||||
#endif
|
|
||||||
TIntermediate> : ProtobufMessageAccessor<TIntermediate>, IStreamMessageAccessor
|
|
||||||
{
|
|
||||||
private Stream? _stream;
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override bool OriginalDataAvailable => _stream?.CanSeek == true;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
public ProtobufStreamMessageAccessor(RuntimeTypeModel model) : base(model)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
public override CallResult<object> Deserialize(
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[DynamicallyAccessedMembers(
|
|
||||||
#if NET8_0_OR_GREATER
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicConstructors |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicConstructors |
|
|
||||||
#endif
|
|
||||||
DynamicallyAccessedMemberTypes.PublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicMethods |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicMethods
|
|
||||||
)]
|
|
||||||
#endif
|
|
||||||
Type type, MessagePath? path = null)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var result = _model.Deserialize(type, _stream);
|
|
||||||
return new CallResult<object>(result);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
return new CallResult<object>(new DeserializeError(ex.Message));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
public override CallResult<T> Deserialize<
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[DynamicallyAccessedMembers(
|
|
||||||
#if NET8_0_OR_GREATER
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicConstructors |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicConstructors |
|
|
||||||
#endif
|
|
||||||
DynamicallyAccessedMemberTypes.PublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicMethods |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicMethods
|
|
||||||
)]
|
|
||||||
#endif
|
|
||||||
T>(MessagePath? path = null)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var result = _model.Deserialize<T>(_stream);
|
|
||||||
return new CallResult<T>(result);
|
|
||||||
}
|
|
||||||
catch(Exception ex)
|
|
||||||
{
|
|
||||||
return new CallResult<T>(new DeserializeError(ex.ToLogString()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task<CallResult> Read(Stream stream, bool bufferStream)
|
|
||||||
{
|
|
||||||
if (bufferStream && stream is not MemoryStream)
|
|
||||||
{
|
|
||||||
// We need to be buffer the stream, and it's not currently a seekable stream, so copy it to a new memory stream
|
|
||||||
_stream = new MemoryStream();
|
|
||||||
stream.CopyTo(_stream);
|
|
||||||
_stream.Position = 0;
|
|
||||||
}
|
|
||||||
else if (bufferStream)
|
|
||||||
{
|
|
||||||
// We need to buffer the stream, and the current stream is seekable, store as is
|
|
||||||
_stream = stream;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// We don't need to buffer the stream, so don't bother keeping the reference
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
_intermediateType = _model.Deserialize<TIntermediate>(_stream);
|
|
||||||
IsValid = true;
|
|
||||||
return Task.FromResult(CallResult.SuccessResult);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
// Not a json message
|
|
||||||
IsValid = false;
|
|
||||||
return Task.FromResult(new CallResult(new DeserializeError("ProtoBufError: " + ex.Message, ex)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override string GetOriginalString()
|
|
||||||
{
|
|
||||||
if (_stream is null)
|
|
||||||
throw new NullReferenceException("Stream not initialized");
|
|
||||||
|
|
||||||
_stream.Position = 0;
|
|
||||||
using var textReader = new StreamReader(_stream, Encoding.UTF8, false, 1024, true);
|
|
||||||
return textReader.ReadToEnd();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void Clear()
|
|
||||||
{
|
|
||||||
_stream?.Dispose();
|
|
||||||
_stream = null;
|
|
||||||
_intermediateType = default;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Protobuf byte message accessor
|
|
||||||
/// </summary>
|
|
||||||
public class ProtobufByteMessageAccessor<
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[DynamicallyAccessedMembers(
|
|
||||||
#if NET8_0_OR_GREATER
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicConstructors |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicConstructors |
|
|
||||||
#endif
|
|
||||||
DynamicallyAccessedMemberTypes.PublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicMethods |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicMethods
|
|
||||||
)]
|
|
||||||
#endif
|
|
||||||
TIntermediate> : ProtobufMessageAccessor<TIntermediate>, IByteMessageAccessor
|
|
||||||
{
|
|
||||||
private ReadOnlyMemory<byte> _bytes;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
public ProtobufByteMessageAccessor(RuntimeTypeModel model) : base(model)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
public override CallResult<object> Deserialize(
|
|
||||||
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[DynamicallyAccessedMembers(
|
|
||||||
#if NET8_0_OR_GREATER
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicConstructors |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicConstructors |
|
|
||||||
#endif
|
|
||||||
DynamicallyAccessedMemberTypes.PublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicMethods |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicMethods
|
|
||||||
)]
|
|
||||||
#endif
|
|
||||||
Type type, MessagePath? path = null)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
using var stream = new MemoryStream(_bytes.ToArray());
|
|
||||||
stream.Position = 0;
|
|
||||||
var result = _model.Deserialize(type, stream);
|
|
||||||
return new CallResult<object>(result);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
return new CallResult<object>(new DeserializeError(ex.ToLogString()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
public override CallResult<T> Deserialize<
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[DynamicallyAccessedMembers(
|
|
||||||
#if NET8_0_OR_GREATER
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicConstructors |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicConstructors |
|
|
||||||
#endif
|
|
||||||
DynamicallyAccessedMemberTypes.PublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicMethods |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicMethods
|
|
||||||
)]
|
|
||||||
T>(MessagePath? path = null)
|
|
||||||
#else
|
|
||||||
public override CallResult<T> Deserialize<T>(MessagePath? path = null)
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var result = _model.Deserialize<T>(_bytes);
|
|
||||||
return new CallResult<T>(result);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
return new CallResult<T>(new DeserializeError(ex.Message));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public CallResult Read(ReadOnlyMemory<byte> data)
|
|
||||||
{
|
|
||||||
_bytes = data;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
_intermediateType = _model.Deserialize<TIntermediate>(data);
|
|
||||||
IsValid = true;
|
|
||||||
return CallResult.SuccessResult;
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
// Not a json message
|
|
||||||
IsValid = false;
|
|
||||||
return new CallResult(new DeserializeError("ProtobufError: " + ex.Message, ex));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override string GetOriginalString() =>
|
|
||||||
// NetStandard 2.0 doesn't support GetString from a ReadonlySpan<byte>, so use ToArray there instead
|
|
||||||
#if NETSTANDARD2_0
|
|
||||||
Encoding.UTF8.GetString(_bytes.ToArray());
|
|
||||||
#else
|
|
||||||
Encoding.UTF8.GetString(_bytes.Span);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override bool OriginalDataAvailable => true;
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void Clear()
|
|
||||||
{
|
|
||||||
_bytes = null;
|
|
||||||
_intermediateType = default;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
using CryptoExchange.Net.Interfaces;
|
|
||||||
using ProtoBuf.Meta;
|
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
using System.IO;
|
|
||||||
using System.Reflection;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.Protobuf
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public class ProtobufMessageSerializer : IByteMessageSerializer
|
|
||||||
{
|
|
||||||
private RuntimeTypeModel _model;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
public ProtobufMessageSerializer(RuntimeTypeModel model)
|
|
||||||
{
|
|
||||||
_model = model;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
public byte[] Serialize<
|
|
||||||
[DynamicallyAccessedMembers(
|
|
||||||
#if NET8_0_OR_GREATER
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicConstructors |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicFields |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicProperties |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicConstructors |
|
|
||||||
#endif
|
|
||||||
DynamicallyAccessedMemberTypes.PublicNestedTypes |
|
|
||||||
DynamicallyAccessedMemberTypes.NonPublicMethods |
|
|
||||||
DynamicallyAccessedMemberTypes.PublicMethods
|
|
||||||
)]
|
|
||||||
T>(T message)
|
|
||||||
#else
|
|
||||||
public byte[] Serialize<T>(T message)
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
using var memoryStream = new MemoryStream();
|
|
||||||
_model.Serialize(memoryStream, message);
|
|
||||||
return memoryStream.ToArray();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<PackageId>CryptoExchange.Net.Protobuf</PackageId>
|
|
||||||
<Authors>JKorf</Authors>
|
|
||||||
<Description>Protobuf support for CryptoExchange.Net</Description>
|
|
||||||
<PackageVersion>9.2.0</PackageVersion>
|
|
||||||
<AssemblyVersion>9.2.0</AssemblyVersion>
|
|
||||||
<FileVersion>9.2.0</FileVersion>
|
|
||||||
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
|
||||||
<PackageTags>CryptoExchange;CryptoExchange.Net</PackageTags>
|
|
||||||
<RepositoryType>git</RepositoryType>
|
|
||||||
<RepositoryUrl>https://github.com/JKorf/CryptoExchange.Net.git</RepositoryUrl>
|
|
||||||
<PackageProjectUrl>https://github.com/JKorf/CryptoExchange.Net/tree/master/CryptoExchange.Net.Protobuf</PackageProjectUrl>
|
|
||||||
<NeutralLanguage>en</NeutralLanguage>
|
|
||||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
|
||||||
<PackageIcon>icon.png</PackageIcon>
|
|
||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
|
||||||
<PackageReleaseNotes>https://github.com/JKorf/CryptoExchange.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<LangVersion>12.0</LangVersion>
|
|
||||||
<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="CryptoExchange.Net" Version="9.2.0" />
|
|
||||||
<PackageReference Include="protobuf-net" Version="3.2.52" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@ -1,128 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<doc>
|
|
||||||
<assembly>
|
|
||||||
<name>CryptoExchange.Net.Protobuf</name>
|
|
||||||
</assembly>
|
|
||||||
<members>
|
|
||||||
<member name="T:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1">
|
|
||||||
<summary>
|
|
||||||
System.Text.Json message accessor
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="F:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1._intermediateType">
|
|
||||||
<summary>
|
|
||||||
The intermediate deserialization object
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="F:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1._model">
|
|
||||||
<summary>
|
|
||||||
Runtime type model
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.IsValid">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="P:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.OriginalDataAvailable">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="P:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.Underlying">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.#ctor(ProtoBuf.Meta.RuntimeTypeModel)">
|
|
||||||
<summary>
|
|
||||||
ctor
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.GetNodeType">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.GetNodeType(CryptoExchange.Net.Converters.MessageParsing.MessagePath)">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.GetValue``1(CryptoExchange.Net.Converters.MessageParsing.MessagePath)">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.GetValues``1(CryptoExchange.Net.Converters.MessageParsing.MessagePath)">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.GetOriginalString">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.Clear">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.Deserialize(System.Type,System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.Deserialize``1(System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="T:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1">
|
|
||||||
<summary>
|
|
||||||
System.Text.Json stream message accessor
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.OriginalDataAvailable">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.#ctor(ProtoBuf.Meta.RuntimeTypeModel)">
|
|
||||||
<summary>
|
|
||||||
ctor
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.Deserialize(System.Type,System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.Deserialize``1(System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.Read(System.IO.Stream,System.Boolean)">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.GetOriginalString">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.Clear">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="T:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1">
|
|
||||||
<summary>
|
|
||||||
Protobuf byte message accessor
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.#ctor(ProtoBuf.Meta.RuntimeTypeModel)">
|
|
||||||
<summary>
|
|
||||||
ctor
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.Deserialize(System.Type,System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.Deserialize``1(System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.Read(System.ReadOnlyMemory{System.Byte})">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.GetOriginalString">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="P:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.OriginalDataAvailable">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.Clear">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="T:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageSerializer">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageSerializer.#ctor(ProtoBuf.Meta.RuntimeTypeModel)">
|
|
||||||
<summary>
|
|
||||||
ctor
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageSerializer.Serialize``1(``0)">
|
|
||||||
<inheritdoc />
|
|
||||||
</member>
|
|
||||||
</members>
|
|
||||||
</doc>
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
#  CryptoExchange.Net.Proto
|
|
||||||
|
|
||||||
[](https://github.com/JKorf/CryptoExchange.Net/actions/workflows/dotnet.yml) [](https://www.nuget.org/packages/CryptoExchange.Net.Protobuf) 
|
|
||||||
|
|
||||||
Protobuf support for CryptoExchange.Net.
|
|
||||||
|
|
||||||
## Release notes
|
|
||||||
* Version 9.2.0 - 14 Jul 2025
|
|
||||||
* Initial release
|
|
||||||
@ -106,7 +106,6 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
for(var i = 1; i <= 10; i++)
|
for(var i = 1; i <= 10; i++)
|
||||||
{
|
{
|
||||||
evnt.Set();
|
evnt.Set();
|
||||||
await Task.Delay(1); // Wait for the continuation.
|
|
||||||
Assert.That(10 - i == waiters.Count(w => w.Status != TaskStatus.RanToCompletion));
|
Assert.That(10 - i == waiters.Count(w => w.Status != TaskStatus.RanToCompletion));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -112,7 +112,7 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
{
|
{
|
||||||
var result = new WebCallResult<TestObjectResult>(
|
var result = new WebCallResult<TestObjectResult>(
|
||||||
System.Net.HttpStatusCode.OK,
|
System.Net.HttpStatusCode.OK,
|
||||||
new KeyValuePair<string, string[]>[0],
|
new List<KeyValuePair<string, IEnumerable<string>>>(),
|
||||||
TimeSpan.FromSeconds(1),
|
TimeSpan.FromSeconds(1),
|
||||||
null,
|
null,
|
||||||
"{}",
|
"{}",
|
||||||
@ -120,8 +120,7 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
"https://test.com/api",
|
"https://test.com/api",
|
||||||
null,
|
null,
|
||||||
HttpMethod.Get,
|
HttpMethod.Get,
|
||||||
new KeyValuePair<string, string[]>[0],
|
new List<KeyValuePair<string, IEnumerable<string>>>(),
|
||||||
ResultDataSource.Server,
|
|
||||||
new TestObjectResult(),
|
new TestObjectResult(),
|
||||||
null);
|
null);
|
||||||
var asResult = result.AsError<TestObject2>(new ServerError("TestError2"));
|
var asResult = result.AsError<TestObject2>(new ServerError("TestError2"));
|
||||||
@ -142,7 +141,7 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
{
|
{
|
||||||
var result = new WebCallResult<TestObjectResult>(
|
var result = new WebCallResult<TestObjectResult>(
|
||||||
System.Net.HttpStatusCode.OK,
|
System.Net.HttpStatusCode.OK,
|
||||||
new KeyValuePair<string, string[]>[0],
|
new List<KeyValuePair<string, IEnumerable<string>>>(),
|
||||||
TimeSpan.FromSeconds(1),
|
TimeSpan.FromSeconds(1),
|
||||||
null,
|
null,
|
||||||
"{}",
|
"{}",
|
||||||
@ -150,8 +149,7 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
"https://test.com/api",
|
"https://test.com/api",
|
||||||
null,
|
null,
|
||||||
HttpMethod.Get,
|
HttpMethod.Get,
|
||||||
new KeyValuePair<string, string[]>[0],
|
new List<KeyValuePair<string, IEnumerable<string>>>(),
|
||||||
ResultDataSource.Server,
|
|
||||||
new TestObjectResult(),
|
new TestObjectResult(),
|
||||||
null);
|
null);
|
||||||
var asResult = result.As<TestObject2>(result.Data.InnerData);
|
var asResult = result.As<TestObject2>(result.Data.InnerData);
|
||||||
|
|||||||
@ -1,15 +1,15 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"></PackageReference>
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0"></PackageReference>
|
||||||
<PackageReference Include="Moq" Version="4.20.72" />
|
<PackageReference Include="Moq" Version="4.20.70" />
|
||||||
<PackageReference Include="NUnit" Version="4.3.2"></PackageReference>
|
<PackageReference Include="NUnit" Version="4.1.0"></PackageReference>
|
||||||
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0"></PackageReference>
|
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0"></PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using NUnit.Framework.Legacy;
|
using NUnit.Framework.Legacy;
|
||||||
using System.Diagnostics;
|
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
|
||||||
namespace CryptoExchange.Net.UnitTests
|
namespace CryptoExchange.Net.UnitTests
|
||||||
@ -71,20 +70,5 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
var result = ExchangeHelpers.Normalize(input);
|
var result = ExchangeHelpers.Normalize(input);
|
||||||
Assert.That(expected == result.ToString(CultureInfo.InvariantCulture));
|
Assert.That(expected == result.ToString(CultureInfo.InvariantCulture));
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
|
||||||
[TestCase("123", "BKR", 32, true, "BKRJK123")]
|
|
||||||
[TestCase("123", "BKR", 32, false, "123")]
|
|
||||||
[TestCase("123123123123123123123123123123", "BKR", 32, true, "123123123123123123123123123123")] // 30
|
|
||||||
[TestCase("12312312312312312312312312312", "BKR", 32, true, "12312312312312312312312312312")] // 27
|
|
||||||
[TestCase("123123123123123123123123123", "BKR", 32, true, "BKRJK123123123123123123123123123")] // 25
|
|
||||||
[TestCase(null, "BKR", 32, true, null)]
|
|
||||||
public void ApplyBrokerIdTests(string clientOrderId, string brokerId, int maxLength, bool allowValueAdjustement, string expected)
|
|
||||||
{
|
|
||||||
var result = LibraryHelpers.ApplyBrokerId(clientOrderId, brokerId, maxLength, allowValueAdjustement);
|
|
||||||
|
|
||||||
if (expected != null)
|
|
||||||
Assert.That(result, Is.EqualTo(expected));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
248
CryptoExchange.Net.UnitTests/JsonNetConverterTests.cs
Normal file
248
CryptoExchange.Net.UnitTests/JsonNetConverterTests.cs
Normal file
@ -0,0 +1,248 @@
|
|||||||
|
using CryptoExchange.Net.Attributes;
|
||||||
|
using CryptoExchange.Net.Converters;
|
||||||
|
using CryptoExchange.Net.Converters.JsonNet;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using NUnit.Framework.Legacy;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.UnitTests
|
||||||
|
{
|
||||||
|
[TestFixture()]
|
||||||
|
public class JsonNetConverterTests
|
||||||
|
{
|
||||||
|
[TestCase("2021-05-12")]
|
||||||
|
[TestCase("20210512")]
|
||||||
|
[TestCase("210512")]
|
||||||
|
[TestCase("1620777600.000")]
|
||||||
|
[TestCase("1620777600000")]
|
||||||
|
[TestCase("2021-05-12T00:00:00.000Z")]
|
||||||
|
[TestCase("2021-05-12T00:00:00.000000000Z")]
|
||||||
|
[TestCase("0.000000", true)]
|
||||||
|
[TestCase("0", true)]
|
||||||
|
[TestCase("", true)]
|
||||||
|
[TestCase(" ", true)]
|
||||||
|
public void TestDateTimeConverterString(string input, bool expectNull = false)
|
||||||
|
{
|
||||||
|
var output = JsonConvert.DeserializeObject<TimeObject>($"{{ \"time\": \"{input}\" }}");
|
||||||
|
Assert.That(output.Time == (expectNull ? null: new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc)));
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase(1620777600.000)]
|
||||||
|
[TestCase(1620777600000d)]
|
||||||
|
public void TestDateTimeConverterDouble(double input)
|
||||||
|
{
|
||||||
|
var output = JsonConvert.DeserializeObject<TimeObject>($"{{ \"time\": {input} }}");
|
||||||
|
Assert.That(output.Time == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase(1620777600)]
|
||||||
|
[TestCase(1620777600000)]
|
||||||
|
[TestCase(1620777600000000)]
|
||||||
|
[TestCase(1620777600000000000)]
|
||||||
|
[TestCase(0, true)]
|
||||||
|
public void TestDateTimeConverterLong(long input, bool expectNull = false)
|
||||||
|
{
|
||||||
|
var output = JsonConvert.DeserializeObject<TimeObject>($"{{ \"time\": {input} }}");
|
||||||
|
Assert.That(output.Time == (expectNull ? null : new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc)));
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase(1620777600)]
|
||||||
|
[TestCase(1620777600.000)]
|
||||||
|
public void TestDateTimeConverterFromSeconds(double input)
|
||||||
|
{
|
||||||
|
var output = DateTimeConverter.ConvertFromSeconds(input);
|
||||||
|
Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestDateTimeConverterToSeconds()
|
||||||
|
{
|
||||||
|
var output = DateTimeConverter.ConvertToSeconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
|
||||||
|
Assert.That(output == 1620777600);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase(1620777600000)]
|
||||||
|
[TestCase(1620777600000.000)]
|
||||||
|
public void TestDateTimeConverterFromMilliseconds(double input)
|
||||||
|
{
|
||||||
|
var output = DateTimeConverter.ConvertFromMilliseconds(input);
|
||||||
|
Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestDateTimeConverterToMilliseconds()
|
||||||
|
{
|
||||||
|
var output = DateTimeConverter.ConvertToMilliseconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
|
||||||
|
Assert.That(output == 1620777600000);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase(1620777600000000)]
|
||||||
|
public void TestDateTimeConverterFromMicroseconds(long input)
|
||||||
|
{
|
||||||
|
var output = DateTimeConverter.ConvertFromMicroseconds(input);
|
||||||
|
Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestDateTimeConverterToMicroseconds()
|
||||||
|
{
|
||||||
|
var output = DateTimeConverter.ConvertToMicroseconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
|
||||||
|
Assert.That(output == 1620777600000000);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase(1620777600000000000)]
|
||||||
|
public void TestDateTimeConverterFromNanoseconds(long input)
|
||||||
|
{
|
||||||
|
var output = DateTimeConverter.ConvertFromNanoseconds(input);
|
||||||
|
Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestDateTimeConverterToNanoseconds()
|
||||||
|
{
|
||||||
|
var output = DateTimeConverter.ConvertToNanoseconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
|
||||||
|
Assert.That(output == 1620777600000000000);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase()]
|
||||||
|
public void TestDateTimeConverterNull()
|
||||||
|
{
|
||||||
|
var output = JsonConvert.DeserializeObject<TimeObject>($"{{ \"time\": null }}");
|
||||||
|
Assert.That(output.Time == null);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase(TestEnum.One, "1")]
|
||||||
|
[TestCase(TestEnum.Two, "2")]
|
||||||
|
[TestCase(TestEnum.Three, "three")]
|
||||||
|
[TestCase(TestEnum.Four, "Four")]
|
||||||
|
[TestCase(null, null)]
|
||||||
|
public void TestEnumConverterNullableGetStringTests(TestEnum? value, string expected)
|
||||||
|
{
|
||||||
|
var output = EnumConverter.GetString(value);
|
||||||
|
Assert.That(output == expected);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase(TestEnum.One, "1")]
|
||||||
|
[TestCase(TestEnum.Two, "2")]
|
||||||
|
[TestCase(TestEnum.Three, "three")]
|
||||||
|
[TestCase(TestEnum.Four, "Four")]
|
||||||
|
public void TestEnumConverterGetStringTests(TestEnum value, string expected)
|
||||||
|
{
|
||||||
|
var output = EnumConverter.GetString(value);
|
||||||
|
Assert.That(output == expected);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase("1", TestEnum.One)]
|
||||||
|
[TestCase("2", TestEnum.Two)]
|
||||||
|
[TestCase("3", TestEnum.Three)]
|
||||||
|
[TestCase("three", TestEnum.Three)]
|
||||||
|
[TestCase("Four", TestEnum.Four)]
|
||||||
|
[TestCase("four", TestEnum.Four)]
|
||||||
|
[TestCase("Four1", null)]
|
||||||
|
[TestCase(null, null)]
|
||||||
|
public void TestEnumConverterNullableDeserializeTests(string value, TestEnum? expected)
|
||||||
|
{
|
||||||
|
var val = value == null ? "null" : $"\"{value}\"";
|
||||||
|
var output = JsonConvert.DeserializeObject<EnumObject>($"{{ \"Value\": {val} }}");
|
||||||
|
Assert.That(output.Value == expected);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase("1", TestEnum.One)]
|
||||||
|
[TestCase("2", TestEnum.Two)]
|
||||||
|
[TestCase("3", TestEnum.Three)]
|
||||||
|
[TestCase("three", TestEnum.Three)]
|
||||||
|
[TestCase("Four", TestEnum.Four)]
|
||||||
|
[TestCase("four", TestEnum.Four)]
|
||||||
|
[TestCase("Four1", TestEnum.One)]
|
||||||
|
[TestCase(null, TestEnum.One)]
|
||||||
|
public void TestEnumConverterNotNullableDeserializeTests(string value, TestEnum? expected)
|
||||||
|
{
|
||||||
|
var val = value == null ? "null" : $"\"{value}\"";
|
||||||
|
var output = JsonConvert.DeserializeObject<NotNullableEnumObject>($"{{ \"Value\": {val} }}");
|
||||||
|
Assert.That(output.Value == expected);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase("1", true)]
|
||||||
|
[TestCase("true", true)]
|
||||||
|
[TestCase("yes", true)]
|
||||||
|
[TestCase("y", true)]
|
||||||
|
[TestCase("on", true)]
|
||||||
|
[TestCase("-1", false)]
|
||||||
|
[TestCase("0", false)]
|
||||||
|
[TestCase("n", false)]
|
||||||
|
[TestCase("no", false)]
|
||||||
|
[TestCase("false", false)]
|
||||||
|
[TestCase("off", false)]
|
||||||
|
[TestCase("", null)]
|
||||||
|
public void TestBoolConverter(string value, bool? expected)
|
||||||
|
{
|
||||||
|
var val = value == null ? "null" : $"\"{value}\"";
|
||||||
|
var output = JsonConvert.DeserializeObject<BoolObject>($"{{ \"Value\": {val} }}");
|
||||||
|
Assert.That(output.Value == expected);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase("1", true)]
|
||||||
|
[TestCase("true", true)]
|
||||||
|
[TestCase("yes", true)]
|
||||||
|
[TestCase("y", true)]
|
||||||
|
[TestCase("on", true)]
|
||||||
|
[TestCase("-1", false)]
|
||||||
|
[TestCase("0", false)]
|
||||||
|
[TestCase("n", false)]
|
||||||
|
[TestCase("no", false)]
|
||||||
|
[TestCase("false", false)]
|
||||||
|
[TestCase("off", false)]
|
||||||
|
[TestCase("", false)]
|
||||||
|
public void TestBoolConverterNotNullable(string value, bool expected)
|
||||||
|
{
|
||||||
|
var val = value == null ? "null" : $"\"{value}\"";
|
||||||
|
var output = JsonConvert.DeserializeObject<NotNullableBoolObject>($"{{ \"Value\": {val} }}");
|
||||||
|
Assert.That(output.Value == expected);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class TimeObject
|
||||||
|
{
|
||||||
|
[JsonConverter(typeof(DateTimeConverter))]
|
||||||
|
public DateTime? Time { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class EnumObject
|
||||||
|
{
|
||||||
|
public TestEnum? Value { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class NotNullableEnumObject
|
||||||
|
{
|
||||||
|
public TestEnum Value { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class BoolObject
|
||||||
|
{
|
||||||
|
[JsonConverter(typeof(BoolConverter))]
|
||||||
|
public bool? Value { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class NotNullableBoolObject
|
||||||
|
{
|
||||||
|
[JsonConverter(typeof(BoolConverter))]
|
||||||
|
public bool Value { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
[JsonConverter(typeof(EnumConverter))]
|
||||||
|
public enum TestEnum
|
||||||
|
{
|
||||||
|
[Map("1")]
|
||||||
|
One,
|
||||||
|
[Map("2")]
|
||||||
|
Two,
|
||||||
|
[Map("three", "3")]
|
||||||
|
Three,
|
||||||
|
Four
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -51,8 +51,8 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
|
|
||||||
// assert
|
// assert
|
||||||
Assert.That(options.ReceiveWindow == TimeSpan.FromSeconds(10));
|
Assert.That(options.ReceiveWindow == TimeSpan.FromSeconds(10));
|
||||||
Assert.That(options.ApiCredentials.Key == "123");
|
Assert.That(options.ApiCredentials.Key.GetString() == "123");
|
||||||
Assert.That(options.ApiCredentials.Secret == "456");
|
Assert.That(options.ApiCredentials.Secret.GetString() == "456");
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -64,10 +64,10 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
options.Api2Options.ApiCredentials = new ApiCredentials("789", "101");
|
options.Api2Options.ApiCredentials = new ApiCredentials("789", "101");
|
||||||
|
|
||||||
// assert
|
// assert
|
||||||
Assert.That(options.Api1Options.ApiCredentials.Key == "123");
|
Assert.That(options.Api1Options.ApiCredentials.Key.GetString() == "123");
|
||||||
Assert.That(options.Api1Options.ApiCredentials.Secret == "456");
|
Assert.That(options.Api1Options.ApiCredentials.Secret.GetString() == "456");
|
||||||
Assert.That(options.Api2Options.ApiCredentials.Key == "789");
|
Assert.That(options.Api2Options.ApiCredentials.Key.GetString() == "789");
|
||||||
Assert.That(options.Api2Options.ApiCredentials.Secret == "101");
|
Assert.That(options.Api2Options.ApiCredentials.Secret.GetString() == "101");
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -100,10 +100,6 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
Assert.That(authProvider1.GetSecret() == "222");
|
Assert.That(authProvider1.GetSecret() == "222");
|
||||||
Assert.That(authProvider2.GetKey() == "123");
|
Assert.That(authProvider2.GetKey() == "123");
|
||||||
Assert.That(authProvider2.GetSecret() == "456");
|
Assert.That(authProvider2.GetSecret() == "456");
|
||||||
|
|
||||||
// Cleanup static values
|
|
||||||
TestClientOptions.Default.ApiCredentials = null;
|
|
||||||
TestClientOptions.Default.Api1Options.ApiCredentials = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -125,10 +121,6 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
Assert.That(authProvider2.GetKey() == "123");
|
Assert.That(authProvider2.GetKey() == "123");
|
||||||
Assert.That(authProvider2.GetSecret() == "456");
|
Assert.That(authProvider2.GetSecret() == "456");
|
||||||
Assert.That(client.Api2.BaseAddress == "https://localhost:123");
|
Assert.That(client.Api2.BaseAddress == "https://localhost:123");
|
||||||
|
|
||||||
// Cleanup static values
|
|
||||||
TestClientOptions.Default.ApiCredentials = null;
|
|
||||||
TestClientOptions.Default.Api1Options.ApiCredentials = null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -142,14 +134,6 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
Environment = new TestEnvironment("test", "https://test.com")
|
Environment = new TestEnvironment("test", "https://test.com")
|
||||||
};
|
};
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
public TestClientOptions()
|
|
||||||
{
|
|
||||||
Default?.Set(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The default receive window for requests
|
/// The default receive window for requests
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -159,12 +143,12 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
|
|
||||||
public RestApiOptions Api2Options { get; set; } = new RestApiOptions();
|
public RestApiOptions Api2Options { get; set; } = new RestApiOptions();
|
||||||
|
|
||||||
internal TestClientOptions Set(TestClientOptions targetOptions)
|
internal TestClientOptions Copy()
|
||||||
{
|
{
|
||||||
targetOptions = base.Set<TestClientOptions>(targetOptions);
|
var options = Copy<TestClientOptions>();
|
||||||
targetOptions.Api1Options = Api1Options.Set(targetOptions.Api1Options);
|
options.Api1Options = Api1Options.Copy<RestApiOptions>();
|
||||||
targetOptions.Api2Options = Api2Options.Set(targetOptions.Api2Options);
|
options.Api2Options = Api2Options.Copy<RestApiOptions>();
|
||||||
return targetOptions;
|
return options;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,19 +1,18 @@
|
|||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Authentication;
|
||||||
|
using CryptoExchange.Net.Objects;
|
||||||
using CryptoExchange.Net.UnitTests.TestImplementations;
|
using CryptoExchange.Net.UnitTests.TestImplementations;
|
||||||
|
using Newtonsoft.Json;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using CryptoExchange.Net.Interfaces;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using NUnit.Framework.Legacy;
|
using NUnit.Framework.Legacy;
|
||||||
using CryptoExchange.Net.RateLimiting;
|
|
||||||
using System.Net;
|
|
||||||
using CryptoExchange.Net.RateLimiting.Guards;
|
|
||||||
using CryptoExchange.Net.RateLimiting.Filters;
|
|
||||||
using CryptoExchange.Net.RateLimiting.Interfaces;
|
|
||||||
using System.Text.Json;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.UnitTests
|
namespace CryptoExchange.Net.UnitTests
|
||||||
{
|
{
|
||||||
@ -26,7 +25,7 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
// arrange
|
// arrange
|
||||||
var client = new TestRestClient();
|
var client = new TestRestClient();
|
||||||
var expected = new TestObject() { DecimalData = 1.23M, IntData = 10, StringData = "Some data" };
|
var expected = new TestObject() { DecimalData = 1.23M, IntData = 10, StringData = "Some data" };
|
||||||
client.SetResponse(JsonSerializer.Serialize(expected, new JsonSerializerOptions { TypeInfoResolver = new TestSerializerContext() }), out _);
|
client.SetResponse(JsonConvert.SerializeObject(expected), out _);
|
||||||
|
|
||||||
// act
|
// act
|
||||||
var result = client.Api1.Request<TestObject>().Result;
|
var result = client.Api1.Request<TestObject>().Result;
|
||||||
@ -80,6 +79,8 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
ClassicAssert.IsFalse(result.Success);
|
ClassicAssert.IsFalse(result.Success);
|
||||||
Assert.That(result.Error != null);
|
Assert.That(result.Error != null);
|
||||||
Assert.That(result.Error is ServerError);
|
Assert.That(result.Error is ServerError);
|
||||||
|
Assert.That(result.Error.Message.Contains("Invalid request"));
|
||||||
|
Assert.That(result.Error.Message.Contains("123"));
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase]
|
[TestCase]
|
||||||
@ -106,14 +107,14 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
// arrange
|
// arrange
|
||||||
// act
|
// act
|
||||||
var options = new TestClientOptions();
|
var options = new TestClientOptions();
|
||||||
options.Api1Options.TimestampRecalculationInterval = TimeSpan.FromMinutes(10);
|
options.Api1Options.RateLimiters = new List<IRateLimiter> { new RateLimiter() };
|
||||||
options.Api1Options.OutputOriginalData = true;
|
options.Api1Options.RateLimitingBehaviour = RateLimitingBehaviour.Fail;
|
||||||
options.RequestTimeout = TimeSpan.FromMinutes(1);
|
options.RequestTimeout = TimeSpan.FromMinutes(1);
|
||||||
var client = new TestBaseClient(options);
|
var client = new TestBaseClient(options);
|
||||||
|
|
||||||
// assert
|
// assert
|
||||||
Assert.That(((TestClientOptions)client.ClientOptions).Api1Options.TimestampRecalculationInterval == TimeSpan.FromMinutes(10));
|
Assert.That(((TestClientOptions)client.ClientOptions).Api1Options.RateLimiters.Count == 1);
|
||||||
Assert.That(((TestClientOptions)client.ClientOptions).Api1Options.OutputOriginalData == true);
|
Assert.That(((TestClientOptions)client.ClientOptions).Api1Options.RateLimitingBehaviour == RateLimitingBehaviour.Fail);
|
||||||
Assert.That(((TestClientOptions)client.ClientOptions).RequestTimeout == TimeSpan.FromMinutes(1));
|
Assert.That(((TestClientOptions)client.ClientOptions).RequestTimeout == TimeSpan.FromMinutes(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -134,7 +135,7 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
|
|
||||||
client.SetResponse("{}", out var request);
|
client.SetResponse("{}", out var request);
|
||||||
|
|
||||||
await client.Api1.RequestWithParams<TestObject>(new HttpMethod(method), new ParameterCollection
|
await client.Api1.RequestWithParams<TestObject>(new HttpMethod(method), new Dictionary<string, object>
|
||||||
{
|
{
|
||||||
{ "TestParam1", "Value1" },
|
{ "TestParam1", "Value1" },
|
||||||
{ "TestParam2", 2 },
|
{ "TestParam2", 2 },
|
||||||
@ -161,22 +162,18 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
[TestCase(1, 2)]
|
[TestCase(1, 2)]
|
||||||
public async Task PartialEndpointRateLimiterBasics(int requests, double perSeconds)
|
public async Task PartialEndpointRateLimiterBasics(int requests, double perSeconds)
|
||||||
{
|
{
|
||||||
var rateLimiter = new RateLimitGate("Test");
|
var rateLimiter = new RateLimiter();
|
||||||
rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerHost, new PathStartFilter("/sapi/"), requests, TimeSpan.FromSeconds(perSeconds), RateLimitWindowType.Fixed));
|
rateLimiter.AddPartialEndpointLimit("/sapi/", requests, TimeSpan.FromSeconds(perSeconds));
|
||||||
|
|
||||||
var triggered = false;
|
|
||||||
rateLimiter.RateLimitTriggered += (x) => { triggered = true; };
|
|
||||||
var requestDefinition = new RequestDefinition("/sapi/v1/system/status", HttpMethod.Get);
|
|
||||||
|
|
||||||
for (var i = 0; i < requests + 1; i++)
|
for (var i = 0; i < requests + 1; i++)
|
||||||
{
|
{
|
||||||
var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
|
var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), "/sapi/v1/system/status", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
Assert.That(i == requests? triggered : !triggered);
|
Assert.That(i == requests? result1.Data > 1 : result1.Data == 0);
|
||||||
}
|
}
|
||||||
triggered = false;
|
|
||||||
await Task.Delay((int)Math.Round(perSeconds * 1000) + 10);
|
await Task.Delay((int)Math.Round(perSeconds * 1000) + 10);
|
||||||
var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
|
var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), "/sapi/v1/system/status", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
Assert.That(!triggered);
|
Assert.That(result2.Data == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase("/sapi/test1", true)]
|
[TestCase("/sapi/test1", true)]
|
||||||
@ -186,40 +183,29 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
[TestCase("/sapi/", true)]
|
[TestCase("/sapi/", true)]
|
||||||
public async Task PartialEndpointRateLimiterEndpoints(string endpoint, bool expectLimiting)
|
public async Task PartialEndpointRateLimiterEndpoints(string endpoint, bool expectLimiting)
|
||||||
{
|
{
|
||||||
var rateLimiter = new RateLimitGate("Test");
|
var rateLimiter = new RateLimiter();
|
||||||
rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerHost, new PathStartFilter("/sapi/"), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
|
rateLimiter.AddPartialEndpointLimit("/sapi/", 1, TimeSpan.FromSeconds(0.1));
|
||||||
|
|
||||||
var requestDefinition = new RequestDefinition(endpoint, HttpMethod.Get);
|
|
||||||
|
|
||||||
RateLimitEvent evnt = null;
|
|
||||||
rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
|
|
||||||
for (var i = 0; i < 2; i++)
|
for (var i = 0; i < 2; i++)
|
||||||
{
|
{
|
||||||
var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
|
var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
bool expected = i == 1 ? (expectLimiting ? evnt.DelayTime > TimeSpan.Zero : evnt == null) : evnt == null;
|
bool expected = i == 1 ? (expectLimiting ? result1.Data > 1 : result1.Data == 0) : result1.Data == 0;
|
||||||
Assert.That(expected);
|
Assert.That(expected);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase("/sapi/", "/sapi/", true)]
|
[TestCase("/sapi/", "/sapi/", true)]
|
||||||
[TestCase("/sapi/test", "/sapi/test", true)]
|
[TestCase("/sapi/test", "/sapi/test", true)]
|
||||||
[TestCase("/sapi/test", "/sapi/test123", false)]
|
[TestCase("/sapi/test", "/sapi/test123", false)]
|
||||||
[TestCase("/sapi/test", "/sapi/", false)]
|
[TestCase("/sapi/test", "/sapi/", false)]
|
||||||
public async Task PartialEndpointRateLimiterEndpoints(string endpoint1, string endpoint2, bool expectLimiting)
|
public async Task PartialEndpointRateLimiterEndpoints(string endpoint1, string endpoint2, bool expectLimiting)
|
||||||
{
|
{
|
||||||
var rateLimiter = new RateLimitGate("Test");
|
var rateLimiter = new RateLimiter();
|
||||||
rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerEndpoint, new PathStartFilter("/sapi/"), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
|
rateLimiter.AddPartialEndpointLimit("/sapi/", 1, TimeSpan.FromSeconds(0.1), countPerEndpoint: true);
|
||||||
|
|
||||||
var requestDefinition1 = new RequestDefinition(endpoint1, HttpMethod.Get);
|
var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint1, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
var requestDefinition2 = new RequestDefinition(endpoint2, HttpMethod.Get);
|
var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint2, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
|
Assert.That(result1.Data == 0);
|
||||||
RateLimitEvent evnt = null;
|
Assert.That(expectLimiting ? result2.Data > 0 : result2.Data == 0);
|
||||||
rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
|
|
||||||
|
|
||||||
var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
|
|
||||||
Assert.That(evnt == null);
|
|
||||||
var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
|
|
||||||
Assert.That(expectLimiting ? evnt != null : evnt == null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase(1, 0.1)]
|
[TestCase(1, 0.1)]
|
||||||
@ -228,22 +214,18 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
[TestCase(1, 2)]
|
[TestCase(1, 2)]
|
||||||
public async Task EndpointRateLimiterBasics(int requests, double perSeconds)
|
public async Task EndpointRateLimiterBasics(int requests, double perSeconds)
|
||||||
{
|
{
|
||||||
var rateLimiter = new RateLimitGate("Test");
|
var rateLimiter = new RateLimiter();
|
||||||
rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerEndpoint, new PathStartFilter("/sapi/test"), requests, TimeSpan.FromSeconds(perSeconds), RateLimitWindowType.Fixed));
|
rateLimiter.AddEndpointLimit("/sapi/test", requests, TimeSpan.FromSeconds(perSeconds));
|
||||||
|
|
||||||
bool triggered = false;
|
|
||||||
rateLimiter.RateLimitTriggered += (x) => { triggered = true; };
|
|
||||||
var requestDefinition = new RequestDefinition("/sapi/test", HttpMethod.Get);
|
|
||||||
|
|
||||||
for (var i = 0; i < requests + 1; i++)
|
for (var i = 0; i < requests + 1; i++)
|
||||||
{
|
{
|
||||||
var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
|
var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), "/sapi/test", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
Assert.That(i == requests ? triggered : !triggered);
|
Assert.That(i == requests ? result1.Data > 1 : result1.Data == 0);
|
||||||
}
|
}
|
||||||
triggered = false;
|
|
||||||
await Task.Delay((int)Math.Round(perSeconds * 1000) + 10);
|
await Task.Delay((int)Math.Round(perSeconds * 1000) + 10);
|
||||||
var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
|
var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), "/sapi/test", HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
Assert.That(!triggered);
|
Assert.That(result2.Data == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase("/", false)]
|
[TestCase("/", false)]
|
||||||
@ -251,17 +233,13 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
[TestCase("/sapi/test/123", false)]
|
[TestCase("/sapi/test/123", false)]
|
||||||
public async Task EndpointRateLimiterEndpoints(string endpoint, bool expectLimited)
|
public async Task EndpointRateLimiterEndpoints(string endpoint, bool expectLimited)
|
||||||
{
|
{
|
||||||
var rateLimiter = new RateLimitGate("Test");
|
var rateLimiter = new RateLimiter();
|
||||||
rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerEndpoint, new ExactPathFilter("/sapi/test"), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
|
rateLimiter.AddEndpointLimit("/sapi/test", 1, TimeSpan.FromSeconds(0.1));
|
||||||
|
|
||||||
var requestDefinition = new RequestDefinition(endpoint, HttpMethod.Get);
|
|
||||||
|
|
||||||
RateLimitEvent evnt = null;
|
|
||||||
rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
|
|
||||||
for (var i = 0; i < 2; i++)
|
for (var i = 0; i < 2; i++)
|
||||||
{
|
{
|
||||||
var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
|
var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
bool expected = i == 1 ? (expectLimited ? evnt.DelayTime > TimeSpan.Zero : evnt == null) : evnt == null;
|
bool expected = i == 1 ? (expectLimited ? result1.Data > 1 : result1.Data == 0) : result1.Data == 0;
|
||||||
Assert.That(expected);
|
Assert.That(expected);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -272,41 +250,47 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
[TestCase("/sapi/test23", false)]
|
[TestCase("/sapi/test23", false)]
|
||||||
public async Task EndpointRateLimiterMultipleEndpoints(string endpoint, bool expectLimited)
|
public async Task EndpointRateLimiterMultipleEndpoints(string endpoint, bool expectLimited)
|
||||||
{
|
{
|
||||||
var rateLimiter = new RateLimitGate("Test");
|
var rateLimiter = new RateLimiter();
|
||||||
rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerEndpoint, new ExactPathsFilter(new[] { "/sapi/test", "/sapi/test2" }), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
|
rateLimiter.AddEndpointLimit(new[] { "/sapi/test", "/sapi/test2" }, 1, TimeSpan.FromSeconds(0.1));
|
||||||
var requestDefinition = new RequestDefinition(endpoint, HttpMethod.Get);
|
|
||||||
|
|
||||||
RateLimitEvent evnt = null;
|
|
||||||
rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
|
|
||||||
for (var i = 0; i < 2; i++)
|
for (var i = 0; i < 2; i++)
|
||||||
{
|
{
|
||||||
var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
|
var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
bool expected = i == 1 ? (expectLimited ? evnt.DelayTime > TimeSpan.Zero : evnt == null) : evnt == null;
|
bool expected = i == 1 ? (expectLimited ? result1.Data > 1 : result1.Data == 0) : result1.Data == 0;
|
||||||
Assert.That(expected);
|
Assert.That(expected);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase("123", "123", "/sapi/test", "/sapi/test", true)]
|
[TestCase("123", "123", "/sapi/test", "/sapi/test", true, true, true, true)]
|
||||||
[TestCase("123", "456", "/sapi/test", "/sapi/test", false)]
|
[TestCase("123", "456", "/sapi/test", "/sapi/test", true, true, true, false)]
|
||||||
[TestCase("123", "123", "/sapi/test", "/sapi/test2", true)]
|
[TestCase("123", "123", "/sapi/test", "/sapi/test2", true, true, true, true)]
|
||||||
[TestCase("123", "123", "/sapi/test2", "/sapi/test", true)]
|
[TestCase("123", "123", "/sapi/test2", "/sapi/test", true, true, true, true)]
|
||||||
[TestCase(null, "123", "/sapi/test", "/sapi/test", false)]
|
[TestCase("123", "123", "/sapi/test", "/sapi/test", true, false, true, false)]
|
||||||
[TestCase("123", null, "/sapi/test", "/sapi/test", false)]
|
[TestCase("123", "123", "/sapi/test", "/sapi/test", false, true, true, false)]
|
||||||
[TestCase(null, null, "/sapi/test", "/sapi/test", false)]
|
[TestCase("123", "123", "/sapi/test", "/sapi/test", false, false, true, false)]
|
||||||
public async Task ApiKeyRateLimiterBasics(string key1, string key2, string endpoint1, string endpoint2, bool expectLimited)
|
[TestCase(null, "123", "/sapi/test", "/sapi/test", false, true, true, false)]
|
||||||
|
[TestCase("123", null, "/sapi/test", "/sapi/test", true, false, true, false)]
|
||||||
|
[TestCase(null, null, "/sapi/test", "/sapi/test", false, false, true, false)]
|
||||||
|
|
||||||
|
[TestCase("123", "123", "/sapi/test", "/sapi/test", true, true, false, true)]
|
||||||
|
[TestCase("123", "456", "/sapi/test", "/sapi/test", true, true, false, false)]
|
||||||
|
[TestCase("123", "123", "/sapi/test", "/sapi/test2", true, true, false, true)]
|
||||||
|
[TestCase("123", "123", "/sapi/test2", "/sapi/test", true, true, false, true)]
|
||||||
|
[TestCase("123", "123", "/sapi/test", "/sapi/test", true, false, false, true)]
|
||||||
|
[TestCase("123", "123", "/sapi/test", "/sapi/test", false, true, false, true)]
|
||||||
|
[TestCase("123", "123", "/sapi/test", "/sapi/test", false, false, false, true)]
|
||||||
|
[TestCase(null, "123", "/sapi/test", "/sapi/test", false, true, false, false)]
|
||||||
|
[TestCase("123", null, "/sapi/test", "/sapi/test", true, false, false, false)]
|
||||||
|
[TestCase(null, null, "/sapi/test", "/sapi/test", false, false, false, true)]
|
||||||
|
public async Task ApiKeyRateLimiterBasics(string key1, string key2, string endpoint1, string endpoint2, bool signed1, bool signed2, bool onlyForSignedRequests, bool expectLimited)
|
||||||
{
|
{
|
||||||
var rateLimiter = new RateLimitGate("Test");
|
var rateLimiter = new RateLimiter();
|
||||||
rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerApiKey, new AuthenticatedEndpointFilter(true), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Sliding));
|
rateLimiter.AddApiKeyLimit(1, TimeSpan.FromSeconds(0.1), onlyForSignedRequests, false);
|
||||||
var requestDefinition1 = new RequestDefinition(endpoint1, HttpMethod.Get) { Authenticated = key1 != null };
|
|
||||||
var requestDefinition2 = new RequestDefinition(endpoint2, HttpMethod.Get) { Authenticated = key2 != null };
|
|
||||||
|
|
||||||
RateLimitEvent evnt = null;
|
var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint1, HttpMethod.Get, signed1, key1?.ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
|
var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint2, HttpMethod.Get, signed2, key2?.ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
|
Assert.That(result1.Data == 0);
|
||||||
var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", key1, 1, RateLimitingBehaviour.Wait, null, default);
|
Assert.That(expectLimited ? result2.Data > 0 : result2.Data == 0);
|
||||||
Assert.That(evnt == null);
|
|
||||||
var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", key2, 1, RateLimitingBehaviour.Wait, null, default);
|
|
||||||
Assert.That(expectLimited ? evnt != null : evnt == null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase("/sapi/test", "/sapi/test", true)]
|
[TestCase("/sapi/test", "/sapi/test", true)]
|
||||||
@ -314,70 +298,29 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
[TestCase("/", "/sapi/test2", true)]
|
[TestCase("/", "/sapi/test2", true)]
|
||||||
public async Task TotalRateLimiterBasics(string endpoint1, string endpoint2, bool expectLimited)
|
public async Task TotalRateLimiterBasics(string endpoint1, string endpoint2, bool expectLimited)
|
||||||
{
|
{
|
||||||
var rateLimiter = new RateLimitGate("Test");
|
var rateLimiter = new RateLimiter();
|
||||||
rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerHost, Array.Empty<IGuardFilter>(), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
|
rateLimiter.AddTotalRateLimit(1, TimeSpan.FromSeconds(0.1));
|
||||||
var requestDefinition1 = new RequestDefinition(endpoint1, HttpMethod.Get);
|
|
||||||
var requestDefinition2 = new RequestDefinition(endpoint2, HttpMethod.Get) { Authenticated = true };
|
|
||||||
|
|
||||||
RateLimitEvent evnt = null;
|
var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint1, HttpMethod.Get, false, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
|
var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint2, HttpMethod.Get, true, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
|
Assert.That(result1.Data == 0);
|
||||||
var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
|
Assert.That(expectLimited ? result2.Data > 0 : result2.Data == 0);
|
||||||
Assert.That(evnt == null);
|
|
||||||
var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", null, 1, RateLimitingBehaviour.Wait, null, default);
|
|
||||||
Assert.That(expectLimited ? evnt != null : evnt == null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase("https://test.com", "/sapi/test", "https://test.com", "/sapi/test", true)]
|
[TestCase("/sapi/test", true, true, true, false)]
|
||||||
[TestCase("https://test2.com", "/sapi/test", "https://test.com", "/sapi/test", false)]
|
[TestCase("/sapi/test", false, true, true, false)]
|
||||||
[TestCase("https://test.com", "/sapi/test", "https://test2.com", "/sapi/test", false)]
|
[TestCase("/sapi/test", false, true, false, true)]
|
||||||
[TestCase("https://test.com", "/sapi/test", "https://test.com", "/sapi/test2", true)]
|
[TestCase("/sapi/test", true, true, false, true)]
|
||||||
public async Task HostRateLimiterBasics(string host1, string endpoint1, string host2, string endpoint2, bool expectLimited)
|
public async Task ApiKeyRateLimiterIgnores_TotalRateLimiter_IfSet(string endpoint, bool signed1, bool signed2, bool ignoreTotal, bool expectLimited)
|
||||||
{
|
{
|
||||||
var rateLimiter = new RateLimitGate("Test");
|
var rateLimiter = new RateLimiter();
|
||||||
rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerHost, new HostFilter("https://test.com"), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
|
rateLimiter.AddApiKeyLimit(100, TimeSpan.FromSeconds(0.1), true, ignoreTotal);
|
||||||
var requestDefinition1 = new RequestDefinition(endpoint1, HttpMethod.Get);
|
rateLimiter.AddTotalRateLimit(1, TimeSpan.FromSeconds(0.1));
|
||||||
var requestDefinition2 = new RequestDefinition(endpoint2, HttpMethod.Get) { Authenticated = true };
|
|
||||||
|
|
||||||
RateLimitEvent evnt = null;
|
var result1 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint, HttpMethod.Get, signed1, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
|
var result2 = await rateLimiter.LimitRequestAsync(new TraceLogger(), endpoint, HttpMethod.Get, signed2, "123".ToSecureString(), RateLimitingBehaviour.Wait, 1, default);
|
||||||
|
Assert.That(result1.Data == 0);
|
||||||
var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, host1, "123", 1, RateLimitingBehaviour.Wait, null, default);
|
Assert.That(expectLimited ? result2.Data > 0 : result2.Data == 0);
|
||||||
Assert.That(evnt == null);
|
|
||||||
var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, host2, "123", 1, RateLimitingBehaviour.Wait, null, default);
|
|
||||||
Assert.That(expectLimited ? evnt != null : evnt == null);
|
|
||||||
}
|
|
||||||
|
|
||||||
[TestCase("https://test.com", "https://test.com", true)]
|
|
||||||
[TestCase("https://test2.com", "https://test.com", false)]
|
|
||||||
[TestCase("https://test.com", "https://test2.com", false)]
|
|
||||||
public async Task ConnectionRateLimiterBasics(string host1, string host2, bool expectLimited)
|
|
||||||
{
|
|
||||||
var rateLimiter = new RateLimitGate("Test");
|
|
||||||
rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerHost, new LimitItemTypeFilter(RateLimitItemType.Connection), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
|
|
||||||
|
|
||||||
RateLimitEvent evnt = null;
|
|
||||||
rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
|
|
||||||
|
|
||||||
var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), host1, "123", 1, RateLimitingBehaviour.Wait, null, default);
|
|
||||||
Assert.That(evnt == null);
|
|
||||||
var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), host2, "123", 1, RateLimitingBehaviour.Wait, null, default);
|
|
||||||
Assert.That(expectLimited ? evnt != null : evnt == null);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public async Task ConnectionRateLimiterCancel()
|
|
||||||
{
|
|
||||||
var rateLimiter = new RateLimitGate("Test");
|
|
||||||
rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerHost, new LimitItemTypeFilter(RateLimitItemType.Connection), 1, TimeSpan.FromSeconds(10), RateLimitWindowType.Fixed));
|
|
||||||
|
|
||||||
RateLimitEvent evnt = null;
|
|
||||||
rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
|
|
||||||
var ct = new CancellationTokenSource(TimeSpan.FromSeconds(0.2));
|
|
||||||
|
|
||||||
var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, ct.Token);
|
|
||||||
var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, ct.Token);
|
|
||||||
Assert.That(result2.Error, Is.TypeOf<CancellationRequestedError>());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text.Json;
|
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
@ -10,6 +9,7 @@ using CryptoExchange.Net.UnitTests.TestImplementations;
|
|||||||
using CryptoExchange.Net.UnitTests.TestImplementations.Sockets;
|
using CryptoExchange.Net.UnitTests.TestImplementations.Sockets;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Moq;
|
using Moq;
|
||||||
|
using Newtonsoft.Json;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using NUnit.Framework.Legacy;
|
using NUnit.Framework.Legacy;
|
||||||
|
|
||||||
@ -58,7 +58,9 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
options.ReconnectInterval = TimeSpan.Zero;
|
options.ReconnectInterval = TimeSpan.Zero;
|
||||||
});
|
});
|
||||||
var socket = client.CreateSocket();
|
var socket = client.CreateSocket();
|
||||||
|
socket.ShouldReconnect = true;
|
||||||
socket.CanConnect = true;
|
socket.CanConnect = true;
|
||||||
|
socket.DisconnectTime = DateTime.UtcNow;
|
||||||
var sub = new SocketConnection(new TraceLogger(), client.SubClient, socket, null);
|
var sub = new SocketConnection(new TraceLogger(), client.SubClient, socket, null);
|
||||||
var rstEvent = new ManualResetEvent(false);
|
var rstEvent = new ManualResetEvent(false);
|
||||||
Dictionary<string, string> result = null;
|
Dictionary<string, string> result = null;
|
||||||
@ -70,10 +72,11 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
result = messageEvent.Data;
|
result = messageEvent.Data;
|
||||||
rstEvent.Set();
|
rstEvent.Set();
|
||||||
});
|
});
|
||||||
|
subObj.HandleUpdatesBeforeConfirmation = true;
|
||||||
sub.AddSubscription(subObj);
|
sub.AddSubscription(subObj);
|
||||||
|
|
||||||
// act
|
// act
|
||||||
socket.InvokeMessage("{\"property\": \"123\", \"action\": \"update\", \"topic\": \"topic\"}");
|
socket.InvokeMessage("{\"property\": \"123\", \"topic\": \"topic\"}");
|
||||||
rstEvent.WaitOne(1000);
|
rstEvent.WaitOne(1000);
|
||||||
|
|
||||||
// assert
|
// assert
|
||||||
@ -91,7 +94,9 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
options.SubOptions.OutputOriginalData = enabled;
|
options.SubOptions.OutputOriginalData = enabled;
|
||||||
});
|
});
|
||||||
var socket = client.CreateSocket();
|
var socket = client.CreateSocket();
|
||||||
|
socket.ShouldReconnect = true;
|
||||||
socket.CanConnect = true;
|
socket.CanConnect = true;
|
||||||
|
socket.DisconnectTime = DateTime.UtcNow;
|
||||||
var sub = new SocketConnection(new TraceLogger(), client.SubClient, socket, null);
|
var sub = new SocketConnection(new TraceLogger(), client.SubClient, socket, null);
|
||||||
var rstEvent = new ManualResetEvent(false);
|
var rstEvent = new ManualResetEvent(false);
|
||||||
string original = null;
|
string original = null;
|
||||||
@ -102,8 +107,9 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
original = messageEvent.OriginalData;
|
original = messageEvent.OriginalData;
|
||||||
rstEvent.Set();
|
rstEvent.Set();
|
||||||
});
|
});
|
||||||
|
subObj.HandleUpdatesBeforeConfirmation = true;
|
||||||
sub.AddSubscription(subObj);
|
sub.AddSubscription(subObj);
|
||||||
var msgToSend = JsonSerializer.Serialize(new { topic = "topic", action = "update", property = "123" });
|
var msgToSend = JsonConvert.SerializeObject(new { topic = "topic", property = 123 });
|
||||||
|
|
||||||
// act
|
// act
|
||||||
socket.InvokeMessage(msgToSend);
|
socket.InvokeMessage(msgToSend);
|
||||||
@ -198,7 +204,7 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
|
|
||||||
// act
|
// act
|
||||||
var sub = client.SubClient.SubscribeToSomethingAsync(channel, onUpdate => {}, ct: default);
|
var sub = client.SubClient.SubscribeToSomethingAsync(channel, onUpdate => {}, ct: default);
|
||||||
socket.InvokeMessage(JsonSerializer.Serialize(new { channel, action = "subscribe", status = "error" }));
|
socket.InvokeMessage(JsonConvert.SerializeObject(new { channel, status = "error" }));
|
||||||
await sub;
|
await sub;
|
||||||
|
|
||||||
// assert
|
// assert
|
||||||
@ -221,7 +227,7 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
|
|
||||||
// act
|
// act
|
||||||
var sub = client.SubClient.SubscribeToSomethingAsync(channel, onUpdate => {}, ct: default);
|
var sub = client.SubClient.SubscribeToSomethingAsync(channel, onUpdate => {}, ct: default);
|
||||||
socket.InvokeMessage(JsonSerializer.Serialize(new { channel, action = "subscribe", status = "confirmed" }));
|
socket.InvokeMessage(JsonConvert.SerializeObject(new { channel, status = "confirmed" }));
|
||||||
await sub;
|
await sub;
|
||||||
|
|
||||||
// assert
|
// assert
|
||||||
|
|||||||
@ -5,9 +5,6 @@ using NUnit.Framework;
|
|||||||
using System;
|
using System;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using NUnit.Framework.Legacy;
|
using NUnit.Framework.Legacy;
|
||||||
using CryptoExchange.Net.Converters;
|
|
||||||
using CryptoExchange.Net.Testing.Comparers;
|
|
||||||
using CryptoExchange.Net.SharedApis;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.UnitTests
|
namespace CryptoExchange.Net.UnitTests
|
||||||
{
|
{
|
||||||
@ -147,7 +144,7 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
public void TestEnumConverterNullableDeserializeTests(string value, TestEnum? expected)
|
public void TestEnumConverterNullableDeserializeTests(string value, TestEnum? expected)
|
||||||
{
|
{
|
||||||
var val = value == null ? "null" : $"\"{value}\"";
|
var val = value == null ? "null" : $"\"{value}\"";
|
||||||
var output = JsonSerializer.Deserialize<STJEnumObject>($"{{ \"Value\": {val} }}", SerializerOptions.WithConverters(new SerializationContext()));
|
var output = JsonSerializer.Deserialize<STJEnumObject>($"{{ \"Value\": {val} }}");
|
||||||
Assert.That(output.Value == expected);
|
Assert.That(output.Value == expected);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -166,20 +163,6 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
Assert.That(output.Value == expected);
|
Assert.That(output.Value == expected);
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase("1", TestEnum.One)]
|
|
||||||
[TestCase("2", TestEnum.Two)]
|
|
||||||
[TestCase("3", TestEnum.Three)]
|
|
||||||
[TestCase("three", TestEnum.Three)]
|
|
||||||
[TestCase("Four", TestEnum.Four)]
|
|
||||||
[TestCase("four", TestEnum.Four)]
|
|
||||||
[TestCase("Four1", null)]
|
|
||||||
[TestCase(null, null)]
|
|
||||||
public void TestEnumConverterParseStringTests(string value, TestEnum? expected)
|
|
||||||
{
|
|
||||||
var result = EnumConverter.ParseString<TestEnum>(value);
|
|
||||||
Assert.That(result == expected);
|
|
||||||
}
|
|
||||||
|
|
||||||
[TestCase("1", true)]
|
[TestCase("1", true)]
|
||||||
[TestCase("true", true)]
|
[TestCase("true", true)]
|
||||||
[TestCase("yes", true)]
|
[TestCase("yes", true)]
|
||||||
@ -195,7 +178,7 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
public void TestBoolConverter(string value, bool? expected)
|
public void TestBoolConverter(string value, bool? expected)
|
||||||
{
|
{
|
||||||
var val = value == null ? "null" : $"\"{value}\"";
|
var val = value == null ? "null" : $"\"{value}\"";
|
||||||
var output = JsonSerializer.Deserialize<STJBoolObject>($"{{ \"Value\": {val} }}", SerializerOptions.WithConverters(new SerializationContext()));
|
var output = JsonSerializer.Deserialize<STJBoolObject>($"{{ \"Value\": {val} }}");
|
||||||
Assert.That(output.Value == expected);
|
Assert.That(output.Value == expected);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -214,132 +197,9 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
public void TestBoolConverterNotNullable(string value, bool expected)
|
public void TestBoolConverterNotNullable(string value, bool expected)
|
||||||
{
|
{
|
||||||
var val = value == null ? "null" : $"\"{value}\"";
|
var val = value == null ? "null" : $"\"{value}\"";
|
||||||
var output = JsonSerializer.Deserialize<NotNullableSTJBoolObject>($"{{ \"Value\": {val} }}", SerializerOptions.WithConverters(new SerializationContext()));
|
var output = JsonSerializer.Deserialize<NotNullableSTJBoolObject>($"{{ \"Value\": {val} }}");
|
||||||
Assert.That(output.Value == expected);
|
Assert.That(output.Value == expected);
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase("1", 1)]
|
|
||||||
[TestCase("1.1", 1.1)]
|
|
||||||
[TestCase("-1.1", -1.1)]
|
|
||||||
[TestCase(null, null)]
|
|
||||||
[TestCase("", null)]
|
|
||||||
[TestCase("null", null)]
|
|
||||||
[TestCase("1E+2", 100)]
|
|
||||||
[TestCase("1E-2", 0.01)]
|
|
||||||
[TestCase("80228162514264337593543950335", -999)] // -999 is workaround for not being able to specify decimal.MaxValue
|
|
||||||
public void TestDecimalConverterString(string value, decimal? expected)
|
|
||||||
{
|
|
||||||
var result = JsonSerializer.Deserialize<STJDecimalObject>("{ \"test\": \""+ value + "\"}");
|
|
||||||
Assert.That(result.Test, Is.EqualTo(expected == -999 ? decimal.MaxValue : expected));
|
|
||||||
}
|
|
||||||
|
|
||||||
[TestCase("1", 1)]
|
|
||||||
[TestCase("1.1", 1.1)]
|
|
||||||
[TestCase("-1.1", -1.1)]
|
|
||||||
[TestCase("null", null)]
|
|
||||||
[TestCase("1E+2", 100)]
|
|
||||||
[TestCase("1E-2", 0.01)]
|
|
||||||
[TestCase("80228162514264337593543950335", -999)] // -999 is workaround for not being able to specify decimal.MaxValue
|
|
||||||
public void TestDecimalConverterNumber(string value, decimal? expected)
|
|
||||||
{
|
|
||||||
var result = JsonSerializer.Deserialize<STJDecimalObject>("{ \"test\": " + value + "}");
|
|
||||||
Assert.That(result.Test, Is.EqualTo(expected == -999 ? decimal.MaxValue : expected));
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test()]
|
|
||||||
public void TestArrayConverter()
|
|
||||||
{
|
|
||||||
var data = new Test()
|
|
||||||
{
|
|
||||||
Prop1 = 2,
|
|
||||||
Prop2 = null,
|
|
||||||
Prop3 = "123",
|
|
||||||
Prop3Again = "123",
|
|
||||||
Prop4 = null,
|
|
||||||
Prop5 = new Test2
|
|
||||||
{
|
|
||||||
Prop21 = 3,
|
|
||||||
Prop22 = "456"
|
|
||||||
},
|
|
||||||
Prop6 = new Test3
|
|
||||||
{
|
|
||||||
Prop31 = 4,
|
|
||||||
Prop32 = "789"
|
|
||||||
},
|
|
||||||
Prop7 = TestEnum.Two,
|
|
||||||
TestInternal = new Test
|
|
||||||
{
|
|
||||||
Prop1 = 10
|
|
||||||
},
|
|
||||||
Prop8 = new Test3
|
|
||||||
{
|
|
||||||
Prop31 = 5,
|
|
||||||
Prop32 = "101"
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
var options = new JsonSerializerOptions()
|
|
||||||
{
|
|
||||||
TypeInfoResolver = new SerializationContext()
|
|
||||||
};
|
|
||||||
var serialized = JsonSerializer.Serialize(data);
|
|
||||||
var deserialized = JsonSerializer.Deserialize<Test>(serialized);
|
|
||||||
|
|
||||||
Assert.That(deserialized.Prop1, Is.EqualTo(2));
|
|
||||||
Assert.That(deserialized.Prop2, Is.Null);
|
|
||||||
Assert.That(deserialized.Prop3, Is.EqualTo("123"));
|
|
||||||
Assert.That(deserialized.Prop3Again, Is.EqualTo("123"));
|
|
||||||
Assert.That(deserialized.Prop4, Is.Null);
|
|
||||||
Assert.That(deserialized.Prop5.Prop21, Is.EqualTo(3));
|
|
||||||
Assert.That(deserialized.Prop5.Prop22, Is.EqualTo("456"));
|
|
||||||
Assert.That(deserialized.Prop6.Prop31, Is.EqualTo(4));
|
|
||||||
Assert.That(deserialized.Prop6.Prop32, Is.EqualTo("789"));
|
|
||||||
Assert.That(deserialized.Prop7, Is.EqualTo(TestEnum.Two));
|
|
||||||
Assert.That(deserialized.TestInternal.Prop1, Is.EqualTo(10));
|
|
||||||
Assert.That(deserialized.Prop8.Prop31, Is.EqualTo(5));
|
|
||||||
Assert.That(deserialized.Prop8.Prop32, Is.EqualTo("101"));
|
|
||||||
}
|
|
||||||
|
|
||||||
[TestCase(TradingMode.Spot, "ETH", "USDT", null)]
|
|
||||||
[TestCase(TradingMode.PerpetualLinear, "ETH", "USDT", null)]
|
|
||||||
[TestCase(TradingMode.DeliveryLinear, "ETH", "USDT", 1748432430)]
|
|
||||||
public void TestSharedSymbolConversion(TradingMode tradingMode, string baseAsset, string quoteAsset, int? deliverTime)
|
|
||||||
{
|
|
||||||
DateTime? time = deliverTime == null ? null : DateTimeConverter.ParseFromDouble(deliverTime.Value);
|
|
||||||
var symbol = new SharedSymbol(tradingMode, baseAsset, quoteAsset, time);
|
|
||||||
|
|
||||||
var serialized = JsonSerializer.Serialize(symbol);
|
|
||||||
var restored = JsonSerializer.Deserialize<SharedSymbol>(serialized);
|
|
||||||
|
|
||||||
Assert.That(restored.TradingMode, Is.EqualTo(symbol.TradingMode));
|
|
||||||
Assert.That(restored.BaseAsset, Is.EqualTo(symbol.BaseAsset));
|
|
||||||
Assert.That(restored.QuoteAsset, Is.EqualTo(symbol.QuoteAsset));
|
|
||||||
Assert.That(restored.DeliverTime, Is.EqualTo(symbol.DeliverTime));
|
|
||||||
}
|
|
||||||
|
|
||||||
[TestCase(0.1, null, null)]
|
|
||||||
[TestCase(0.1, 0.1, null)]
|
|
||||||
[TestCase(0.1, 0.1, 0.1)]
|
|
||||||
[TestCase(null, 0.1, null)]
|
|
||||||
[TestCase(null, 0.1, 0.1)]
|
|
||||||
public void TestSharedQuantityConversion(double? baseQuantity, double? quoteQuantity, double? contractQuantity)
|
|
||||||
{
|
|
||||||
var symbol = new SharedOrderQuantity((decimal?)baseQuantity, (decimal?)quoteQuantity, (decimal?)contractQuantity);
|
|
||||||
|
|
||||||
var serialized = JsonSerializer.Serialize(symbol);
|
|
||||||
var restored = JsonSerializer.Deserialize<SharedOrderQuantity>(serialized);
|
|
||||||
|
|
||||||
Assert.That(restored.QuantityInBaseAsset, Is.EqualTo(symbol.QuantityInBaseAsset));
|
|
||||||
Assert.That(restored.QuantityInQuoteAsset, Is.EqualTo(symbol.QuantityInQuoteAsset));
|
|
||||||
Assert.That(restored.QuantityInContracts, Is.EqualTo(symbol.QuantityInContracts));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class STJDecimalObject
|
|
||||||
{
|
|
||||||
[JsonConverter(typeof(DecimalConverter))]
|
|
||||||
[JsonPropertyName("test")]
|
|
||||||
public decimal? Test { get; set; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class STJTimeObject
|
public class STJTimeObject
|
||||||
@ -351,88 +211,25 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
|
|
||||||
public class STJEnumObject
|
public class STJEnumObject
|
||||||
{
|
{
|
||||||
|
[JsonConverter(typeof(EnumConverter))]
|
||||||
public TestEnum? Value { get; set; }
|
public TestEnum? Value { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class NotNullableSTJEnumObject
|
public class NotNullableSTJEnumObject
|
||||||
{
|
{
|
||||||
|
[JsonConverter(typeof(EnumConverter))]
|
||||||
public TestEnum Value { get; set; }
|
public TestEnum Value { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class STJBoolObject
|
public class STJBoolObject
|
||||||
{
|
{
|
||||||
|
[JsonConverter(typeof(BoolConverter))]
|
||||||
public bool? Value { get; set; }
|
public bool? Value { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class NotNullableSTJBoolObject
|
public class NotNullableSTJBoolObject
|
||||||
{
|
{
|
||||||
|
[JsonConverter(typeof(BoolConverter))]
|
||||||
public bool Value { get; set; }
|
public bool Value { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
[JsonConverter(typeof(ArrayConverter<Test>))]
|
|
||||||
record Test
|
|
||||||
{
|
|
||||||
[ArrayProperty(0)]
|
|
||||||
public int Prop1 { get; set; }
|
|
||||||
[ArrayProperty(1)]
|
|
||||||
public int? Prop2 { get; set; }
|
|
||||||
[ArrayProperty(2)]
|
|
||||||
public string Prop3 { get; set; }
|
|
||||||
[ArrayProperty(2)]
|
|
||||||
public string Prop3Again { get; set; }
|
|
||||||
[ArrayProperty(3)]
|
|
||||||
public string Prop4 { get; set; }
|
|
||||||
[ArrayProperty(4)]
|
|
||||||
public Test2 Prop5 { get; set; }
|
|
||||||
[ArrayProperty(5)]
|
|
||||||
public Test3 Prop6 { get; set; }
|
|
||||||
[ArrayProperty(6), JsonConverter(typeof(EnumConverter<TestEnum>))]
|
|
||||||
public TestEnum? Prop7 { get; set; }
|
|
||||||
[ArrayProperty(7)]
|
|
||||||
public Test TestInternal { get; set; }
|
|
||||||
[ArrayProperty(8), JsonConversion]
|
|
||||||
public Test3 Prop8 { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonConverter(typeof(ArrayConverter<Test2>))]
|
|
||||||
record Test2
|
|
||||||
{
|
|
||||||
[ArrayProperty(0)]
|
|
||||||
public int Prop21 { get; set; }
|
|
||||||
[ArrayProperty(1)]
|
|
||||||
public string Prop22 { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
record Test3
|
|
||||||
{
|
|
||||||
[JsonPropertyName("prop31")]
|
|
||||||
public int Prop31 { get; set; }
|
|
||||||
[JsonPropertyName("prop32")]
|
|
||||||
public string Prop32 { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonConverter(typeof(EnumConverter<TestEnum>))]
|
|
||||||
public enum TestEnum
|
|
||||||
{
|
|
||||||
[Map("1")]
|
|
||||||
One,
|
|
||||||
[Map("2")]
|
|
||||||
Two,
|
|
||||||
[Map("three", "3")]
|
|
||||||
Three,
|
|
||||||
Four
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonSerializable(typeof(Test))]
|
|
||||||
[JsonSerializable(typeof(Test2))]
|
|
||||||
[JsonSerializable(typeof(Test3))]
|
|
||||||
[JsonSerializable(typeof(NotNullableSTJBoolObject))]
|
|
||||||
[JsonSerializable(typeof(STJBoolObject))]
|
|
||||||
[JsonSerializable(typeof(NotNullableSTJEnumObject))]
|
|
||||||
[JsonSerializable(typeof(STJEnumObject))]
|
|
||||||
[JsonSerializable(typeof(STJDecimalObject))]
|
|
||||||
[JsonSerializable(typeof(STJTimeObject))]
|
|
||||||
internal partial class SerializationContext : JsonSerializerContext
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,31 +1,25 @@
|
|||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using CryptoExchange.Net.Objects.Sockets;
|
using CryptoExchange.Net.Objects.Sockets;
|
||||||
using CryptoExchange.Net.Sockets;
|
using CryptoExchange.Net.Sockets;
|
||||||
|
using Newtonsoft.Json;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text.Json.Serialization;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
|
namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
|
||||||
{
|
{
|
||||||
internal class SubResponse
|
internal class SubResponse
|
||||||
{
|
{
|
||||||
|
[JsonProperty("channel")]
|
||||||
[JsonPropertyName("action")]
|
|
||||||
public string Action { get; set; } = null!;
|
|
||||||
|
|
||||||
[JsonPropertyName("channel")]
|
|
||||||
public string Channel { get; set; } = null!;
|
public string Channel { get; set; } = null!;
|
||||||
|
|
||||||
[JsonPropertyName("status")]
|
[JsonProperty("status")]
|
||||||
public string Status { get; set; } = null!;
|
public string Status { get; set; } = null!;
|
||||||
}
|
}
|
||||||
|
|
||||||
internal class UnsubResponse
|
internal class UnsubResponse
|
||||||
{
|
{
|
||||||
[JsonPropertyName("action")]
|
[JsonProperty("status")]
|
||||||
public string Action { get; set; } = null!;
|
|
||||||
|
|
||||||
[JsonPropertyName("status")]
|
|
||||||
public string Status { get; set; } = null!;
|
public string Status { get; set; } = null!;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -35,7 +29,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
|
|||||||
|
|
||||||
public TestChannelQuery(string channel, string request, bool authenticated, int weight = 1) : base(request, authenticated, weight)
|
public TestChannelQuery(string channel, string request, bool authenticated, int weight = 1) : base(request, authenticated, weight)
|
||||||
{
|
{
|
||||||
ListenerIdentifiers = new HashSet<string> { request + "-" + channel };
|
ListenerIdentifiers = new HashSet<string> { channel };
|
||||||
}
|
}
|
||||||
|
|
||||||
public override CallResult<SubResponse> HandleMessage(SocketConnection connection, DataEvent<SubResponse> message)
|
public override CallResult<SubResponse> HandleMessage(SocketConnection connection, DataEvent<SubResponse> message)
|
||||||
|
|||||||
@ -15,7 +15,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
|
|||||||
{
|
{
|
||||||
private readonly Action<DataEvent<T>> _handler;
|
private readonly Action<DataEvent<T>> _handler;
|
||||||
|
|
||||||
public override HashSet<string> ListenerIdentifiers { get; set; } = new HashSet<string> { "update-topic" };
|
public override HashSet<string> ListenerIdentifiers { get; set; } = new HashSet<string> { "topic" };
|
||||||
|
|
||||||
public TestSubscription(ILogger logger, Action<DataEvent<T>> handler) : base(logger, false)
|
public TestSubscription(ILogger logger, Action<DataEvent<T>> handler) : base(logger, false)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -3,18 +3,13 @@ using System.Collections.Generic;
|
|||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using CryptoExchange.Net.Authentication;
|
using CryptoExchange.Net.Authentication;
|
||||||
using CryptoExchange.Net.Clients;
|
using CryptoExchange.Net.Clients;
|
||||||
using CryptoExchange.Net.Converters.SystemTextJson;
|
|
||||||
using CryptoExchange.Net.Interfaces;
|
|
||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using CryptoExchange.Net.Objects.Options;
|
using CryptoExchange.Net.Objects.Options;
|
||||||
using CryptoExchange.Net.SharedApis;
|
|
||||||
using CryptoExchange.Net.UnitTests.TestImplementations;
|
using CryptoExchange.Net.UnitTests.TestImplementations;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Microsoft.Extensions.Logging.Abstractions;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.UnitTests
|
namespace CryptoExchange.Net.UnitTests
|
||||||
{
|
{
|
||||||
@ -24,15 +19,13 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
|
|
||||||
public TestBaseClient(): base(null, "Test")
|
public TestBaseClient(): base(null, "Test")
|
||||||
{
|
{
|
||||||
var options = new TestClientOptions();
|
var options = TestClientOptions.Default.Copy();
|
||||||
_logger = NullLogger.Instance;
|
|
||||||
Initialize(options);
|
Initialize(options);
|
||||||
SubClient = AddApiClient(new TestSubClient(options, new RestApiOptions()));
|
SubClient = AddApiClient(new TestSubClient(options, new RestApiOptions()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public TestBaseClient(TestClientOptions exchangeOptions) : base(null, "Test")
|
public TestBaseClient(TestClientOptions exchangeOptions) : base(null, "Test")
|
||||||
{
|
{
|
||||||
_logger = NullLogger.Instance;
|
|
||||||
Initialize(exchangeOptions);
|
Initialize(exchangeOptions);
|
||||||
SubClient = AddApiClient(new TestSubClient(exchangeOptions, new RestApiOptions()));
|
SubClient = AddApiClient(new TestSubClient(exchangeOptions, new RestApiOptions()));
|
||||||
}
|
}
|
||||||
@ -61,12 +54,8 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
return deserializeResult;
|
return deserializeResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode futuresType, DateTime? deliverDate = null) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
|
|
||||||
public override TimeSpan? GetTimeOffset() => null;
|
public override TimeSpan? GetTimeOffset() => null;
|
||||||
public override TimeSyncInfo GetTimeSyncInfo() => null;
|
public override TimeSyncInfo GetTimeSyncInfo() => null;
|
||||||
protected override IStreamMessageAccessor CreateAccessor() => new SystemTextJsonStreamMessageAccessor(new System.Text.Json.JsonSerializerOptions());
|
|
||||||
protected override IMessageSerializer CreateSerializer() => new SystemTextJsonMessageSerializer(new System.Text.Json.JsonSerializerOptions());
|
|
||||||
protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials) => throw new NotImplementedException();
|
protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials) => throw new NotImplementedException();
|
||||||
protected override Task<WebCallResult<DateTime>> GetServerTimestampAsync() => throw new NotImplementedException();
|
protected override Task<WebCallResult<DateTime>> GetServerTimestampAsync() => throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
@ -77,11 +66,14 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void AuthenticateRequest(RestApiClient apiClient, Uri uri, HttpMethod method, ref IDictionary<string, object> uriParams, ref IDictionary<string, object> bodyParams, ref Dictionary<string, string> headers, bool auth, ArrayParametersSerialization arraySerialization, HttpMethodParameterPosition parameterPosition, RequestBodyFormat bodyFormat)
|
public override void AuthenticateRequest(RestApiClient apiClient, Uri uri, HttpMethod method, Dictionary<string, object> providedParameters, bool auth, ArrayParametersSerialization arraySerialization, HttpMethodParameterPosition parameterPosition, RequestBodyFormat bodyFormat, out SortedDictionary<string, object> uriParameters, out SortedDictionary<string, object> bodyParameters, out Dictionary<string, string> headers)
|
||||||
{
|
{
|
||||||
|
bodyParameters = new SortedDictionary<string, object>();
|
||||||
|
uriParameters = new SortedDictionary<string, object>();
|
||||||
|
headers = new Dictionary<string, string>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public string GetKey() => _credentials.Key;
|
public string GetKey() => _credentials.Key.GetString();
|
||||||
public string GetSecret() => _credentials.Secret;
|
public string GetSecret() => _credentials.Secret.GetString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,14 +1,12 @@
|
|||||||
using System.Text.Json.Serialization;
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
namespace CryptoExchange.Net.UnitTests.TestImplementations
|
namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||||
{
|
{
|
||||||
public class TestObject
|
public class TestObject
|
||||||
{
|
{
|
||||||
[JsonPropertyName("other")]
|
[JsonProperty("other")]
|
||||||
public string StringData { get; set; }
|
public string StringData { get; set; }
|
||||||
[JsonPropertyName("intData")]
|
|
||||||
public int IntData { get; set; }
|
public int IntData { get; set; }
|
||||||
[JsonPropertyName("decimalData")]
|
|
||||||
public decimal DecimalData { get; set; }
|
public decimal DecimalData { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
using CryptoExchange.Net.Interfaces;
|
using CryptoExchange.Net.Interfaces;
|
||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using Moq;
|
using Moq;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
@ -11,13 +12,9 @@ using System.Threading;
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using CryptoExchange.Net.Authentication;
|
using CryptoExchange.Net.Authentication;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using CryptoExchange.Net.Objects.Options;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using CryptoExchange.Net.Clients;
|
using CryptoExchange.Net.Clients;
|
||||||
using CryptoExchange.Net.SharedApis;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using System.Linq;
|
|
||||||
using CryptoExchange.Net.Converters.SystemTextJson;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.UnitTests.TestImplementations
|
namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||||
{
|
{
|
||||||
@ -26,17 +23,22 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
|||||||
public TestRestApi1Client Api1 { get; }
|
public TestRestApi1Client Api1 { get; }
|
||||||
public TestRestApi2Client Api2 { get; }
|
public TestRestApi2Client Api2 { get; }
|
||||||
|
|
||||||
public TestRestClient(Action<TestClientOptions> optionsDelegate = null)
|
public TestRestClient(Action<TestClientOptions> optionsFunc) : this(optionsFunc, null)
|
||||||
: this(null, null, Options.Create(ApplyOptionsDelegate(optionsDelegate)))
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public TestRestClient(HttpClient httpClient, ILoggerFactory loggerFactory, IOptions<TestClientOptions> options) : base(loggerFactory, "Test")
|
public TestRestClient(ILoggerFactory loggerFactory = null, HttpClient httpClient = null) : this((x) => { }, httpClient, loggerFactory)
|
||||||
{
|
{
|
||||||
Initialize(options.Value);
|
}
|
||||||
|
|
||||||
Api1 = new TestRestApi1Client(options.Value);
|
public TestRestClient(Action<TestClientOptions> optionsFunc, HttpClient httpClient = null, ILoggerFactory loggerFactory = null) : base(loggerFactory, "Test")
|
||||||
Api2 = new TestRestApi2Client(options.Value);
|
{
|
||||||
|
var options = TestClientOptions.Default.Copy();
|
||||||
|
optionsFunc(options);
|
||||||
|
Initialize(options);
|
||||||
|
|
||||||
|
Api1 = new TestRestApi1Client(options);
|
||||||
|
Api2 = new TestRestApi2Client(options);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetResponse(string responseData, out IRequest requestObj)
|
public void SetResponse(string responseData, out IRequest requestObj)
|
||||||
@ -50,13 +52,13 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
|||||||
response.Setup(c => c.IsSuccessStatusCode).Returns(true);
|
response.Setup(c => c.IsSuccessStatusCode).Returns(true);
|
||||||
response.Setup(c => c.GetResponseStreamAsync()).Returns(Task.FromResult((Stream)responseStream));
|
response.Setup(c => c.GetResponseStreamAsync()).Returns(Task.FromResult((Stream)responseStream));
|
||||||
|
|
||||||
var headers = new Dictionary<string, string[]>();
|
var headers = new Dictionary<string, IEnumerable<string>>();
|
||||||
var request = new Mock<IRequest>();
|
var request = new Mock<IRequest>();
|
||||||
request.Setup(c => c.Uri).Returns(new Uri("http://www.test.com"));
|
request.Setup(c => c.Uri).Returns(new Uri("http://www.test.com"));
|
||||||
request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(response.Object));
|
request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(response.Object));
|
||||||
request.Setup(c => c.SetContent(It.IsAny<string>(), It.IsAny<string>())).Callback(new Action<string, string>((content, type) => { request.Setup(r => r.Content).Returns(content); }));
|
request.Setup(c => c.SetContent(It.IsAny<string>(), It.IsAny<string>())).Callback(new Action<string, string>((content, type) => { request.Setup(r => r.Content).Returns(content); }));
|
||||||
request.Setup(c => c.AddHeader(It.IsAny<string>(), It.IsAny<string>())).Callback<string, string>((key, val) => headers.Add(key, new string[] { val }));
|
request.Setup(c => c.AddHeader(It.IsAny<string>(), It.IsAny<string>())).Callback<string, string>((key, val) => headers.Add(key, new List<string> { val }));
|
||||||
request.Setup(c => c.GetHeaders()).Returns(() => headers.ToArray());
|
request.Setup(c => c.GetHeaders()).Returns(() => headers);
|
||||||
|
|
||||||
var factory = Mock.Get(Api1.RequestFactory);
|
var factory = Mock.Get(Api1.RequestFactory);
|
||||||
factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
|
factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
|
||||||
@ -85,7 +87,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
|||||||
|
|
||||||
var request = new Mock<IRequest>();
|
var request = new Mock<IRequest>();
|
||||||
request.Setup(c => c.Uri).Returns(new Uri("http://www.test.com"));
|
request.Setup(c => c.Uri).Returns(new Uri("http://www.test.com"));
|
||||||
request.Setup(c => c.GetHeaders()).Returns(new KeyValuePair<string, string[]>[0]);
|
request.Setup(c => c.GetHeaders()).Returns(new Dictionary<string, IEnumerable<string>>());
|
||||||
request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Throws(we);
|
request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Throws(we);
|
||||||
|
|
||||||
var factory = Mock.Get(Api1.RequestFactory);
|
var factory = Mock.Get(Api1.RequestFactory);
|
||||||
@ -109,12 +111,12 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
|||||||
response.Setup(c => c.IsSuccessStatusCode).Returns(false);
|
response.Setup(c => c.IsSuccessStatusCode).Returns(false);
|
||||||
response.Setup(c => c.GetResponseStreamAsync()).Returns(Task.FromResult((Stream)responseStream));
|
response.Setup(c => c.GetResponseStreamAsync()).Returns(Task.FromResult((Stream)responseStream));
|
||||||
|
|
||||||
var headers = new List<KeyValuePair<string, string[]>>();
|
var headers = new Dictionary<string, IEnumerable<string>>();
|
||||||
var request = new Mock<IRequest>();
|
var request = new Mock<IRequest>();
|
||||||
request.Setup(c => c.Uri).Returns(new Uri("http://www.test.com"));
|
request.Setup(c => c.Uri).Returns(new Uri("http://www.test.com"));
|
||||||
request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(response.Object));
|
request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(response.Object));
|
||||||
request.Setup(c => c.AddHeader(It.IsAny<string>(), It.IsAny<string>())).Callback<string, string>((key, val) => headers.Add(new KeyValuePair<string, string[]>(key, new string[] { val })));
|
request.Setup(c => c.AddHeader(It.IsAny<string>(), It.IsAny<string>())).Callback<string, string>((key, val) => headers.Add(key, new List<string> { val }));
|
||||||
request.Setup(c => c.GetHeaders()).Returns(headers.ToArray());
|
request.Setup(c => c.GetHeaders()).Returns(headers);
|
||||||
|
|
||||||
var factory = Mock.Get(Api1.RequestFactory);
|
var factory = Mock.Get(Api1.RequestFactory);
|
||||||
factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
|
factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
|
||||||
@ -135,20 +137,14 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
|||||||
RequestFactory = new Mock<IRequestFactory>().Object;
|
RequestFactory = new Mock<IRequestFactory>().Object;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode futuresType, DateTime? deliverDate = null) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
|
|
||||||
|
|
||||||
protected override IStreamMessageAccessor CreateAccessor() => new SystemTextJsonStreamMessageAccessor(new System.Text.Json.JsonSerializerOptions() { TypeInfoResolver = new TestSerializerContext() });
|
|
||||||
protected override IMessageSerializer CreateSerializer() => new SystemTextJsonMessageSerializer(new System.Text.Json.JsonSerializerOptions());
|
|
||||||
|
|
||||||
public async Task<CallResult<T>> Request<T>(CancellationToken ct = default) where T : class
|
public async Task<CallResult<T>> Request<T>(CancellationToken ct = default) where T : class
|
||||||
{
|
{
|
||||||
return await SendAsync<T>("http://www.test.com", new RequestDefinition("/", HttpMethod.Get) { Weight = 0 }, null, ct);
|
return await SendRequestAsync<T>(new Uri("http://www.test.com"), HttpMethod.Get, ct);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<CallResult<T>> RequestWithParams<T>(HttpMethod method, ParameterCollection parameters, Dictionary<string, string> headers) where T : class
|
public async Task<CallResult<T>> RequestWithParams<T>(HttpMethod method, Dictionary<string, object> parameters, Dictionary<string, string> headers) where T : class
|
||||||
{
|
{
|
||||||
return await SendAsync<T>("http://www.test.com", new RequestDefinition("/", method) { Weight = 0 }, parameters, default, additionalHeaders: headers);
|
return await SendRequestAsync<T>(new Uri("http://www.test.com"), method, default, parameters, additionalHeaders: headers);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetParameterPosition(HttpMethod method, HttpMethodParameterPosition position)
|
public void SetParameterPosition(HttpMethod method, HttpMethodParameterPosition position)
|
||||||
@ -182,18 +178,12 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
|||||||
RequestFactory = new Mock<IRequestFactory>().Object;
|
RequestFactory = new Mock<IRequestFactory>().Object;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override IStreamMessageAccessor CreateAccessor() => new SystemTextJsonStreamMessageAccessor(new System.Text.Json.JsonSerializerOptions());
|
|
||||||
protected override IMessageSerializer CreateSerializer() => new SystemTextJsonMessageSerializer(new System.Text.Json.JsonSerializerOptions());
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode futuresType, DateTime? deliverDate = null) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
|
|
||||||
|
|
||||||
public async Task<CallResult<T>> Request<T>(CancellationToken ct = default) where T : class
|
public async Task<CallResult<T>> Request<T>(CancellationToken ct = default) where T : class
|
||||||
{
|
{
|
||||||
return await SendAsync<T>("http://www.test.com", new RequestDefinition("/", HttpMethod.Get) { Weight = 0 }, null, ct);
|
return await SendRequestAsync<T>(new Uri("http://www.test.com"), HttpMethod.Get, ct);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override Error ParseErrorResponse(int httpStatusCode, KeyValuePair<string, string[]>[] responseHeaders, IMessageAccessor accessor, Exception exception)
|
protected override Error ParseErrorResponse(int httpStatusCode, IEnumerable<KeyValuePair<string, IEnumerable<string>>> responseHeaders, IMessageAccessor accessor)
|
||||||
{
|
{
|
||||||
var errorData = accessor.Deserialize<TestError>();
|
var errorData = accessor.Deserialize<TestError>();
|
||||||
|
|
||||||
@ -221,9 +211,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
|||||||
|
|
||||||
public class TestError
|
public class TestError
|
||||||
{
|
{
|
||||||
[JsonPropertyName("errorCode")]
|
|
||||||
public int ErrorCode { get; set; }
|
public int ErrorCode { get; set; }
|
||||||
[JsonPropertyName("errorMessage")]
|
|
||||||
public string ErrorMessage { get; set; }
|
public string ErrorMessage { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,132 +1,130 @@
|
|||||||
//using System;
|
using System;
|
||||||
//using System.IO;
|
using System.IO;
|
||||||
//using System.Net.WebSockets;
|
using System.Net.WebSockets;
|
||||||
//using System.Security.Authentication;
|
using System.Security.Authentication;
|
||||||
//using System.Text;
|
using System.Text;
|
||||||
//using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
//using CryptoExchange.Net.Interfaces;
|
using CryptoExchange.Net.Interfaces;
|
||||||
//using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
|
|
||||||
//namespace CryptoExchange.Net.UnitTests.TestImplementations
|
namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||||
//{
|
{
|
||||||
// public class TestSocket: IWebsocket
|
public class TestSocket: IWebsocket
|
||||||
// {
|
{
|
||||||
// public bool CanConnect { get; set; }
|
public bool CanConnect { get; set; }
|
||||||
// public bool Connected { get; set; }
|
public bool Connected { get; set; }
|
||||||
|
|
||||||
// public event Func<Task> OnClose;
|
public event Func<Task> OnClose;
|
||||||
//#pragma warning disable 0067
|
#pragma warning disable 0067
|
||||||
// public event Func<Task> OnReconnected;
|
public event Func<Task> OnReconnected;
|
||||||
// public event Func<Task> OnReconnecting;
|
public event Func<Task> OnReconnecting;
|
||||||
// public event Func<int, Task> OnRequestRateLimited;
|
#pragma warning restore 0067
|
||||||
//#pragma warning restore 0067
|
public event Func<int, Task> OnRequestSent;
|
||||||
// public event Func<int, Task> OnRequestSent;
|
public event Action<WebSocketMessageType, ReadOnlyMemory<byte>> OnStreamMessage;
|
||||||
// public event Func<WebSocketMessageType, ReadOnlyMemory<byte>, Task> OnStreamMessage;
|
public event Func<Exception, Task> OnError;
|
||||||
// public event Func<Exception, Task> OnError;
|
public event Func<Task> OnOpen;
|
||||||
// public event Func<Task> OnOpen;
|
public Func<Task<Uri>> GetReconnectionUrl { get; set; }
|
||||||
// public Func<Task<Uri>> GetReconnectionUrl { get; set; }
|
|
||||||
|
|
||||||
// public int Id { get; }
|
public int Id { get; }
|
||||||
// public bool ShouldReconnect { get; set; }
|
public bool ShouldReconnect { get; set; }
|
||||||
// public TimeSpan Timeout { get; set; }
|
public TimeSpan Timeout { get; set; }
|
||||||
// public Func<string, string> DataInterpreterString { get; set; }
|
public Func<string, string> DataInterpreterString { get; set; }
|
||||||
// public Func<byte[], string> DataInterpreterBytes { get; set; }
|
public Func<byte[], string> DataInterpreterBytes { get; set; }
|
||||||
// public DateTime? DisconnectTime { get; set; }
|
public DateTime? DisconnectTime { get; set; }
|
||||||
// public string Url { get; }
|
public string Url { get; }
|
||||||
// public bool IsClosed => !Connected;
|
public bool IsClosed => !Connected;
|
||||||
// public bool IsOpen => Connected;
|
public bool IsOpen => Connected;
|
||||||
// public bool PingConnection { get; set; }
|
public bool PingConnection { get; set; }
|
||||||
// public TimeSpan PingInterval { get; set; }
|
public TimeSpan PingInterval { get; set; }
|
||||||
// public SslProtocols SSLProtocols { get; set; }
|
public SslProtocols SSLProtocols { get; set; }
|
||||||
// public Encoding Encoding { get; set; }
|
public Encoding Encoding { get; set; }
|
||||||
|
|
||||||
// public int ConnectCalls { get; private set; }
|
public int ConnectCalls { get; private set; }
|
||||||
// public bool Reconnecting { get; set; }
|
public bool Reconnecting { get; set; }
|
||||||
// public string Origin { get; set; }
|
public string Origin { get; set; }
|
||||||
// public int? RatelimitPerSecond { get; set; }
|
public int? RatelimitPerSecond { get; set; }
|
||||||
|
|
||||||
// public double IncomingKbps => throw new NotImplementedException();
|
public double IncomingKbps => throw new NotImplementedException();
|
||||||
|
|
||||||
// public Uri Uri => new Uri("");
|
public Uri Uri => new Uri("");
|
||||||
|
|
||||||
// public TimeSpan KeepAliveInterval { get; set; }
|
public TimeSpan KeepAliveInterval { get; set; }
|
||||||
|
|
||||||
// public static int lastId = 0;
|
public static int lastId = 0;
|
||||||
// public static object lastIdLock = new object();
|
public static object lastIdLock = new object();
|
||||||
|
|
||||||
// public TestSocket()
|
public TestSocket()
|
||||||
// {
|
{
|
||||||
// lock (lastIdLock)
|
lock (lastIdLock)
|
||||||
// {
|
{
|
||||||
// Id = lastId + 1;
|
Id = lastId + 1;
|
||||||
// lastId++;
|
lastId++;
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
// public Task<CallResult> ConnectAsync()
|
public Task<bool> ConnectAsync()
|
||||||
// {
|
{
|
||||||
// Connected = CanConnect;
|
Connected = CanConnect;
|
||||||
// ConnectCalls++;
|
ConnectCalls++;
|
||||||
// if (CanConnect)
|
if (CanConnect)
|
||||||
// InvokeOpen();
|
InvokeOpen();
|
||||||
// return Task.FromResult(CanConnect ? new CallResult(null) : new CallResult(new CantConnectError()));
|
return Task.FromResult(CanConnect);
|
||||||
// }
|
}
|
||||||
|
|
||||||
// public bool Send(int requestId, string data, int weight)
|
public void Send(int requestId, string data, int weight)
|
||||||
// {
|
{
|
||||||
// if(!Connected)
|
if(!Connected)
|
||||||
// throw new Exception("Socket not connected");
|
throw new Exception("Socket not connected");
|
||||||
// OnRequestSent?.Invoke(requestId);
|
OnRequestSent?.Invoke(requestId);
|
||||||
// return true;
|
}
|
||||||
// }
|
|
||||||
|
|
||||||
// public void Reset()
|
public void Reset()
|
||||||
// {
|
{
|
||||||
// }
|
}
|
||||||
|
|
||||||
// public Task CloseAsync()
|
public Task CloseAsync()
|
||||||
// {
|
{
|
||||||
// Connected = false;
|
Connected = false;
|
||||||
// DisconnectTime = DateTime.UtcNow;
|
DisconnectTime = DateTime.UtcNow;
|
||||||
// OnClose?.Invoke();
|
OnClose?.Invoke();
|
||||||
// return Task.FromResult(0);
|
return Task.FromResult(0);
|
||||||
// }
|
}
|
||||||
|
|
||||||
// public void SetProxy(string host, int port)
|
public void SetProxy(string host, int port)
|
||||||
// {
|
{
|
||||||
// throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
// }
|
}
|
||||||
// public void Dispose()
|
public void Dispose()
|
||||||
// {
|
{
|
||||||
// }
|
}
|
||||||
|
|
||||||
// public void InvokeClose()
|
public void InvokeClose()
|
||||||
// {
|
{
|
||||||
// Connected = false;
|
Connected = false;
|
||||||
// DisconnectTime = DateTime.UtcNow;
|
DisconnectTime = DateTime.UtcNow;
|
||||||
// Reconnecting = true;
|
Reconnecting = true;
|
||||||
// OnClose?.Invoke();
|
OnClose?.Invoke();
|
||||||
// }
|
}
|
||||||
|
|
||||||
// public void InvokeOpen()
|
public void InvokeOpen()
|
||||||
// {
|
{
|
||||||
// OnOpen?.Invoke();
|
OnOpen?.Invoke();
|
||||||
// }
|
}
|
||||||
|
|
||||||
// public void InvokeMessage(string data)
|
public void InvokeMessage(string data)
|
||||||
// {
|
{
|
||||||
// OnStreamMessage?.Invoke(WebSocketMessageType.Text, new ReadOnlyMemory<byte>(Encoding.UTF8.GetBytes(data))).Wait();
|
OnStreamMessage?.Invoke(WebSocketMessageType.Text, new ReadOnlyMemory<byte>(Encoding.UTF8.GetBytes(data)));
|
||||||
// }
|
}
|
||||||
|
|
||||||
// public void SetProxy(ApiProxy proxy)
|
public void SetProxy(ApiProxy proxy)
|
||||||
// {
|
{
|
||||||
// throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
// }
|
}
|
||||||
|
|
||||||
// public void InvokeError(Exception error)
|
public void InvokeError(Exception error)
|
||||||
// {
|
{
|
||||||
// OnError?.Invoke(error);
|
OnError?.Invoke(error);
|
||||||
// }
|
}
|
||||||
// public Task ReconnectAsync() => Task.CompletedTask;
|
public Task ReconnectAsync() => Task.CompletedTask;
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
|
|||||||
@ -13,39 +13,40 @@ using CryptoExchange.Net.Sockets;
|
|||||||
using CryptoExchange.Net.UnitTests.TestImplementations.Sockets;
|
using CryptoExchange.Net.UnitTests.TestImplementations.Sockets;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Moq;
|
using Moq;
|
||||||
using CryptoExchange.Net.Testing.Implementations;
|
using Newtonsoft.Json.Linq;
|
||||||
using CryptoExchange.Net.SharedApis;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using CryptoExchange.Net.Converters.SystemTextJson;
|
|
||||||
using System.Net.WebSockets;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.UnitTests.TestImplementations
|
namespace CryptoExchange.Net.UnitTests.TestImplementations
|
||||||
{
|
{
|
||||||
internal class TestSocketClient: BaseSocketClient
|
public class TestSocketClient: BaseSocketClient
|
||||||
{
|
{
|
||||||
public TestSubSocketClient SubClient { get; }
|
public TestSubSocketClient SubClient { get; }
|
||||||
|
|
||||||
|
public TestSocketClient(ILoggerFactory loggerFactory = null) : this((x) => { }, loggerFactory)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Create a new instance of KucoinSocketClient
|
/// Create a new instance of KucoinSocketClient
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="optionsFunc">Configure the options to use for this client</param>
|
/// <param name="optionsFunc">Configure the options to use for this client</param>
|
||||||
public TestSocketClient(Action<TestSocketOptions> optionsDelegate = null)
|
public TestSocketClient(Action<TestSocketOptions> optionsFunc) : this(optionsFunc, null)
|
||||||
: this(Options.Create(ApplyOptionsDelegate(optionsDelegate)), null)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public TestSocketClient(IOptions<TestSocketOptions> options, ILoggerFactory loggerFactory = null) : base(loggerFactory, "Test")
|
public TestSocketClient(Action<TestSocketOptions> optionsFunc, ILoggerFactory loggerFactory = null) : base(loggerFactory, "Test")
|
||||||
{
|
{
|
||||||
Initialize(options.Value);
|
var options = TestSocketOptions.Default.Copy<TestSocketOptions>();
|
||||||
|
optionsFunc(options);
|
||||||
|
Initialize(options);
|
||||||
|
|
||||||
SubClient = AddApiClient(new TestSubSocketClient(options.Value, options.Value.SubOptions));
|
SubClient = AddApiClient(new TestSubSocketClient(options, options.SubOptions));
|
||||||
SubClient.SocketFactory = new Mock<IWebsocketFactory>().Object;
|
SubClient.SocketFactory = new Mock<IWebsocketFactory>().Object;
|
||||||
Mock.Get(SubClient.SocketFactory).Setup(f => f.CreateWebsocket(It.IsAny<ILogger>(), It.IsAny<WebSocketParameters>())).Returns(new TestSocket("https://test.com"));
|
Mock.Get(SubClient.SocketFactory).Setup(f => f.CreateWebsocket(It.IsAny<ILogger>(), It.IsAny<WebSocketParameters>())).Returns(new TestSocket());
|
||||||
}
|
}
|
||||||
|
|
||||||
public TestSocket CreateSocket()
|
public TestSocket CreateSocket()
|
||||||
{
|
{
|
||||||
Mock.Get(SubClient.SocketFactory).Setup(f => f.CreateWebsocket(It.IsAny<ILogger>(), It.IsAny<WebSocketParameters>())).Returns(new TestSocket("https://test.com"));
|
Mock.Get(SubClient.SocketFactory).Setup(f => f.CreateWebsocket(It.IsAny<ILogger>(), It.IsAny<WebSocketParameters>())).Returns(new TestSocket());
|
||||||
return (TestSocket)SubClient.CreateSocketInternal("https://localhost:123/");
|
return (TestSocket)SubClient.CreateSocketInternal("https://localhost:123/");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -68,28 +69,12 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
|||||||
Environment = new TestEnvironment("Live", "https://test.test")
|
Environment = new TestEnvironment("Live", "https://test.test")
|
||||||
};
|
};
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
public TestSocketOptions()
|
|
||||||
{
|
|
||||||
Default?.Set(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public SocketApiOptions SubOptions { get; set; } = new SocketApiOptions();
|
public SocketApiOptions SubOptions { get; set; } = new SocketApiOptions();
|
||||||
|
|
||||||
internal TestSocketOptions Set(TestSocketOptions targetOptions)
|
|
||||||
{
|
|
||||||
targetOptions = base.Set<TestSocketOptions>(targetOptions);
|
|
||||||
targetOptions.SubOptions = SubOptions.Set(targetOptions.SubOptions);
|
|
||||||
return targetOptions;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class TestSubSocketClient : SocketApiClient
|
public class TestSubSocketClient : SocketApiClient
|
||||||
{
|
{
|
||||||
private MessagePath _channelPath = MessagePath.Get().Property("channel");
|
private MessagePath _channelPath = MessagePath.Get().Property("channel");
|
||||||
private MessagePath _actionPath = MessagePath.Get().Property("action");
|
|
||||||
private MessagePath _topicPath = MessagePath.Get().Property("topic");
|
private MessagePath _topicPath = MessagePath.Get().Property("topic");
|
||||||
|
|
||||||
public Subscription TestSubscription { get; private set; } = null;
|
public Subscription TestSubscription { get; private set; } = null;
|
||||||
@ -99,12 +84,6 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected internal override IByteMessageAccessor CreateAccessor(WebSocketMessageType type) => new SystemTextJsonByteMessageAccessor(new System.Text.Json.JsonSerializerOptions());
|
|
||||||
protected internal override IMessageSerializer CreateSerializer() => new SystemTextJsonMessageSerializer(new System.Text.Json.JsonSerializerOptions());
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode futuresType, DateTime? deliverDate = null) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
|
|
||||||
|
|
||||||
internal IWebsocket CreateSocketInternal(string address)
|
internal IWebsocket CreateSocketInternal(string address)
|
||||||
{
|
{
|
||||||
return CreateSocket(address);
|
return CreateSocket(address);
|
||||||
@ -113,14 +92,14 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
|||||||
protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
|
protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
|
||||||
=> new TestAuthProvider(credentials);
|
=> new TestAuthProvider(credentials);
|
||||||
|
|
||||||
public CallResult ConnectSocketSub(SocketConnection sub)
|
public CallResult<bool> ConnectSocketSub(SocketConnection sub)
|
||||||
{
|
{
|
||||||
return ConnectSocketAsync(sub, default).Result;
|
return ConnectSocketAsync(sub).Result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string GetListenerIdentifier(IMessageAccessor message)
|
public override string GetListenerIdentifier(IMessageAccessor message)
|
||||||
{
|
{
|
||||||
if (!message.IsValid)
|
if (!message.IsJson)
|
||||||
{
|
{
|
||||||
return "topic";
|
return "topic";
|
||||||
}
|
}
|
||||||
@ -128,7 +107,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
|
|||||||
var id = message.GetValue<string>(_channelPath);
|
var id = message.GetValue<string>(_channelPath);
|
||||||
id ??= message.GetValue<string>(_topicPath);
|
id ??= message.GetValue<string>(_topicPath);
|
||||||
|
|
||||||
return message.GetValue<string>(_actionPath) + "-" + id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<CallResult<UpdateSubscription>> SubscribeToSomethingAsync(string channel, Action<DataEvent<string>> onUpdate, CancellationToken ct)
|
public Task<CallResult<UpdateSubscription>> SubscribeToSomethingAsync(string channel, Action<DataEvent<string>> onUpdate, CancellationToken ct)
|
||||||
|
|||||||
@ -1,21 +0,0 @@
|
|||||||
using CryptoExchange.Net.UnitTests.TestImplementations;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.UnitTests
|
|
||||||
{
|
|
||||||
[JsonSerializable(typeof(string))]
|
|
||||||
[JsonSerializable(typeof(int))]
|
|
||||||
[JsonSerializable(typeof(Dictionary<string, string>))]
|
|
||||||
[JsonSerializable(typeof(IDictionary<string, string>))]
|
|
||||||
[JsonSerializable(typeof(Dictionary<string, object>))]
|
|
||||||
[JsonSerializable(typeof(IDictionary<string, object>))]
|
|
||||||
[JsonSerializable(typeof(TestObject))]
|
|
||||||
internal partial class TestSerializerContext : JsonSerializerContext
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -11,11 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorClient", "Examples\Bl
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{5734C2A9-F12C-4754-A8B9-640C24DC4E02}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{5734C2A9-F12C-4754-A8B9-640C24DC4E02}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleClient", "Examples\ConsoleClient\ConsoleClient.csproj", "{23480C58-23BF-4EBF-A173-B7F51A043A99}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleClient", "Examples\ConsoleClient\ConsoleClient.csproj", "{23480C58-23BF-4EBF-A173-B7F51A043A99}"
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedClients", "Examples\SharedClients\SharedClients.csproj", "{988A87EF-EAEA-4313-A6CF-FA869813D5AB}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CryptoExchange.Net.Protobuf", "CryptoExchange.Net.Protobuf\CryptoExchange.Net.Protobuf.csproj", "{CC6A807A-9183-6F41-8EF1-8A70172B0E83}"
|
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@ -39,14 +35,6 @@ Global
|
|||||||
{23480C58-23BF-4EBF-A173-B7F51A043A99}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{23480C58-23BF-4EBF-A173-B7F51A043A99}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{23480C58-23BF-4EBF-A173-B7F51A043A99}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{23480C58-23BF-4EBF-A173-B7F51A043A99}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{23480C58-23BF-4EBF-A173-B7F51A043A99}.Release|Any CPU.Build.0 = Release|Any CPU
|
{23480C58-23BF-4EBF-A173-B7F51A043A99}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{988A87EF-EAEA-4313-A6CF-FA869813D5AB}.Debug|Any CPU.ActiveCfg = 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.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
|
||||||
@ -54,7 +42,6 @@ Global
|
|||||||
GlobalSection(NestedProjects) = preSolution
|
GlobalSection(NestedProjects) = preSolution
|
||||||
{AF4F5C19-162E-48F4-8B0B-BA5A2D7CE06A} = {5734C2A9-F12C-4754-A8B9-640C24DC4E02}
|
{AF4F5C19-162E-48F4-8B0B-BA5A2D7CE06A} = {5734C2A9-F12C-4754-A8B9-640C24DC4E02}
|
||||||
{23480C58-23BF-4EBF-A173-B7F51A043A99} = {5734C2A9-F12C-4754-A8B9-640C24DC4E02}
|
{23480C58-23BF-4EBF-A173-B7F51A043A99} = {5734C2A9-F12C-4754-A8B9-640C24DC4E02}
|
||||||
{988A87EF-EAEA-4313-A6CF-FA869813D5AB} = {5734C2A9-F12C-4754-A8B9-640C24DC4E02}
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {0D1B9CE9-E0B7-4B8B-88BF-6EA2CC8CA3D7}
|
SolutionGuid = {0D1B9CE9-E0B7-4B8B-88BF-6EA2CC8CA3D7}
|
||||||
|
|||||||
@ -5,7 +5,6 @@ namespace CryptoExchange.Net.Attributes
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Map a enum entry to string values
|
/// Map a enum entry to string values
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[AttributeUsage(AttributeTargets.Field)]
|
|
||||||
public class MapAttribute : Attribute
|
public class MapAttribute : Attribute
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
#if NETSTANDARD2_0
|
#if !NETSTANDARD2_1
|
||||||
namespace System.Diagnostics.CodeAnalysis
|
namespace System.Diagnostics.CodeAnalysis
|
||||||
{
|
{
|
||||||
using System;
|
using System;
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Security;
|
||||||
using CryptoExchange.Net.Converters.SystemTextJson;
|
using CryptoExchange.Net.Converters.SystemTextJson;
|
||||||
using CryptoExchange.Net.Converters.MessageParsing;
|
using CryptoExchange.Net.Converters.MessageParsing;
|
||||||
|
|
||||||
@ -8,44 +9,71 @@ namespace CryptoExchange.Net.Authentication
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Api credentials, used to sign requests accessing private endpoints
|
/// Api credentials, used to sign requests accessing private endpoints
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ApiCredentials
|
public class ApiCredentials: IDisposable
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The api key / label to authenticate requests
|
/// The api key to authenticate requests
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Key { get; set; }
|
public SecureString? Key { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The api secret or private key to authenticate requests
|
/// The api secret to authenticate requests
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Secret { get; set; }
|
public SecureString? Secret { get; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The api passphrase. Not needed on all exchanges
|
|
||||||
/// </summary>
|
|
||||||
public string? Pass { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Type of the credentials
|
/// Type of the credentials
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ApiCredentialsType CredentialType { get; set; }
|
public ApiCredentialsType CredentialType { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Create Api credentials providing an api key and secret for authentication
|
/// Create Api credentials providing an api key and secret for authentication
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="key">The api key / label used for identification</param>
|
/// <param name="key">The api key used for identification</param>
|
||||||
/// <param name="secret">The api secret or private key used for signing</param>
|
/// <param name="secret">The api secret used for signing</param>
|
||||||
/// <param name="pass">The api pass for the key. Not always needed</param>
|
public ApiCredentials(SecureString key, SecureString secret) : this(key, secret, ApiCredentialsType.Hmac)
|
||||||
/// <param name="credentialType">The type of credentials</param>
|
{
|
||||||
public ApiCredentials(string key, string secret, string? pass = null, ApiCredentialsType credentialType = ApiCredentialsType.Hmac)
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Create Api credentials providing an api key and secret for authentication
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="key">The api key used for identification</param>
|
||||||
|
/// <param name="secret">The api secret used for signing</param>
|
||||||
|
/// <param name="credentialsType">The type of credentials</param>
|
||||||
|
public ApiCredentials(SecureString key, SecureString secret, ApiCredentialsType credentialsType)
|
||||||
|
{
|
||||||
|
if (key == null || secret == null)
|
||||||
|
throw new ArgumentException("Key and secret can't be null/empty");
|
||||||
|
|
||||||
|
CredentialType = credentialsType;
|
||||||
|
Key = key;
|
||||||
|
Secret = secret;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Create Api credentials providing an api key and secret for authentication
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="key">The api key used for identification</param>
|
||||||
|
/// <param name="secret">The api secret used for signing</param>
|
||||||
|
public ApiCredentials(string key, string secret) : this(key, secret, ApiCredentialsType.Hmac)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Create Api credentials providing an api key and secret for authentication
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="key">The api key used for identification</param>
|
||||||
|
/// <param name="secret">The api secret used for signing</param>
|
||||||
|
/// <param name="credentialsType">The type of credentials</param>
|
||||||
|
public ApiCredentials(string key, string secret, ApiCredentialsType credentialsType)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(secret))
|
if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(secret))
|
||||||
throw new ArgumentException("Key and secret can't be null/empty");
|
throw new ArgumentException("Key and secret can't be null/empty");
|
||||||
|
|
||||||
CredentialType = credentialType;
|
CredentialType = credentialsType;
|
||||||
Key = key;
|
Key = key.ToSecureString();
|
||||||
Secret = secret;
|
Secret = secret.ToSecureString();
|
||||||
Pass = pass;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -54,7 +82,40 @@ namespace CryptoExchange.Net.Authentication
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public virtual ApiCredentials Copy()
|
public virtual ApiCredentials Copy()
|
||||||
{
|
{
|
||||||
return new ApiCredentials(Key, Secret, Pass, CredentialType);
|
// Use .GetString() to create a copy of the SecureString
|
||||||
|
return new ApiCredentials(Key!.GetString(), Secret!.GetString(), CredentialType);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Create Api credentials providing a stream containing json data. The json data should include two values: apiKey and apiSecret
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="inputStream">The stream containing the json data</param>
|
||||||
|
/// <param name="identifierKey">A key to identify the credentials for the API. For example, when set to `binanceKey` the json data should contain a value for the property `binanceKey`. Defaults to 'apiKey'.</param>
|
||||||
|
/// <param name="identifierSecret">A key to identify the credentials for the API. For example, when set to `binanceSecret` the json data should contain a value for the property `binanceSecret`. Defaults to 'apiSecret'.</param>
|
||||||
|
public ApiCredentials(Stream inputStream, string? identifierKey = null, string? identifierSecret = null)
|
||||||
|
{
|
||||||
|
var accessor = new SystemTextJsonStreamMessageAccessor();
|
||||||
|
if (!accessor.Read(inputStream, false).Result)
|
||||||
|
throw new ArgumentException("Input stream not valid json data");
|
||||||
|
|
||||||
|
var key = accessor.GetValue<string>(MessagePath.Get().Property(identifierKey ?? "apiKey"));
|
||||||
|
var secret = accessor.GetValue<string>(MessagePath.Get().Property(identifierSecret ?? "apiSecret"));
|
||||||
|
if (key == null || secret == null)
|
||||||
|
throw new ArgumentException("apiKey or apiSecret value not found in Json credential file");
|
||||||
|
|
||||||
|
Key = key.ToSecureString();
|
||||||
|
Secret = secret.ToSecureString();
|
||||||
|
|
||||||
|
inputStream.Seek(0, SeekOrigin.Begin);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Dispose
|
||||||
|
/// </summary>
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
Key?.Dispose();
|
||||||
|
Secret?.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
using CryptoExchange.Net.Clients;
|
using CryptoExchange.Net.Clients;
|
||||||
using CryptoExchange.Net.Converters.SystemTextJson;
|
using CryptoExchange.Net.Converters.SystemTextJson;
|
||||||
using CryptoExchange.Net.Interfaces;
|
|
||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@ -14,40 +13,29 @@ namespace CryptoExchange.Net.Authentication
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Base class for authentication providers
|
/// Base class for authentication providers
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public abstract class AuthenticationProvider
|
public abstract class AuthenticationProvider : IDisposable
|
||||||
{
|
{
|
||||||
internal IAuthTimeProvider TimeProvider { get; set; } = new AuthTimeProvider();
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Provided credentials
|
/// Provided credentials
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected internal readonly ApiCredentials _credentials;
|
protected readonly ApiCredentials _credentials;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Byte representation of the secret
|
/// Byte representation of the secret
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected byte[] _sBytes;
|
protected byte[] _sBytes;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get the API key of the current credentials
|
|
||||||
/// </summary>
|
|
||||||
public string ApiKey => _credentials.Key!;
|
|
||||||
/// <summary>
|
|
||||||
/// Get the Passphrase of the current credentials
|
|
||||||
/// </summary>
|
|
||||||
public string? Pass => _credentials.Pass;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ctor
|
/// ctor
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="credentials"></param>
|
/// <param name="credentials"></param>
|
||||||
protected AuthenticationProvider(ApiCredentials credentials)
|
protected AuthenticationProvider(ApiCredentials credentials)
|
||||||
{
|
{
|
||||||
if (credentials.Key == null || credentials.Secret == null)
|
if (credentials.Secret == null)
|
||||||
throw new ArgumentException("ApiKey/Secret needed");
|
throw new ArgumentException("ApiKey/Secret needed");
|
||||||
|
|
||||||
_credentials = credentials;
|
_credentials = credentials;
|
||||||
_sBytes = Encoding.UTF8.GetBytes(credentials.Secret);
|
_sBytes = Encoding.UTF8.GetBytes(credentials.Secret.GetString());
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -56,24 +44,26 @@ namespace CryptoExchange.Net.Authentication
|
|||||||
/// <param name="apiClient">The Api client sending the request</param>
|
/// <param name="apiClient">The Api client sending the request</param>
|
||||||
/// <param name="uri">The uri for the request</param>
|
/// <param name="uri">The uri for the request</param>
|
||||||
/// <param name="method">The method of the request</param>
|
/// <param name="method">The method of the request</param>
|
||||||
|
/// <param name="providedParameters">The request parameters</param>
|
||||||
/// <param name="auth">If the requests should be authenticated</param>
|
/// <param name="auth">If the requests should be authenticated</param>
|
||||||
/// <param name="arraySerialization">Array serialization type</param>
|
/// <param name="arraySerialization">Array serialization type</param>
|
||||||
|
/// <param name="parameterPosition">The position where the providedParameters should go</param>
|
||||||
/// <param name="requestBodyFormat">The formatting of the request body</param>
|
/// <param name="requestBodyFormat">The formatting of the request body</param>
|
||||||
/// <param name="uriParameters">Parameters that need to be in the Uri of the request. Should include the provided parameters if they should go in the uri</param>
|
/// <param name="uriParameters">Parameters that need to be in the Uri of the request. Should include the provided parameters if they should go in the uri</param>
|
||||||
/// <param name="bodyParameters">Parameters that need to be in the body of the request. Should include the provided parameters if they should go in the body</param>
|
/// <param name="bodyParameters">Parameters that need to be in the body of the request. Should include the provided parameters if they should go in the body</param>
|
||||||
/// <param name="headers">The headers that should be send with the request</param>
|
/// <param name="headers">The headers that should be send with the request</param>
|
||||||
/// <param name="parameterPosition">The position where the providedParameters should go</param>
|
|
||||||
public abstract void AuthenticateRequest(
|
public abstract void AuthenticateRequest(
|
||||||
RestApiClient apiClient,
|
RestApiClient apiClient,
|
||||||
Uri uri,
|
Uri uri,
|
||||||
HttpMethod method,
|
HttpMethod method,
|
||||||
ref IDictionary<string, object>? uriParameters,
|
Dictionary<string, object> providedParameters,
|
||||||
ref IDictionary<string, object>? bodyParameters,
|
|
||||||
ref Dictionary<string, string>? headers,
|
|
||||||
bool auth,
|
bool auth,
|
||||||
ArrayParametersSerialization arraySerialization,
|
ArrayParametersSerialization arraySerialization,
|
||||||
HttpMethodParameterPosition parameterPosition,
|
HttpMethodParameterPosition parameterPosition,
|
||||||
RequestBodyFormat requestBodyFormat
|
RequestBodyFormat requestBodyFormat,
|
||||||
|
out SortedDictionary<string, object> uriParameters,
|
||||||
|
out SortedDictionary<string, object> bodyParameters,
|
||||||
|
out Dictionary<string, string> headers
|
||||||
);
|
);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -373,9 +363,9 @@ namespace CryptoExchange.Net.Authentication
|
|||||||
var rsa = RSA.Create();
|
var rsa = RSA.Create();
|
||||||
if (_credentials.CredentialType == ApiCredentialsType.RsaPem)
|
if (_credentials.CredentialType == ApiCredentialsType.RsaPem)
|
||||||
{
|
{
|
||||||
#if NETSTANDARD2_1_OR_GREATER || NET9_0_OR_GREATER
|
#if NETSTANDARD2_1_OR_GREATER
|
||||||
// Read from pem private key
|
// Read from pem private key
|
||||||
var key = _credentials.Secret!
|
var key = _credentials.Secret!.GetString()
|
||||||
.Replace("\n", "")
|
.Replace("\n", "")
|
||||||
.Replace("-----BEGIN PRIVATE KEY-----", "")
|
.Replace("-----BEGIN PRIVATE KEY-----", "")
|
||||||
.Replace("-----END PRIVATE KEY-----", "")
|
.Replace("-----END PRIVATE KEY-----", "")
|
||||||
@ -390,7 +380,7 @@ namespace CryptoExchange.Net.Authentication
|
|||||||
else if (_credentials.CredentialType == ApiCredentialsType.RsaXml)
|
else if (_credentials.CredentialType == ApiCredentialsType.RsaXml)
|
||||||
{
|
{
|
||||||
// Read from xml private key format
|
// Read from xml private key format
|
||||||
rsa.FromXmlString(_credentials.Secret!);
|
rsa.FromXmlString(_credentials.Secret!.GetString());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -407,14 +397,10 @@ namespace CryptoExchange.Net.Authentication
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected static string BytesToHexString(byte[] buff)
|
protected static string BytesToHexString(byte[] buff)
|
||||||
{
|
{
|
||||||
#if NET9_0_OR_GREATER
|
|
||||||
return Convert.ToHexString(buff);
|
|
||||||
#else
|
|
||||||
var result = string.Empty;
|
var result = string.Empty;
|
||||||
foreach (var t in buff)
|
foreach (var t in buff)
|
||||||
result += t.ToString("X2");
|
result += t.ToString("X2");
|
||||||
return result;
|
return result;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -432,9 +418,9 @@ namespace CryptoExchange.Net.Authentication
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="apiClient"></param>
|
/// <param name="apiClient"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected DateTime GetTimestamp(RestApiClient apiClient)
|
protected static DateTime GetTimestamp(RestApiClient apiClient)
|
||||||
{
|
{
|
||||||
return TimeProvider.GetTime().Add(apiClient.GetTimeOffset() ?? TimeSpan.Zero)!;
|
return DateTime.UtcNow.Add(apiClient.GetTimeOffset() ?? TimeSpan.Zero)!;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -442,36 +428,15 @@ namespace CryptoExchange.Net.Authentication
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="apiClient"></param>
|
/// <param name="apiClient"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected string GetMillisecondTimestamp(RestApiClient apiClient)
|
protected static string GetMillisecondTimestamp(RestApiClient apiClient)
|
||||||
{
|
{
|
||||||
return DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient)).Value.ToString(CultureInfo.InvariantCulture);
|
return DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient)).Value.ToString(CultureInfo.InvariantCulture);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <inheritdoc />
|
||||||
/// Get millisecond timestamp as a long including the time sync offset from the api client
|
public void Dispose()
|
||||||
/// </summary>
|
|
||||||
/// <param name="apiClient"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected long GetMillisecondTimestampLong(RestApiClient apiClient)
|
|
||||||
{
|
{
|
||||||
return DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient)).Value;
|
_credentials?.Dispose();
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Return the serialized request body
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="serializer"></param>
|
|
||||||
/// <param name="parameters"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected static string GetSerializedBody(IMessageSerializer serializer, IDictionary<string, object> parameters)
|
|
||||||
{
|
|
||||||
if (serializer is not IStringMessageSerializer stringSerializer)
|
|
||||||
throw new InvalidOperationException("Non-string message serializer can't get serialized request body");
|
|
||||||
|
|
||||||
if (parameters.Count == 1 && parameters.TryGetValue(Constants.BodyPlaceHolderKey, out object? value))
|
|
||||||
return stringSerializer.Serialize(value);
|
|
||||||
else
|
|
||||||
return stringSerializer.Serialize(parameters);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,53 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Concurrent;
|
|
||||||
using System.Linq;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Caching
|
|
||||||
{
|
|
||||||
internal class MemoryCache
|
|
||||||
{
|
|
||||||
private readonly ConcurrentDictionary<string, CacheItem> _cache = new ConcurrentDictionary<string, CacheItem>();
|
|
||||||
private readonly object _lock = new object();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Add a new cache entry. Will override an existing entry if it already exists
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="key">The key identifier</param>
|
|
||||||
/// <param name="value">Cache value</param>
|
|
||||||
public void Add(string key, object value)
|
|
||||||
{
|
|
||||||
var cacheItem = new CacheItem(DateTime.UtcNow, value);
|
|
||||||
_cache.AddOrUpdate(key, cacheItem, (key, val1) => cacheItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get a cached value
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="key">The key identifier</param>
|
|
||||||
/// <param name="maxAge">The max age of the cached entry</param>
|
|
||||||
/// <returns>Cached value if it was in cache</returns>
|
|
||||||
public object? Get(string key, TimeSpan maxAge)
|
|
||||||
{
|
|
||||||
foreach (var item in _cache.Where(x => DateTime.UtcNow - x.Value.CacheTime > maxAge).ToList())
|
|
||||||
_cache.TryRemove(item.Key, out _);
|
|
||||||
|
|
||||||
_cache.TryGetValue(key, out CacheItem? value);
|
|
||||||
if (value == null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
return value.Value;
|
|
||||||
}
|
|
||||||
|
|
||||||
private class CacheItem
|
|
||||||
{
|
|
||||||
public DateTime CacheTime { get; }
|
|
||||||
public object Value { get; }
|
|
||||||
|
|
||||||
public CacheItem(DateTime cacheTime, object value)
|
|
||||||
{
|
|
||||||
CacheTime = cacheTime;
|
|
||||||
Value = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,9 +1,14 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using CryptoExchange.Net.Authentication;
|
using CryptoExchange.Net.Authentication;
|
||||||
|
using CryptoExchange.Net.Converters;
|
||||||
using CryptoExchange.Net.Interfaces;
|
using CryptoExchange.Net.Interfaces;
|
||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using CryptoExchange.Net.Objects.Options;
|
using CryptoExchange.Net.Objects.Options;
|
||||||
using CryptoExchange.Net.SharedApis;
|
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Clients
|
namespace CryptoExchange.Net.Clients
|
||||||
@ -38,12 +43,6 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool OutputOriginalData { get; }
|
public bool OutputOriginalData { get; }
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public bool Authenticated => ApiCredentials != null;
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public ApiCredentials? ApiCredentials { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Api options
|
/// Api options
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -58,7 +57,7 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// ctor
|
/// ctor
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="logger">Logger</param>
|
/// <param name="logger">Logger</param>
|
||||||
/// <param name="outputOriginalData">Should data from this client include the original data in the call result</param>
|
/// <param name="outputOriginalData">Should data from this client include the orginal data in the call result</param>
|
||||||
/// <param name="baseAddress">Base address for this API client</param>
|
/// <param name="baseAddress">Base address for this API client</param>
|
||||||
/// <param name="apiCredentials">Api credentials</param>
|
/// <param name="apiCredentials">Api credentials</param>
|
||||||
/// <param name="clientOptions">Client options</param>
|
/// <param name="clientOptions">Client options</param>
|
||||||
@ -71,10 +70,12 @@ namespace CryptoExchange.Net.Clients
|
|||||||
ApiOptions = apiOptions;
|
ApiOptions = apiOptions;
|
||||||
OutputOriginalData = outputOriginalData;
|
OutputOriginalData = outputOriginalData;
|
||||||
BaseAddress = baseAddress;
|
BaseAddress = baseAddress;
|
||||||
ApiCredentials = apiCredentials?.Copy();
|
|
||||||
|
|
||||||
if (ApiCredentials != null)
|
if (apiCredentials != null)
|
||||||
AuthenticationProvider = CreateAuthenticationProvider(ApiCredentials);
|
{
|
||||||
|
AuthenticationProvider?.Dispose();
|
||||||
|
AuthenticationProvider = CreateAuthenticationProvider(apiCredentials.Copy());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -84,26 +85,14 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected abstract AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials);
|
protected abstract AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials);
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public abstract string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverDate = null);
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public void SetApiCredentials<T>(T credentials) where T : ApiCredentials
|
public void SetApiCredentials<T>(T credentials) where T : ApiCredentials
|
||||||
{
|
{
|
||||||
ApiCredentials = credentials?.Copy();
|
if (credentials != null)
|
||||||
if (ApiCredentials != null)
|
{
|
||||||
AuthenticationProvider = CreateAuthenticationProvider(ApiCredentials);
|
AuthenticationProvider?.Dispose();
|
||||||
}
|
AuthenticationProvider = CreateAuthenticationProvider(credentials.Copy());
|
||||||
|
}
|
||||||
/// <inheritdoc />
|
|
||||||
public virtual void SetOptions<T>(UpdateOptions<T> options) where T : ApiCredentials
|
|
||||||
{
|
|
||||||
ClientOptions.Proxy = options.Proxy;
|
|
||||||
ClientOptions.RequestTimeout = options.RequestTimeout ?? ClientOptions.RequestTimeout;
|
|
||||||
|
|
||||||
ApiCredentials = options.ApiCredentials?.Copy() ?? ApiCredentials;
|
|
||||||
if (ApiCredentials != null)
|
|
||||||
AuthenticationProvider = CreateAuthenticationProvider(ApiCredentials);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -112,6 +101,7 @@ namespace CryptoExchange.Net.Clients
|
|||||||
public virtual void Dispose()
|
public virtual void Dispose()
|
||||||
{
|
{
|
||||||
_disposing = true;
|
_disposing = true;
|
||||||
|
AuthenticationProvider?.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,28 +12,6 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public abstract class BaseClient : IDisposable
|
public abstract class BaseClient : IDisposable
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Version of the CryptoExchange.Net base library
|
|
||||||
/// </summary>
|
|
||||||
public Version CryptoExchangeLibVersion { get; } = typeof(BaseClient).Assembly.GetName().Version!;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Version of the client implementation
|
|
||||||
/// </summary>
|
|
||||||
public Version ExchangeLibVersion
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
lock(_versionLock)
|
|
||||||
{
|
|
||||||
if (_exchangeVersion == null)
|
|
||||||
_exchangeVersion = GetType().Assembly.GetName().Version!;
|
|
||||||
|
|
||||||
return _exchangeVersion;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The name of the API the client is for
|
/// The name of the API the client is for
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -49,9 +27,6 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected internal ILogger _logger;
|
protected internal ILogger _logger;
|
||||||
|
|
||||||
private readonly object _versionLock = new object();
|
|
||||||
private Version _exchangeVersion;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Provided client options
|
/// Provided client options
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -66,6 +41,8 @@ namespace CryptoExchange.Net.Clients
|
|||||||
protected BaseClient(ILoggerFactory? logger, string exchange)
|
protected BaseClient(ILoggerFactory? logger, string exchange)
|
||||||
#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
|
#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
|
||||||
{
|
{
|
||||||
|
_logger = logger?.CreateLogger(exchange) ?? NullLoggerFactory.Instance.CreateLogger(exchange);
|
||||||
|
|
||||||
Exchange = exchange;
|
Exchange = exchange;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,7 +57,7 @@ namespace CryptoExchange.Net.Clients
|
|||||||
throw new ArgumentNullException(nameof(options));
|
throw new ArgumentNullException(nameof(options));
|
||||||
|
|
||||||
ClientOptions = options;
|
ClientOptions = options;
|
||||||
_logger.Log(LogLevel.Trace, $"Client configuration: {options}, CryptoExchange.Net: v{CryptoExchangeLibVersion}, {Exchange}.Net: v{ExchangeLibVersion}");
|
_logger.Log(LogLevel.Trace, $"Client configuration: {options}, CryptoExchange.Net: v{typeof(BaseClient).Assembly.GetName().Version}, {Exchange}.Net: v{GetType().Assembly.GetName().Version}");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -107,16 +84,6 @@ namespace CryptoExchange.Net.Clients
|
|||||||
return apiClient;
|
return apiClient;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apply the options delegate to a new options instance
|
|
||||||
/// </summary>
|
|
||||||
protected static T ApplyOptionsDelegate<T>(Action<T>? del) where T: new()
|
|
||||||
{
|
|
||||||
var opts = new T();
|
|
||||||
del?.Invoke(opts);
|
|
||||||
return opts;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Dispose
|
/// Dispose
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using CryptoExchange.Net.Interfaces;
|
using CryptoExchange.Net.Interfaces;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Microsoft.Extensions.Logging.Abstractions;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Clients
|
namespace CryptoExchange.Net.Clients
|
||||||
{
|
{
|
||||||
@ -20,7 +19,6 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <param name="name">The name of the API this client is for</param>
|
/// <param name="name">The name of the API this client is for</param>
|
||||||
protected BaseRestClient(ILoggerFactory? loggerFactory, string name) : base(loggerFactory, name)
|
protected BaseRestClient(ILoggerFactory? loggerFactory, string name) : base(loggerFactory, name)
|
||||||
{
|
{
|
||||||
_logger = loggerFactory?.CreateLogger(name + ".RestClient") ?? NullLoggerFactory.Instance.CreateLogger(name);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,12 +3,10 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Xml.Linq;
|
|
||||||
using CryptoExchange.Net.Interfaces;
|
using CryptoExchange.Net.Interfaces;
|
||||||
using CryptoExchange.Net.Logging.Extensions;
|
using CryptoExchange.Net.Logging.Extensions;
|
||||||
using CryptoExchange.Net.Objects.Sockets;
|
using CryptoExchange.Net.Objects.Sockets;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Microsoft.Extensions.Logging.Abstractions;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Clients
|
namespace CryptoExchange.Net.Clients
|
||||||
{
|
{
|
||||||
@ -35,11 +33,10 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// ctor
|
/// ctor
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="loggerFactory">Logger factory</param>
|
/// <param name="logger">Logger</param>
|
||||||
/// <param name="name">The name of the exchange this client is for</param>
|
/// <param name="exchange">The name of the exchange this client is for</param>
|
||||||
protected BaseSocketClient(ILoggerFactory? loggerFactory, string name) : base(loggerFactory, name)
|
protected BaseSocketClient(ILoggerFactory? logger, string exchange) : base(logger, exchange)
|
||||||
{
|
{
|
||||||
_logger = loggerFactory?.CreateLogger(name + ".SocketClient") ?? NullLoggerFactory.Instance.CreateLogger(name);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -96,7 +93,6 @@ namespace CryptoExchange.Net.Clients
|
|||||||
{
|
{
|
||||||
tasks.Add(client.ReconnectAsync());
|
tasks.Add(client.ReconnectAsync());
|
||||||
}
|
}
|
||||||
|
|
||||||
await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
|
await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,23 +106,7 @@ namespace CryptoExchange.Net.Clients
|
|||||||
{
|
{
|
||||||
result.AppendLine(client.GetSubscriptionsState());
|
result.AppendLine(client.GetSubscriptionsState());
|
||||||
}
|
}
|
||||||
|
|
||||||
return result.ToString();
|
return result.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns the state of all socket api clients
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
public List<SocketApiClient.SocketApiClientState> GetSocketApiClientStates()
|
|
||||||
{
|
|
||||||
var result = new List<SocketApiClient.SocketApiClientState>();
|
|
||||||
foreach (var client in ApiClients.OfType<SocketApiClient>())
|
|
||||||
{
|
|
||||||
result.Add(client.GetState());
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,7 +9,7 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class CryptoBaseClient : IDisposable
|
public class CryptoBaseClient : IDisposable
|
||||||
{
|
{
|
||||||
private readonly Dictionary<Type, object> _serviceCache = new Dictionary<Type, object>();
|
private Dictionary<Type, object> _serviceCache = new Dictionary<Type, object>();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Service provider
|
/// Service provider
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
using CryptoExchange.Net.Interfaces;
|
using CryptoExchange.Net.Interfaces;
|
||||||
|
using CryptoExchange.Net.Interfaces.CommonClients;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@ -23,5 +24,24 @@ namespace CryptoExchange.Net.Clients
|
|||||||
public CryptoRestClient(IServiceProvider serviceProvider) : base(serviceProvider)
|
public CryptoRestClient(IServiceProvider serviceProvider) : base(serviceProvider)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get a list of the registered ISpotClient implementations
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public IEnumerable<ISpotClient> GetSpotClients()
|
||||||
|
{
|
||||||
|
if (_serviceProvider == null)
|
||||||
|
return new List<ISpotClient>();
|
||||||
|
|
||||||
|
return _serviceProvider.GetServices<ISpotClient>().ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get an ISpotClient implementation by exchange name
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="exchangeName"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public ISpotClient? SpotClient(string exchangeName) => _serviceProvider?.GetServices<ISpotClient>()?.SingleOrDefault(s => s.ExchangeName.Equals(exchangeName, StringComparison.InvariantCultureIgnoreCase));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,19 +1,18 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using CryptoExchange.Net.Caching;
|
using CryptoExchange.Net.Converters.JsonNet;
|
||||||
using CryptoExchange.Net.Interfaces;
|
using CryptoExchange.Net.Interfaces;
|
||||||
using CryptoExchange.Net.Logging.Extensions;
|
using CryptoExchange.Net.Logging.Extensions;
|
||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using CryptoExchange.Net.Objects.Options;
|
using CryptoExchange.Net.Objects.Options;
|
||||||
using CryptoExchange.Net.RateLimiting;
|
|
||||||
using CryptoExchange.Net.RateLimiting.Interfaces;
|
|
||||||
using CryptoExchange.Net.Requests;
|
using CryptoExchange.Net.Requests;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
@ -39,17 +38,17 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Request body content type
|
/// Request body content type
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected internal RequestBodyFormat RequestBodyFormat = RequestBodyFormat.Json;
|
protected RequestBodyFormat RequestBodyFormat = RequestBodyFormat.Json;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// How to serialize array parameters when making requests
|
/// How to serialize array parameters when making requests
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected internal ArrayParametersSerialization ArraySerialization = ArrayParametersSerialization.Array;
|
protected ArrayParametersSerialization ArraySerialization = ArrayParametersSerialization.Array;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// What request body should be set when no data is send (only used in combination with postParametersPosition.InBody)
|
/// What request body should be set when no data is send (only used in combination with postParametersPosition.InBody)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected internal string RequestBodyEmptyContent = "{}";
|
protected string RequestBodyEmptyContent = "{}";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Request headers to be sent with each request
|
/// Request headers to be sent with each request
|
||||||
@ -57,14 +56,9 @@ namespace CryptoExchange.Net.Clients
|
|||||||
protected Dictionary<string, string>? StandardRequestHeaders { get; set; }
|
protected Dictionary<string, string>? StandardRequestHeaders { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Whether parameters need to be ordered
|
/// List of rate limiters
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected internal bool OrderParameters { get; set; } = true;
|
internal IEnumerable<IRateLimiter> RateLimiters { get; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Parameter order comparer
|
|
||||||
/// </summary>
|
|
||||||
protected IComparer<string> ParameterOrderComparer { get; } = new OrderedStringComparer();
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Where to put the parameters for requests with different Http methods
|
/// Where to put the parameters for requests with different Http methods
|
||||||
@ -74,8 +68,7 @@ namespace CryptoExchange.Net.Clients
|
|||||||
{ HttpMethod.Get, HttpMethodParameterPosition.InUri },
|
{ HttpMethod.Get, HttpMethodParameterPosition.InUri },
|
||||||
{ HttpMethod.Post, HttpMethodParameterPosition.InBody },
|
{ HttpMethod.Post, HttpMethodParameterPosition.InBody },
|
||||||
{ HttpMethod.Delete, HttpMethodParameterPosition.InBody },
|
{ HttpMethod.Delete, HttpMethodParameterPosition.InBody },
|
||||||
{ HttpMethod.Put, HttpMethodParameterPosition.InBody },
|
{ HttpMethod.Put, HttpMethodParameterPosition.InBody }
|
||||||
{ new HttpMethod("Patch"), HttpMethodParameterPosition.InBody },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
@ -84,10 +77,6 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public new RestApiOptions ApiOptions => (RestApiOptions)base.ApiOptions;
|
public new RestApiOptions ApiOptions => (RestApiOptions)base.ApiOptions;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Memory cache
|
|
||||||
/// </summary>
|
|
||||||
private readonly static MemoryCache _cache = new MemoryCache();
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ctor
|
/// ctor
|
||||||
@ -105,6 +94,11 @@ namespace CryptoExchange.Net.Clients
|
|||||||
options,
|
options,
|
||||||
apiOptions)
|
apiOptions)
|
||||||
{
|
{
|
||||||
|
var rateLimiters = new List<IRateLimiter>();
|
||||||
|
foreach (var rateLimiter in apiOptions.RateLimiters)
|
||||||
|
rateLimiters.Add(rateLimiter);
|
||||||
|
RateLimiters = rateLimiters;
|
||||||
|
|
||||||
RequestFactory.Configure(options.Proxy, options.RequestTimeout, httpClient);
|
RequestFactory.Configure(options.Proxy, options.RequestTimeout, httpClient);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -112,191 +106,148 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// Create a message accessor instance
|
/// Create a message accessor instance
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected abstract IStreamMessageAccessor CreateAccessor();
|
protected virtual IStreamMessageAccessor CreateAccessor() => new JsonNetStreamMessageAccessor();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Create a serializer instance
|
/// Create a serializer instance
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected abstract IMessageSerializer CreateSerializer();
|
protected virtual IMessageSerializer CreateSerializer() => new JsonNetMessageSerializer();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Send a request to the base address based on the request definition
|
/// Execute a request to the uri and returns if it was successful
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="baseAddress">Host and schema</param>
|
/// <param name="uri">The uri to send the request to</param>
|
||||||
/// <param name="definition">Request definition</param>
|
/// <param name="method">The method of the request</param>
|
||||||
/// <param name="parameters">Request parameters</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token</param>
|
/// <param name="cancellationToken">Cancellation token</param>
|
||||||
/// <param name="additionalHeaders">Additional headers for this request</param>
|
/// <param name="parameters">The parameters of the request</param>
|
||||||
/// <param name="weight">Override the request weight for this request definition, for example when the weight depends on the parameters</param>
|
/// <param name="signed">Whether or not the request should be authenticated</param>
|
||||||
|
/// <param name="requestBodyFormat">The format of the body content</param>
|
||||||
|
/// <param name="parameterPosition">Where the parameters should be placed, overwrites the value set in the client</param>
|
||||||
|
/// <param name="arraySerialization">How array parameters should be serialized, overwrites the value set in the client</param>
|
||||||
|
/// <param name="requestWeight">Credits used for the request</param>
|
||||||
|
/// <param name="additionalHeaders">Additional headers to send with the request</param>
|
||||||
|
/// <param name="ignoreRatelimit">Ignore rate limits for this request</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual async Task<WebCallResult> SendAsync(
|
[return: NotNull]
|
||||||
string baseAddress,
|
protected virtual async Task<WebCallResult> SendRequestAsync(
|
||||||
RequestDefinition definition,
|
Uri uri,
|
||||||
ParameterCollection? parameters,
|
HttpMethod method,
|
||||||
CancellationToken cancellationToken,
|
CancellationToken cancellationToken,
|
||||||
|
Dictionary<string, object>? parameters = null,
|
||||||
|
bool signed = false,
|
||||||
|
RequestBodyFormat? requestBodyFormat = null,
|
||||||
|
HttpMethodParameterPosition? parameterPosition = null,
|
||||||
|
ArrayParametersSerialization? arraySerialization = null,
|
||||||
|
int requestWeight = 1,
|
||||||
Dictionary<string, string>? additionalHeaders = null,
|
Dictionary<string, string>? additionalHeaders = null,
|
||||||
int? weight = null)
|
bool ignoreRatelimit = false)
|
||||||
{
|
|
||||||
var result = await SendAsync<object>(baseAddress, definition, parameters, cancellationToken, additionalHeaders, weight).ConfigureAwait(false);
|
|
||||||
return result.AsDataless();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Send a request to the base address based on the request definition
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="T">Response type</typeparam>
|
|
||||||
/// <param name="baseAddress">Host and schema</param>
|
|
||||||
/// <param name="definition">Request definition</param>
|
|
||||||
/// <param name="parameters">Request parameters</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token</param>
|
|
||||||
/// <param name="additionalHeaders">Additional headers for this request</param>
|
|
||||||
/// <param name="weight">Override the request weight for this request definition, for example when the weight depends on the parameters</param>
|
|
||||||
/// <param name="weightSingleLimiter">Specify the weight to apply to the individual rate limit guard for this request</param>
|
|
||||||
/// <param name="rateLimitKeySuffix">An additional optional suffix for the key selector. Can be used to make rate limiting work based on parameters.</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected virtual Task<WebCallResult<T>> SendAsync<T>(
|
|
||||||
string baseAddress,
|
|
||||||
RequestDefinition definition,
|
|
||||||
ParameterCollection? parameters,
|
|
||||||
CancellationToken cancellationToken,
|
|
||||||
Dictionary<string, string>? additionalHeaders = null,
|
|
||||||
int? weight = null,
|
|
||||||
int? weightSingleLimiter = null,
|
|
||||||
string? rateLimitKeySuffix = null)
|
|
||||||
{
|
{
|
||||||
var parameterPosition = definition.ParameterPosition ?? ParameterPositions[definition.Method];
|
|
||||||
return SendAsync<T>(
|
|
||||||
baseAddress,
|
|
||||||
definition,
|
|
||||||
parameterPosition == HttpMethodParameterPosition.InUri ? parameters : null,
|
|
||||||
parameterPosition == HttpMethodParameterPosition.InBody ? parameters : null,
|
|
||||||
cancellationToken,
|
|
||||||
additionalHeaders,
|
|
||||||
weight,
|
|
||||||
weightSingleLimiter,
|
|
||||||
rateLimitKeySuffix);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Send a request to the base address based on the request definition
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="T">Response type</typeparam>
|
|
||||||
/// <param name="baseAddress">Host and schema</param>
|
|
||||||
/// <param name="definition">Request definition</param>
|
|
||||||
/// <param name="uriParameters">Request query parameters</param>
|
|
||||||
/// <param name="bodyParameters">Request body parameters</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token</param>
|
|
||||||
/// <param name="additionalHeaders">Additional headers for this request</param>
|
|
||||||
/// <param name="weight">Override the request weight for this request definition, for example when the weight depends on the parameters</param>
|
|
||||||
/// <param name="weightSingleLimiter">Specify the weight to apply to the individual rate limit guard for this request</param>
|
|
||||||
/// <param name="rateLimitKeySuffix">An additional optional suffix for the key selector. Can be used to make rate limiting work based on parameters.</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected virtual async Task<WebCallResult<T>> SendAsync<T>(
|
|
||||||
string baseAddress,
|
|
||||||
RequestDefinition definition,
|
|
||||||
ParameterCollection? uriParameters,
|
|
||||||
ParameterCollection? bodyParameters,
|
|
||||||
CancellationToken cancellationToken,
|
|
||||||
Dictionary<string, string>? additionalHeaders = null,
|
|
||||||
int? weight = null,
|
|
||||||
int? weightSingleLimiter = null,
|
|
||||||
string? rateLimitKeySuffix = null)
|
|
||||||
{
|
|
||||||
string? cacheKey = null;
|
|
||||||
if (ShouldCache(definition))
|
|
||||||
{
|
|
||||||
cacheKey = baseAddress + definition + uriParameters?.ToFormData();
|
|
||||||
_logger.CheckingCache(cacheKey);
|
|
||||||
var cachedValue = _cache.Get(cacheKey, ClientOptions.CachingMaxAge);
|
|
||||||
if (cachedValue != null)
|
|
||||||
{
|
|
||||||
_logger.CacheHit(cacheKey);
|
|
||||||
var original = (WebCallResult<T>)cachedValue;
|
|
||||||
return original.Cached();
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.CacheNotHit(cacheKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
int currentTry = 0;
|
int currentTry = 0;
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
currentTry++;
|
currentTry++;
|
||||||
var requestId = ExchangeHelpers.NextId();
|
var request = await PrepareRequestAsync(uri, method, cancellationToken, parameters, signed, requestBodyFormat, parameterPosition, arraySerialization, requestWeight, additionalHeaders, ignoreRatelimit).ConfigureAwait(false);
|
||||||
|
if (!request)
|
||||||
|
return new WebCallResult(request.Error!);
|
||||||
|
|
||||||
var prepareResult = await PrepareAsync(requestId, baseAddress, definition, cancellationToken, additionalHeaders, weight, weightSingleLimiter, rateLimitKeySuffix).ConfigureAwait(false);
|
var result = await GetResponseAsync<object>(request.Data, cancellationToken).ConfigureAwait(false);
|
||||||
if (!prepareResult)
|
if (!result)
|
||||||
return new WebCallResult<T>(prepareResult.Error!);
|
_logger.RestApiErrorReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), result.Error?.ToString());
|
||||||
|
|
||||||
var request = CreateRequest(
|
|
||||||
requestId,
|
|
||||||
baseAddress,
|
|
||||||
definition,
|
|
||||||
uriParameters,
|
|
||||||
bodyParameters,
|
|
||||||
additionalHeaders);
|
|
||||||
_logger.RestApiSendRequest(request.RequestId, definition, request.Content, string.IsNullOrEmpty(request.Uri.Query) ? "-" : request.Uri.Query, string.Join(", ", request.GetHeaders().Select(h => h.Key + $"=[{string.Join(",", h.Value)}]")));
|
|
||||||
TotalRequestsMade++;
|
|
||||||
var result = await GetResponseAsync<T>(request, definition.RateLimitGate, cancellationToken).ConfigureAwait(false);
|
|
||||||
if (result.Error is not CancellationRequestedError)
|
|
||||||
{
|
|
||||||
var originalData = OutputOriginalData ? result.OriginalData : "[Data only available when OutputOriginal = true]";
|
|
||||||
if (!result)
|
|
||||||
_logger.RestApiErrorReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), result.Error?.ToString(), originalData, result.Error?.Exception);
|
|
||||||
else
|
|
||||||
_logger.RestApiResponseReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), originalData);
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
_logger.RestApiResponseReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), OutputOriginalData ? result.OriginalData : "[Data only available when OutputOriginal = true]");
|
||||||
_logger.RestApiCancellationRequested(result.RequestId);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (await ShouldRetryRequestAsync(definition.RateLimitGate, result, currentTry).ConfigureAwait(false))
|
if (await ShouldRetryRequestAsync(result, currentTry).ConfigureAwait(false))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (result.Success &&
|
return result.AsDataless();
|
||||||
ShouldCache(definition))
|
}
|
||||||
{
|
}
|
||||||
_cache.Add(cacheKey!, result);
|
|
||||||
}
|
/// <summary>
|
||||||
|
/// Execute a request to the uri and deserialize the response into the provided type parameter
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The type to deserialize into</typeparam>
|
||||||
|
/// <param name="uri">The uri to send the request to</param>
|
||||||
|
/// <param name="method">The method of the request</param>
|
||||||
|
/// <param name="cancellationToken">Cancellation token</param>
|
||||||
|
/// <param name="parameters">The parameters of the request</param>
|
||||||
|
/// <param name="signed">Whether or not the request should be authenticated</param>
|
||||||
|
/// <param name="requestBodyFormat">The format of the body content</param>
|
||||||
|
/// <param name="parameterPosition">Where the parameters should be placed, overwrites the value set in the client</param>
|
||||||
|
/// <param name="arraySerialization">How array parameters should be serialized, overwrites the value set in the client</param>
|
||||||
|
/// <param name="requestWeight">Credits used for the request</param>
|
||||||
|
/// <param name="additionalHeaders">Additional headers to send with the request</param>
|
||||||
|
/// <param name="ignoreRatelimit">Ignore rate limits for this request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[return: NotNull]
|
||||||
|
protected virtual async Task<WebCallResult<T>> SendRequestAsync<T>(
|
||||||
|
Uri uri,
|
||||||
|
HttpMethod method,
|
||||||
|
CancellationToken cancellationToken,
|
||||||
|
Dictionary<string, object>? parameters = null,
|
||||||
|
bool signed = false,
|
||||||
|
RequestBodyFormat? requestBodyFormat = null,
|
||||||
|
HttpMethodParameterPosition? parameterPosition = null,
|
||||||
|
ArrayParametersSerialization? arraySerialization = null,
|
||||||
|
int requestWeight = 1,
|
||||||
|
Dictionary<string, string>? additionalHeaders = null,
|
||||||
|
bool ignoreRatelimit = false
|
||||||
|
) where T : class
|
||||||
|
{
|
||||||
|
int currentTry = 0;
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
currentTry++;
|
||||||
|
var request = await PrepareRequestAsync(uri, method, cancellationToken, parameters, signed, requestBodyFormat, parameterPosition, arraySerialization, requestWeight, additionalHeaders, ignoreRatelimit).ConfigureAwait(false);
|
||||||
|
if (!request)
|
||||||
|
return new WebCallResult<T>(request.Error!);
|
||||||
|
|
||||||
|
var result = await GetResponseAsync<T>(request.Data, cancellationToken).ConfigureAwait(false);
|
||||||
|
if (!result)
|
||||||
|
_logger.RestApiErrorReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), result.Error?.ToString());
|
||||||
|
else
|
||||||
|
_logger.RestApiResponseReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), OutputOriginalData ? result.OriginalData : "[Data only available when OutputOriginal = true]");
|
||||||
|
|
||||||
|
if (await ShouldRetryRequestAsync(result, currentTry).ConfigureAwait(false))
|
||||||
|
continue;
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Prepare before sending a request. Sync time between client and server and check rate limits
|
/// Prepares a request to be sent to the server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="requestId">Request id</param>
|
/// <param name="uri">The uri to send the request to</param>
|
||||||
/// <param name="baseAddress">Host and schema</param>
|
/// <param name="method">The method of the request</param>
|
||||||
/// <param name="definition">Request definition</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token</param>
|
/// <param name="cancellationToken">Cancellation token</param>
|
||||||
/// <param name="additionalHeaders">Additional headers for this request</param>
|
/// <param name="parameters">The parameters of the request</param>
|
||||||
/// <param name="weight">Override the request weight for this request</param>
|
/// <param name="signed">Whether or not the request should be authenticated</param>
|
||||||
/// <param name="weightSingleLimiter">Specify the weight to apply to the individual rate limit guard for this request</param>
|
/// <param name="requestBodyFormat">The format of the body content</param>
|
||||||
/// <param name="rateLimitKeySuffix">An additional optional suffix for the key selector</param>
|
/// <param name="parameterPosition">Where the parameters should be placed, overwrites the value set in the client</param>
|
||||||
|
/// <param name="arraySerialization">How array parameters should be serialized, overwrites the value set in the client</param>
|
||||||
|
/// <param name="requestWeight">Credits used for the request</param>
|
||||||
|
/// <param name="additionalHeaders">Additional headers to send with the request</param>
|
||||||
|
/// <param name="ignoreRatelimit">Ignore rate limits for this request</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <exception cref="Exception"></exception>
|
protected virtual async Task<CallResult<IRequest>> PrepareRequestAsync(
|
||||||
protected virtual async Task<CallResult> PrepareAsync(
|
Uri uri,
|
||||||
int requestId,
|
HttpMethod method,
|
||||||
string baseAddress,
|
|
||||||
RequestDefinition definition,
|
|
||||||
CancellationToken cancellationToken,
|
CancellationToken cancellationToken,
|
||||||
|
Dictionary<string, object>? parameters = null,
|
||||||
|
bool signed = false,
|
||||||
|
RequestBodyFormat? requestBodyFormat = null,
|
||||||
|
HttpMethodParameterPosition? parameterPosition = null,
|
||||||
|
ArrayParametersSerialization? arraySerialization = null,
|
||||||
|
int requestWeight = 1,
|
||||||
Dictionary<string, string>? additionalHeaders = null,
|
Dictionary<string, string>? additionalHeaders = null,
|
||||||
int? weight = null,
|
bool ignoreRatelimit = false)
|
||||||
int? weightSingleLimiter = null,
|
|
||||||
string? rateLimitKeySuffix = null)
|
|
||||||
{
|
{
|
||||||
// Time sync
|
var requestId = ExchangeHelpers.NextId();
|
||||||
if (definition.Authenticated)
|
|
||||||
{
|
|
||||||
if (AuthenticationProvider == null)
|
|
||||||
{
|
|
||||||
_logger.RestApiNoApiCredentials(requestId, definition.Path);
|
|
||||||
return new CallResult<IRequest>(new NoApiCredentialsError());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if (signed)
|
||||||
|
{
|
||||||
var syncTask = SyncTimeAsync();
|
var syncTask = SyncTimeAsync();
|
||||||
var timeSyncInfo = GetTimeSyncInfo();
|
var timeSyncInfo = GetTimeSyncInfo();
|
||||||
|
|
||||||
@ -307,145 +258,52 @@ namespace CryptoExchange.Net.Clients
|
|||||||
if (!syncTimeResult)
|
if (!syncTimeResult)
|
||||||
{
|
{
|
||||||
_logger.RestApiFailedToSyncTime(requestId, syncTimeResult.Error!.ToString());
|
_logger.RestApiFailedToSyncTime(requestId, syncTimeResult.Error!.ToString());
|
||||||
return syncTimeResult.AsDataless();
|
return syncTimeResult.As<IRequest>(default);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Rate limiting
|
if (!ignoreRatelimit)
|
||||||
var requestWeight = weight ?? definition.Weight;
|
|
||||||
if (requestWeight != 0)
|
|
||||||
{
|
{
|
||||||
if (definition.RateLimitGate == null)
|
foreach (var limiter in RateLimiters)
|
||||||
throw new Exception("Ratelimit gate not set when request weight is not 0");
|
|
||||||
|
|
||||||
if (ClientOptions.RateLimiterEnabled)
|
|
||||||
{
|
{
|
||||||
var limitResult = await definition.RateLimitGate.ProcessAsync(_logger, requestId, RateLimitItemType.Request, definition, baseAddress, AuthenticationProvider?._credentials.Key, requestWeight, ClientOptions.RateLimitingBehaviour, rateLimitKeySuffix, cancellationToken).ConfigureAwait(false);
|
var limitResult = await limiter.LimitRequestAsync(_logger, uri.AbsolutePath, method, signed, ApiOptions.ApiCredentials?.Key ?? ClientOptions.ApiCredentials?.Key, ApiOptions.RateLimitingBehaviour, requestWeight, cancellationToken).ConfigureAwait(false);
|
||||||
if (!limitResult)
|
if (!limitResult.Success)
|
||||||
return new CallResult(limitResult.Error!);
|
return new CallResult<IRequest>(limitResult.Error!);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Endpoint specific rate limiting
|
if (signed && AuthenticationProvider == null)
|
||||||
if (definition.LimitGuard != null && ClientOptions.RateLimiterEnabled)
|
|
||||||
{
|
{
|
||||||
if (definition.RateLimitGate == null)
|
_logger.RestApiNoApiCredentials(requestId, uri.AbsolutePath);
|
||||||
throw new Exception("Ratelimit gate not set when endpoint limit is specified");
|
return new CallResult<IRequest>(new NoApiCredentialsError());
|
||||||
|
|
||||||
if (ClientOptions.RateLimiterEnabled)
|
|
||||||
{
|
|
||||||
var singleRequestWeight = weightSingleLimiter ?? 1;
|
|
||||||
var limitResult = await definition.RateLimitGate.ProcessSingleAsync(_logger, requestId, definition.LimitGuard, RateLimitItemType.Request, definition, baseAddress, AuthenticationProvider?._credentials.Key, singleRequestWeight, ClientOptions.RateLimitingBehaviour, rateLimitKeySuffix, cancellationToken).ConfigureAwait(false);
|
|
||||||
if (!limitResult)
|
|
||||||
return new CallResult(limitResult.Error!);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return CallResult.SuccessResult;
|
_logger.RestApiCreatingRequest(requestId, uri);
|
||||||
}
|
var paramsPosition = parameterPosition ?? ParameterPositions[method];
|
||||||
|
var request = ConstructRequest(uri, method, parameters?.OrderBy(p => p.Key).ToDictionary(p => p.Key, p => p.Value), signed, paramsPosition, arraySerialization ?? ArraySerialization, requestBodyFormat ?? RequestBodyFormat, requestId, additionalHeaders);
|
||||||
|
|
||||||
/// <summary>
|
string? paramString = "";
|
||||||
/// Creates a request object
|
if (paramsPosition == HttpMethodParameterPosition.InBody)
|
||||||
/// </summary>
|
paramString = $" with request body '{request.Content}'";
|
||||||
/// <param name="requestId">Id of the request</param>
|
|
||||||
/// <param name="baseAddress">Host and schema</param>
|
|
||||||
/// <param name="definition">Request definition</param>
|
|
||||||
/// <param name="uriParameters">The query parameters of the request</param>
|
|
||||||
/// <param name="bodyParameters">The body parameters of the request</param>
|
|
||||||
/// <param name="additionalHeaders">Additional headers to send with the request</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected virtual IRequest CreateRequest(
|
|
||||||
int requestId,
|
|
||||||
string baseAddress,
|
|
||||||
RequestDefinition definition,
|
|
||||||
ParameterCollection? uriParameters,
|
|
||||||
ParameterCollection? bodyParameters,
|
|
||||||
Dictionary<string, string>? additionalHeaders)
|
|
||||||
{
|
|
||||||
var uriParams = uriParameters == null ? null : CreateParameterDictionary(uriParameters);
|
|
||||||
var bodyParams = bodyParameters == null ? null : CreateParameterDictionary(bodyParameters);
|
|
||||||
|
|
||||||
var uri = new Uri(baseAddress.AppendPath(definition.Path));
|
var headers = request.GetHeaders();
|
||||||
var arraySerialization = definition.ArraySerialization ?? ArraySerialization;
|
if (headers.Any())
|
||||||
var bodyFormat = definition.RequestBodyFormat ?? RequestBodyFormat;
|
paramString += " with headers " + string.Join(", ", headers.Select(h => h.Key + $"=[{string.Join(",", h.Value)}]"));
|
||||||
var parameterPosition = definition.ParameterPosition ?? ParameterPositions[definition.Method];
|
|
||||||
|
|
||||||
Dictionary<string, string>? headers = null;
|
TotalRequestsMade++;
|
||||||
if (AuthenticationProvider != null)
|
_logger.RestApiSendingRequest(requestId, method, signed ? "signed": "", request.Uri, paramString);
|
||||||
{
|
return new CallResult<IRequest>(request);
|
||||||
try
|
|
||||||
{
|
|
||||||
AuthenticationProvider.AuthenticateRequest(
|
|
||||||
this,
|
|
||||||
uri,
|
|
||||||
definition.Method,
|
|
||||||
ref uriParams,
|
|
||||||
ref bodyParams,
|
|
||||||
ref headers,
|
|
||||||
definition.Authenticated,
|
|
||||||
arraySerialization,
|
|
||||||
parameterPosition,
|
|
||||||
bodyFormat
|
|
||||||
);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
throw new Exception("Failed to authenticate request, make sure your API credentials are correct", ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add the auth parameters to the uri, start with a new URI to be able to sort the parameters including the auth parameters
|
|
||||||
if (uriParams != null)
|
|
||||||
uri = uri.SetParameters(uriParams, arraySerialization);
|
|
||||||
|
|
||||||
var request = RequestFactory.Create(definition.Method, uri, requestId);
|
|
||||||
request.Accept = Constants.JsonContentHeader;
|
|
||||||
|
|
||||||
if (headers != null)
|
|
||||||
{
|
|
||||||
foreach (var header in headers)
|
|
||||||
request.AddHeader(header.Key, header.Value);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (additionalHeaders != null)
|
|
||||||
{
|
|
||||||
foreach (var header in additionalHeaders)
|
|
||||||
request.AddHeader(header.Key, header.Value);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (StandardRequestHeaders != null)
|
|
||||||
{
|
|
||||||
foreach (var header in StandardRequestHeaders)
|
|
||||||
{
|
|
||||||
// Only add it if it isn't overwritten
|
|
||||||
if (additionalHeaders?.ContainsKey(header.Key) != true)
|
|
||||||
request.AddHeader(header.Key, header.Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (parameterPosition == HttpMethodParameterPosition.InBody)
|
|
||||||
{
|
|
||||||
var contentType = bodyFormat == RequestBodyFormat.Json ? Constants.JsonContentHeader : Constants.FormContentHeader;
|
|
||||||
if (bodyParams != null && bodyParams.Count != 0)
|
|
||||||
WriteParamBody(request, bodyParams, contentType);
|
|
||||||
else
|
|
||||||
request.SetContent(RequestBodyEmptyContent, contentType);
|
|
||||||
}
|
|
||||||
|
|
||||||
return request;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Executes the request and returns the result deserialized into the type parameter class
|
/// Executes the request and returns the result deserialized into the type parameter class
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="request">The request object to execute</param>
|
/// <param name="request">The request object to execute</param>
|
||||||
/// <param name="gate">The ratelimit gate used</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token</param>
|
/// <param name="cancellationToken">Cancellation token</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual async Task<WebCallResult<T>> GetResponseAsync<T>(
|
protected virtual async Task<WebCallResult<T>> GetResponseAsync<T>(
|
||||||
IRequest request,
|
IRequest request,
|
||||||
IRateLimitGate? gate,
|
|
||||||
CancellationToken cancellationToken)
|
CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var sw = Stopwatch.StartNew();
|
var sw = Stopwatch.StartNew();
|
||||||
@ -466,79 +324,58 @@ namespace CryptoExchange.Net.Clients
|
|||||||
if (!response.IsSuccessStatusCode)
|
if (!response.IsSuccessStatusCode)
|
||||||
{
|
{
|
||||||
// Error response
|
// Error response
|
||||||
var readResult = await accessor.Read(responseStream, true).ConfigureAwait(false);
|
await accessor.Read(responseStream, true).ConfigureAwait(false);
|
||||||
|
|
||||||
Error error;
|
Error error;
|
||||||
if (response.StatusCode == (HttpStatusCode)418 || response.StatusCode == (HttpStatusCode)429)
|
if (response.StatusCode == (HttpStatusCode)418 || response.StatusCode == (HttpStatusCode)429)
|
||||||
{
|
error = ParseRateLimitResponse((int)response.StatusCode, response.ResponseHeaders, accessor);
|
||||||
var rateError = ParseRateLimitResponse((int)response.StatusCode, response.ResponseHeaders, accessor);
|
|
||||||
if (rateError.RetryAfter != null && gate != null && ClientOptions.RateLimiterEnabled)
|
|
||||||
{
|
|
||||||
_logger.RestApiRateLimitPauseUntil(request.RequestId, rateError.RetryAfter.Value);
|
|
||||||
await gate.SetRetryAfterGuardAsync(rateError.RetryAfter.Value).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
error = rateError;
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
error = ParseErrorResponse((int)response.StatusCode, response.ResponseHeaders, accessor);
|
||||||
error = ParseErrorResponse((int)response.StatusCode, response.ResponseHeaders, accessor, readResult.Error?.Exception);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error.Code == null || error.Code == 0)
|
if (error.Code == null || error.Code == 0)
|
||||||
error.Code = (int)response.StatusCode;
|
error.Code = (int)response.StatusCode;
|
||||||
|
|
||||||
return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, error!);
|
return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, error!);
|
||||||
}
|
}
|
||||||
|
|
||||||
var valid = await accessor.Read(responseStream, outputOriginalData).ConfigureAwait(false);
|
|
||||||
if (typeof(T) == typeof(object))
|
if (typeof(T) == typeof(object))
|
||||||
// Success status code and expected empty response, assume it's correct
|
// Success status code and expected empty response, assume it's correct
|
||||||
return new WebCallResult<T>(statusCode, headers, sw.Elapsed, 0, accessor.OriginalDataAvailable ? accessor.GetOriginalString() : "[Data only available when OutputOriginal = true in client options]", request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, null);
|
return new WebCallResult<T>(statusCode, headers, sw.Elapsed, 0, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, null);
|
||||||
|
|
||||||
|
var valid = await accessor.Read(responseStream, outputOriginalData).ConfigureAwait(false);
|
||||||
if (!valid)
|
if (!valid)
|
||||||
{
|
{
|
||||||
// Invalid json
|
// Invalid json
|
||||||
var error = new DeserializeError("Failed to parse response: " + valid.Error!.Message, valid.Error.Exception);
|
var error = new ServerError(accessor.OriginalDataAvailable ? accessor.GetOriginalString() : "[Data only available when OutputOriginal = true in client options]");
|
||||||
return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, error);
|
return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, error);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Json response received
|
// Json response received
|
||||||
var parsedError = TryParseError(response.ResponseHeaders, accessor);
|
var parsedError = TryParseError(accessor);
|
||||||
if (parsedError != null)
|
if (parsedError != null)
|
||||||
{
|
|
||||||
if (parsedError is ServerRateLimitError rateError)
|
|
||||||
{
|
|
||||||
if (rateError.RetryAfter != null && gate != null && ClientOptions.RateLimiterEnabled)
|
|
||||||
{
|
|
||||||
_logger.RestApiRateLimitPauseUntil(request.RequestId, rateError.RetryAfter.Value);
|
|
||||||
await gate.SetRetryAfterGuardAsync(rateError.RetryAfter.Value).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Success status code, but TryParseError determined it was an error response
|
// Success status code, but TryParseError determined it was an error response
|
||||||
return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, parsedError);
|
return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, parsedError);
|
||||||
}
|
|
||||||
|
|
||||||
var deserializeResult = accessor.Deserialize<T>();
|
var deserializeResult = accessor.Deserialize<T>();
|
||||||
return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, deserializeResult.Data, deserializeResult.Error);
|
return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), deserializeResult.Data, deserializeResult.Error);
|
||||||
}
|
}
|
||||||
catch (HttpRequestException requestException)
|
catch (HttpRequestException requestException)
|
||||||
{
|
{
|
||||||
// Request exception, can't reach server for instance
|
// Request exception, can't reach server for instance
|
||||||
return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, new WebError(requestException.Message, exception: requestException));
|
var exceptionInfo = requestException.ToLogString();
|
||||||
|
return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, new WebError(exceptionInfo));
|
||||||
}
|
}
|
||||||
catch (OperationCanceledException canceledException)
|
catch (OperationCanceledException canceledException)
|
||||||
{
|
{
|
||||||
if (cancellationToken != default && canceledException.CancellationToken == cancellationToken)
|
if (cancellationToken != default && canceledException.CancellationToken == cancellationToken)
|
||||||
{
|
{
|
||||||
// Cancellation token canceled by caller
|
// Cancellation token canceled by caller
|
||||||
return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, new CancellationRequestedError(canceledException));
|
return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, new CancellationRequestedError());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Request timed out
|
// Request timed out
|
||||||
return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, new WebError($"Request timed out", exception: canceledException));
|
return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), default, new WebError($"Request timed out"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
@ -551,46 +388,133 @@ namespace CryptoExchange.Net.Clients
|
|||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Can be used to parse an error even though response status indicates success. Some apis always return 200 OK, even though there is an error.
|
/// Can be used to parse an error even though response status indicates success. Some apis always return 200 OK, even though there is an error.
|
||||||
/// This method will be called for each response to be able to check if the response is an error or not.
|
/// When setting manualParseError to true this method will be called for each response to be able to check if the response is an error or not.
|
||||||
/// If the response is an error this method should return the parsed error, else it should return null
|
/// If the response is an error this method should return the parsed error, else it should return null
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="accessor">Data accessor</param>
|
/// <param name="accessor">Data accessor</param>
|
||||||
/// <param name="responseHeaders">The response headers</param>
|
|
||||||
/// <returns>Null if not an error, Error otherwise</returns>
|
/// <returns>Null if not an error, Error otherwise</returns>
|
||||||
protected virtual Error? TryParseError(KeyValuePair<string, string[]>[] responseHeaders, IMessageAccessor accessor) => null;
|
protected virtual ServerError? TryParseError(IMessageAccessor accessor) => null;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Can be used to indicate that a request should be retried. Defaults to false. Make sure to retry a max number of times (based on the the tries parameter) or the request will retry forever.
|
/// Can be used to indicate that a request should be retried. Defaults to false. Make sure to retry a max number of times (based on the the tries parameter) or the request will retry forever.
|
||||||
/// Note that this is always called; even when the request might be successful
|
/// Note that this is always called; even when the request might be successful
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="T">WebCallResult type parameter</typeparam>
|
/// <typeparam name="T">WebCallResult type parameter</typeparam>
|
||||||
/// <param name="gate">The rate limit gate the call used</param>
|
|
||||||
/// <param name="callResult">The result of the call</param>
|
/// <param name="callResult">The result of the call</param>
|
||||||
/// <param name="tries">The current try number</param>
|
/// <param name="tries">The current try number</param>
|
||||||
/// <returns>True if call should retry, false if the call should return</returns>
|
/// <returns>True if call should retry, false if the call should return</returns>
|
||||||
protected virtual async Task<bool> ShouldRetryRequestAsync<T>(IRateLimitGate? gate, WebCallResult<T> callResult, int tries)
|
protected virtual Task<bool> ShouldRetryRequestAsync<T>(WebCallResult<T> callResult, int tries) => Task.FromResult(false);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Creates a request object
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="uri">The uri to send the request to</param>
|
||||||
|
/// <param name="method">The method of the request</param>
|
||||||
|
/// <param name="parameters">The parameters of the request</param>
|
||||||
|
/// <param name="signed">Whether or not the request should be authenticated</param>
|
||||||
|
/// <param name="parameterPosition">Where the parameters should be placed</param>
|
||||||
|
/// <param name="arraySerialization">How array parameters should be serialized</param>
|
||||||
|
/// <param name="bodyFormat">Format of the body content</param>
|
||||||
|
/// <param name="requestId">Unique id of a request</param>
|
||||||
|
/// <param name="additionalHeaders">Additional headers to send with the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
protected virtual IRequest ConstructRequest(
|
||||||
|
Uri uri,
|
||||||
|
HttpMethod method,
|
||||||
|
Dictionary<string, object>? parameters,
|
||||||
|
bool signed,
|
||||||
|
HttpMethodParameterPosition parameterPosition,
|
||||||
|
ArrayParametersSerialization arraySerialization,
|
||||||
|
RequestBodyFormat bodyFormat,
|
||||||
|
int requestId,
|
||||||
|
Dictionary<string, string>? additionalHeaders)
|
||||||
{
|
{
|
||||||
if (tries >= 2)
|
parameters ??= new Dictionary<string, object>();
|
||||||
// Only retry once
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (callResult.Error is ServerRateLimitError
|
for (var i = 0; i < parameters.Count; i++)
|
||||||
&& ClientOptions.RateLimiterEnabled
|
|
||||||
&& ClientOptions.RateLimitingBehaviour != RateLimitingBehaviour.Fail
|
|
||||||
&& gate != null)
|
|
||||||
{
|
{
|
||||||
var retryTime = await gate.GetRetryAfterTime().ConfigureAwait(false);
|
var kvp = parameters.ElementAt(i);
|
||||||
if (retryTime == null)
|
if (kvp.Value is Func<object> delegateValue)
|
||||||
return false;
|
parameters[kvp.Key] = delegateValue();
|
||||||
|
}
|
||||||
|
|
||||||
if (retryTime.Value - DateTime.UtcNow < TimeSpan.FromSeconds(60))
|
if (parameterPosition == HttpMethodParameterPosition.InUri)
|
||||||
|
{
|
||||||
|
foreach (var parameter in parameters)
|
||||||
|
uri = uri.AddQueryParmeter(parameter.Key, parameter.Value.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
var headers = new Dictionary<string, string>();
|
||||||
|
var uriParameters = parameterPosition == HttpMethodParameterPosition.InUri ? new SortedDictionary<string, object>(parameters) : new SortedDictionary<string, object>();
|
||||||
|
var bodyParameters = parameterPosition == HttpMethodParameterPosition.InBody ? new SortedDictionary<string, object>(parameters) : new SortedDictionary<string, object>();
|
||||||
|
if (AuthenticationProvider != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
_logger.RestApiRateLimitRetry(callResult.RequestId!.Value, retryTime.Value);
|
AuthenticationProvider.AuthenticateRequest(
|
||||||
return true;
|
this,
|
||||||
|
uri,
|
||||||
|
method,
|
||||||
|
parameters,
|
||||||
|
signed,
|
||||||
|
arraySerialization,
|
||||||
|
parameterPosition,
|
||||||
|
bodyFormat,
|
||||||
|
out uriParameters,
|
||||||
|
out bodyParameters,
|
||||||
|
out headers);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new Exception("Failed to authenticate request, make sure your API credentials are correct", ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
// Sanity check
|
||||||
|
foreach (var param in parameters)
|
||||||
|
{
|
||||||
|
if (!uriParameters.ContainsKey(param.Key) && !bodyParameters.ContainsKey(param.Key))
|
||||||
|
{
|
||||||
|
throw new Exception($"Missing parameter {param.Key} after authentication processing. AuthenticationProvider implementation " +
|
||||||
|
$"should return provided parameters in either the uri or body parameters output");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add the auth parameters to the uri, start with a new URI to be able to sort the parameters including the auth parameters
|
||||||
|
uri = uri.SetParameters(uriParameters, arraySerialization);
|
||||||
|
|
||||||
|
var request = RequestFactory.Create(method, uri, requestId);
|
||||||
|
request.Accept = Constants.JsonContentHeader;
|
||||||
|
|
||||||
|
foreach (var header in headers)
|
||||||
|
request.AddHeader(header.Key, header.Value);
|
||||||
|
|
||||||
|
if (additionalHeaders != null)
|
||||||
|
{
|
||||||
|
foreach (var header in additionalHeaders)
|
||||||
|
request.AddHeader(header.Key, header.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (StandardRequestHeaders != null)
|
||||||
|
{
|
||||||
|
foreach (var header in StandardRequestHeaders)
|
||||||
|
{
|
||||||
|
// Only add it if it isn't overwritten
|
||||||
|
if (additionalHeaders?.ContainsKey(header.Key) != true)
|
||||||
|
request.AddHeader(header.Key, header.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (parameterPosition == HttpMethodParameterPosition.InBody)
|
||||||
|
{
|
||||||
|
var contentType = bodyFormat == RequestBodyFormat.Json ? Constants.JsonContentHeader : Constants.FormContentHeader;
|
||||||
|
if (bodyParameters.Any())
|
||||||
|
WriteParamBody(request, bodyParameters, contentType);
|
||||||
|
else
|
||||||
|
request.SetContent(RequestBodyEmptyContent, contentType);
|
||||||
|
}
|
||||||
|
|
||||||
|
return request;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -599,20 +523,12 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <param name="request">The request to set the parameters on</param>
|
/// <param name="request">The request to set the parameters on</param>
|
||||||
/// <param name="parameters">The parameters to set</param>
|
/// <param name="parameters">The parameters to set</param>
|
||||||
/// <param name="contentType">The content type of the data</param>
|
/// <param name="contentType">The content type of the data</param>
|
||||||
protected virtual void WriteParamBody(IRequest request, IDictionary<string, object> parameters, string contentType)
|
protected virtual void WriteParamBody(IRequest request, SortedDictionary<string, object> parameters, string contentType)
|
||||||
{
|
{
|
||||||
if (contentType == Constants.JsonContentHeader)
|
if (contentType == Constants.JsonContentHeader)
|
||||||
{
|
{
|
||||||
var serializer = CreateSerializer();
|
|
||||||
if (serializer is not IStringMessageSerializer stringSerializer)
|
|
||||||
throw new InvalidOperationException("Non-string message serializer can't get serialized request body");
|
|
||||||
|
|
||||||
// Write the parameters as json in the body
|
// Write the parameters as json in the body
|
||||||
string stringData;
|
var stringData = CreateSerializer().Serialize(parameters);
|
||||||
if (parameters.Count == 1 && parameters.TryGetValue(Constants.BodyPlaceHolderKey, out object? value))
|
|
||||||
stringData = stringSerializer.Serialize(value);
|
|
||||||
else
|
|
||||||
stringData = stringSerializer.Serialize(parameters);
|
|
||||||
request.SetContent(stringData, contentType);
|
request.SetContent(stringData, contentType);
|
||||||
}
|
}
|
||||||
else if (contentType == Constants.FormContentHeader)
|
else if (contentType == Constants.FormContentHeader)
|
||||||
@ -629,11 +545,11 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <param name="httpStatusCode">The response status code</param>
|
/// <param name="httpStatusCode">The response status code</param>
|
||||||
/// <param name="responseHeaders">The response headers</param>
|
/// <param name="responseHeaders">The response headers</param>
|
||||||
/// <param name="accessor">Data accessor</param>
|
/// <param name="accessor">Data accessor</param>
|
||||||
/// <param name="exception">Exception</param>
|
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual Error ParseErrorResponse(int httpStatusCode, KeyValuePair<string, string[]>[] responseHeaders, IMessageAccessor accessor, Exception? exception)
|
protected virtual Error ParseErrorResponse(int httpStatusCode, IEnumerable<KeyValuePair<string, IEnumerable<string>>> responseHeaders, IMessageAccessor accessor)
|
||||||
{
|
{
|
||||||
return new ServerError(null, "Unknown request error", exception);
|
var message = accessor.OriginalDataAvailable ? accessor.GetOriginalString() : "[Error response content only available when OutputOriginal = true in client options]";
|
||||||
|
return new ServerError(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -643,34 +559,23 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <param name="responseHeaders">The response headers</param>
|
/// <param name="responseHeaders">The response headers</param>
|
||||||
/// <param name="accessor">Data accessor</param>
|
/// <param name="accessor">Data accessor</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual ServerRateLimitError ParseRateLimitResponse(int httpStatusCode, KeyValuePair<string, string[]>[] responseHeaders, IMessageAccessor accessor)
|
protected virtual Error ParseRateLimitResponse(int httpStatusCode, IEnumerable<KeyValuePair<string, IEnumerable<string>>> responseHeaders, IMessageAccessor accessor)
|
||||||
{
|
{
|
||||||
|
var message = accessor.OriginalDataAvailable ? accessor.GetOriginalString() : "[Error response content only available when OutputOriginal = true in client options]";
|
||||||
|
|
||||||
// Handle retry after header
|
// Handle retry after header
|
||||||
var retryAfterHeader = responseHeaders.SingleOrDefault(r => r.Key.Equals("Retry-After", StringComparison.InvariantCultureIgnoreCase));
|
var retryAfterHeader = responseHeaders.SingleOrDefault(r => r.Key.Equals("Retry-After", StringComparison.InvariantCultureIgnoreCase));
|
||||||
if (retryAfterHeader.Value?.Any() != true)
|
if (retryAfterHeader.Value?.Any() != true)
|
||||||
return new ServerRateLimitError();
|
return new ServerRateLimitError(message);
|
||||||
|
|
||||||
var value = retryAfterHeader.Value.First();
|
var value = retryAfterHeader.Value.First();
|
||||||
if (int.TryParse(value, out var seconds))
|
if (int.TryParse(value, out var seconds))
|
||||||
return new ServerRateLimitError() { RetryAfter = DateTime.UtcNow.AddSeconds(seconds) };
|
return new ServerRateLimitError(message) { RetryAfter = DateTime.UtcNow.AddSeconds(seconds) };
|
||||||
|
|
||||||
if (DateTime.TryParse(value, out var datetime))
|
if (DateTime.TryParse(value, out var datetime))
|
||||||
return new ServerRateLimitError() { RetryAfter = datetime };
|
return new ServerRateLimitError(message) { RetryAfter = datetime };
|
||||||
|
|
||||||
return new ServerRateLimitError();
|
return new ServerRateLimitError(message);
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Create the parameter IDictionary
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="parameters"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected internal IDictionary<string, object> CreateParameterDictionary(IDictionary<string, object> parameters)
|
|
||||||
{
|
|
||||||
if (!OrderParameters)
|
|
||||||
return parameters;
|
|
||||||
|
|
||||||
return new SortedDictionary<string, object>(parameters, ParameterOrderComparer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -679,26 +584,18 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <returns>Server time</returns>
|
/// <returns>Server time</returns>
|
||||||
protected virtual Task<WebCallResult<DateTime>> GetServerTimestampAsync() => throw new NotImplementedException();
|
protected virtual Task<WebCallResult<DateTime>> GetServerTimestampAsync() => throw new NotImplementedException();
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void SetOptions<T>(UpdateOptions<T> options)
|
|
||||||
{
|
|
||||||
base.SetOptions(options);
|
|
||||||
|
|
||||||
RequestFactory.UpdateSettings(options.Proxy, options.RequestTimeout ?? ClientOptions.RequestTimeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal async Task<WebCallResult<bool>> SyncTimeAsync()
|
internal async Task<WebCallResult<bool>> SyncTimeAsync()
|
||||||
{
|
{
|
||||||
var timeSyncParams = GetTimeSyncInfo();
|
var timeSyncParams = GetTimeSyncInfo();
|
||||||
if (timeSyncParams == null)
|
if (timeSyncParams == null)
|
||||||
return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, ResultDataSource.Server, true, null);
|
return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, true, null);
|
||||||
|
|
||||||
if (await timeSyncParams.TimeSyncState.Semaphore.WaitAsync(0).ConfigureAwait(false))
|
if (await timeSyncParams.TimeSyncState.Semaphore.WaitAsync(0).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
if (!timeSyncParams.SyncTime || DateTime.UtcNow - timeSyncParams.TimeSyncState.LastSyncTime < timeSyncParams.RecalculationInterval)
|
if (!timeSyncParams.SyncTime || DateTime.UtcNow - timeSyncParams.TimeSyncState.LastSyncTime < timeSyncParams.RecalculationInterval)
|
||||||
{
|
{
|
||||||
timeSyncParams.TimeSyncState.Semaphore.Release();
|
timeSyncParams.TimeSyncState.Semaphore.Release();
|
||||||
return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, ResultDataSource.Server, true, null);
|
return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, true, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
var localTime = DateTime.UtcNow;
|
var localTime = DateTime.UtcNow;
|
||||||
@ -727,12 +624,7 @@ namespace CryptoExchange.Net.Clients
|
|||||||
timeSyncParams.TimeSyncState.Semaphore.Release();
|
timeSyncParams.TimeSyncState.Semaphore.Release();
|
||||||
}
|
}
|
||||||
|
|
||||||
return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, ResultDataSource.Server, true, null);
|
return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, true, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool ShouldCache(RequestDefinition definition)
|
|
||||||
=> ClientOptions.CachingEnabled
|
|
||||||
&& definition.Method == HttpMethod.Get
|
|
||||||
&& !definition.PreventCaching;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,10 +1,9 @@
|
|||||||
|
using CryptoExchange.Net.Converters.JsonNet;
|
||||||
using CryptoExchange.Net.Interfaces;
|
using CryptoExchange.Net.Interfaces;
|
||||||
using CryptoExchange.Net.Logging.Extensions;
|
using CryptoExchange.Net.Logging.Extensions;
|
||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using CryptoExchange.Net.Objects.Options;
|
using CryptoExchange.Net.Objects.Options;
|
||||||
using CryptoExchange.Net.Objects.Sockets;
|
using CryptoExchange.Net.Objects.Sockets;
|
||||||
using CryptoExchange.Net.RateLimiting;
|
|
||||||
using CryptoExchange.Net.RateLimiting.Interfaces;
|
|
||||||
using CryptoExchange.Net.Sockets;
|
using CryptoExchange.Net.Sockets;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using System;
|
using System;
|
||||||
@ -42,11 +41,6 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected TimeSpan KeepAliveInterval { get; set; } = TimeSpan.FromSeconds(10);
|
protected TimeSpan KeepAliveInterval { get; set; } = TimeSpan.FromSeconds(10);
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Keep alive timeout for websocket connection
|
|
||||||
/// </summary>
|
|
||||||
protected TimeSpan KeepAliveTimeout { get; set; } = TimeSpan.FromSeconds(10);
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Handlers for data from the socket which doesn't need to be forwarded to the caller. Ping or welcome messages for example.
|
/// Handlers for data from the socket which doesn't need to be forwarded to the caller. Ping or welcome messages for example.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -57,10 +51,15 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected internal bool UnhandledMessageExpected { get; set; }
|
protected internal bool UnhandledMessageExpected { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// If true a subscription will accept message before the confirmation of a subscription has been received
|
||||||
|
/// </summary>
|
||||||
|
protected bool HandleMessageBeforeConfirmation { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The rate limiters
|
/// The rate limiters
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected internal IRateLimitGate? RateLimiter { get; set; }
|
protected internal IEnumerable<IRateLimiter>? RateLimiters { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The max size a websocket message size can be
|
/// The max size a websocket message size can be
|
||||||
@ -68,31 +67,16 @@ namespace CryptoExchange.Net.Clients
|
|||||||
protected internal int? MessageSendSizeLimit { get; set; }
|
protected internal int? MessageSendSizeLimit { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Periodic task registrations
|
/// Periodic task regisrations
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected List<PeriodicTaskRegistration> PeriodicTaskRegistrations { get; set; } = new List<PeriodicTaskRegistration>();
|
protected List<PeriodicTaskRegistration> PeriodicTaskRegistrations { get; set; } = new List<PeriodicTaskRegistration>();
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// List of address to keep an alive connection to
|
|
||||||
/// </summary>
|
|
||||||
protected List<DedicatedConnectionConfig> DedicatedConnectionConfigs { get; set; } = new List<DedicatedConnectionConfig>();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Whether to allow multiple subscriptions with the same topic on the same connection
|
|
||||||
/// </summary>
|
|
||||||
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
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (socketConnections.IsEmpty)
|
if (!socketConnections.Any())
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
return socketConnections.Sum(s => s.Value.IncomingKbps);
|
return socketConnections.Sum(s => s.Value.IncomingKbps);
|
||||||
@ -107,7 +91,7 @@ namespace CryptoExchange.Net.Clients
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (socketConnections.IsEmpty)
|
if (!socketConnections.Any())
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
return socketConnections.Sum(s => s.Value.UserSubscriptionCount);
|
return socketConnections.Sum(s => s.Value.UserSubscriptionCount);
|
||||||
@ -137,29 +121,23 @@ namespace CryptoExchange.Net.Clients
|
|||||||
options,
|
options,
|
||||||
apiOptions)
|
apiOptions)
|
||||||
{
|
{
|
||||||
|
var rateLimiters = new List<IRateLimiter>();
|
||||||
|
foreach (var rateLimiter in apiOptions.RateLimiters)
|
||||||
|
rateLimiters.Add(rateLimiter);
|
||||||
|
RateLimiters = rateLimiters;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Create a message accessor instance
|
/// Create a message accessor instance
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected internal abstract IByteMessageAccessor CreateAccessor(WebSocketMessageType messageType);
|
protected internal virtual IByteMessageAccessor CreateAccessor() => new JsonNetByteMessageAccessor();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Create a serializer instance
|
/// Create a serializer instance
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected internal abstract IMessageSerializer CreateSerializer();
|
protected internal virtual IMessageSerializer CreateSerializer() => new JsonNetMessageSerializer();
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Keep an open connection to this url
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="url"></param>
|
|
||||||
/// <param name="auth"></param>
|
|
||||||
protected virtual void SetDedicatedConnection(string url, bool auth)
|
|
||||||
{
|
|
||||||
DedicatedConnectionConfigs.Add(new DedicatedConnectionConfig() { SocketAddress = url, Authenticated = auth });
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Add a query to periodically send on each connection
|
/// Add a query to periodically send on each connection
|
||||||
@ -168,7 +146,7 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <param name="interval"></param>
|
/// <param name="interval"></param>
|
||||||
/// <param name="queryDelegate"></param>
|
/// <param name="queryDelegate"></param>
|
||||||
/// <param name="callback"></param>
|
/// <param name="callback"></param>
|
||||||
protected virtual void RegisterPeriodicQuery(string identifier, TimeSpan interval, Func<SocketConnection, Query> queryDelegate, Action<SocketConnection, CallResult>? callback)
|
protected virtual void RegisterPeriodicQuery(string identifier, TimeSpan interval, Func<SocketConnection, Query> queryDelegate, Action<CallResult>? callback)
|
||||||
{
|
{
|
||||||
PeriodicTaskRegistrations.Add(new PeriodicTaskRegistration
|
PeriodicTaskRegistrations.Add(new PeriodicTaskRegistration
|
||||||
{
|
{
|
||||||
@ -203,10 +181,7 @@ namespace CryptoExchange.Net.Clients
|
|||||||
return new CallResult<UpdateSubscription>(new InvalidOperationError("Client disposed, can't subscribe"));
|
return new CallResult<UpdateSubscription>(new InvalidOperationError("Client disposed, can't subscribe"));
|
||||||
|
|
||||||
if (subscription.Authenticated && AuthenticationProvider == null)
|
if (subscription.Authenticated && AuthenticationProvider == null)
|
||||||
{
|
|
||||||
_logger.LogWarning("Failed to subscribe, private subscription but no API credentials set");
|
|
||||||
return new CallResult<UpdateSubscription>(new NoApiCredentialsError());
|
return new CallResult<UpdateSubscription>(new NoApiCredentialsError());
|
||||||
}
|
|
||||||
|
|
||||||
SocketConnection socketConnection;
|
SocketConnection socketConnection;
|
||||||
var released = false;
|
var released = false;
|
||||||
@ -216,9 +191,9 @@ namespace CryptoExchange.Net.Clients
|
|||||||
{
|
{
|
||||||
await semaphoreSlim.WaitAsync(ct).ConfigureAwait(false);
|
await semaphoreSlim.WaitAsync(ct).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
catch (OperationCanceledException tce)
|
catch (OperationCanceledException)
|
||||||
{
|
{
|
||||||
return new CallResult<UpdateSubscription>(new CancellationRequestedError(tce));
|
return new CallResult<UpdateSubscription>(new CancellationRequestedError());
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
@ -226,11 +201,12 @@ namespace CryptoExchange.Net.Clients
|
|||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
// Get a new or existing socket connection
|
// Get a new or existing socket connection
|
||||||
var socketResult = await GetSocketConnection(url, subscription.Authenticated, false, subscription.Topic).ConfigureAwait(false);
|
var socketResult = await GetSocketConnection(url, subscription.Authenticated).ConfigureAwait(false);
|
||||||
if (!socketResult)
|
if (!socketResult)
|
||||||
return socketResult.As<UpdateSubscription>(null);
|
return socketResult.As<UpdateSubscription>(null);
|
||||||
|
|
||||||
socketConnection = socketResult.Data;
|
socketConnection = socketResult.Data;
|
||||||
|
subscription.HandleUpdatesBeforeConfirmation = subscription.HandleUpdatesBeforeConfirmation || HandleMessageBeforeConfirmation;
|
||||||
|
|
||||||
// Add a subscription on the socket connection
|
// Add a subscription on the socket connection
|
||||||
var success = socketConnection.AddSubscription(subscription);
|
var success = socketConnection.AddSubscription(subscription);
|
||||||
@ -249,7 +225,7 @@ namespace CryptoExchange.Net.Clients
|
|||||||
|
|
||||||
var needsConnecting = !socketConnection.Connected;
|
var needsConnecting = !socketConnection.Connected;
|
||||||
|
|
||||||
var connectResult = await ConnectIfNeededAsync(socketConnection, subscription.Authenticated, ct).ConfigureAwait(false);
|
var connectResult = await ConnectIfNeededAsync(socketConnection, subscription.Authenticated).ConfigureAwait(false);
|
||||||
if (!connectResult)
|
if (!connectResult)
|
||||||
return new CallResult<UpdateSubscription>(connectResult.Error!);
|
return new CallResult<UpdateSubscription>(connectResult.Error!);
|
||||||
|
|
||||||
@ -268,27 +244,20 @@ namespace CryptoExchange.Net.Clients
|
|||||||
return new CallResult<UpdateSubscription>(new ServerError("Socket is paused"));
|
return new CallResult<UpdateSubscription>(new ServerError("Socket is paused"));
|
||||||
}
|
}
|
||||||
|
|
||||||
var waitEvent = new AsyncResetEvent(false);
|
var waitEvent = new ManualResetEvent(false);
|
||||||
var subQuery = subscription.GetSubQuery(socketConnection);
|
var subQuery = subscription.GetSubQuery(socketConnection);
|
||||||
if (subQuery != null)
|
if (subQuery != null)
|
||||||
{
|
{
|
||||||
// Send the request and wait for answer
|
// Send the request and wait for answer
|
||||||
var subResult = await socketConnection.SendAndWaitQueryAsync(subQuery, waitEvent, ct).ConfigureAwait(false);
|
var subResult = await socketConnection.SendAndWaitQueryAsync(subQuery, waitEvent).ConfigureAwait(false);
|
||||||
if (!subResult)
|
if (!subResult)
|
||||||
{
|
{
|
||||||
waitEvent?.Set();
|
waitEvent?.Set();
|
||||||
var isTimeout = subResult.Error is CancellationRequestedError;
|
_logger.FailedToSubscribe(socketConnection.SocketId, subResult.Error?.ToString());
|
||||||
if (isTimeout && subscription.Confirmed)
|
// If this was a timeout we still need to send an unsubscribe to prevent messages coming in later
|
||||||
{
|
var unsubscribe = subResult.Error is CancellationRequestedError;
|
||||||
// No response received, but the subscription did receive updates. We'll assume success
|
await socketConnection.CloseAsync(subscription, unsubscribe).ConfigureAwait(false);
|
||||||
}
|
return new CallResult<UpdateSubscription>(subResult.Error!);
|
||||||
else
|
|
||||||
{
|
|
||||||
_logger.FailedToSubscribe(socketConnection.SocketId, subResult.Error?.ToString());
|
|
||||||
// If this was a timeout we still need to send an unsubscribe to prevent messages coming in later
|
|
||||||
await socketConnection.CloseAsync(subscription).ConfigureAwait(false);
|
|
||||||
return new CallResult<UpdateSubscription>(subResult.Error!);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
subscription.HandleSubQueryResponse(subQuery.Response!);
|
subscription.HandleSubQueryResponse(subQuery.Response!);
|
||||||
@ -312,41 +281,34 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Send a query on a socket connection to the BaseAddress and wait for the response
|
/// Send a query on a socket connection to the BaseAddress and wait for the response
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="THandlerResponse">Expected result type</typeparam>
|
/// <typeparam name="T">Expected result type</typeparam>
|
||||||
/// <typeparam name="TServerResponse">The type returned to the caller</typeparam>
|
|
||||||
/// <param name="query">The query</param>
|
/// <param name="query">The query</param>
|
||||||
/// <param name="ct">Cancellation token</param>
|
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual Task<CallResult<THandlerResponse>> QueryAsync<TServerResponse, THandlerResponse>(Query<TServerResponse, THandlerResponse> query, CancellationToken ct = default)
|
protected virtual Task<CallResult<T>> QueryAsync<T>(Query<T> query)
|
||||||
{
|
{
|
||||||
return QueryAsync(BaseAddress, query, ct);
|
return QueryAsync(BaseAddress, query);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Send a query on a socket connection and wait for the response
|
/// Send a query on a socket connection and wait for the response
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="THandlerResponse">Expected result type</typeparam>
|
/// <typeparam name="T">The expected result type</typeparam>
|
||||||
/// <typeparam name="TServerResponse">The type returned to the caller</typeparam>
|
|
||||||
/// <param name="url">The url for the request</param>
|
/// <param name="url">The url for the request</param>
|
||||||
/// <param name="query">The query</param>
|
/// <param name="query">The query</param>
|
||||||
/// <param name="ct">Cancellation token</param>
|
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual async Task<CallResult<THandlerResponse>> QueryAsync<TServerResponse, THandlerResponse>(string url, Query<TServerResponse, THandlerResponse> query, CancellationToken ct = default)
|
protected virtual async Task<CallResult<T>> QueryAsync<T>(string url, Query<T> query)
|
||||||
{
|
{
|
||||||
if (_disposing)
|
if (_disposing)
|
||||||
return new CallResult<THandlerResponse>(new InvalidOperationError("Client disposed, can't query"));
|
return new CallResult<T>(new InvalidOperationError("Client disposed, can't query"));
|
||||||
|
|
||||||
if (ct.IsCancellationRequested)
|
|
||||||
return new CallResult<THandlerResponse>(new CancellationRequestedError());
|
|
||||||
|
|
||||||
SocketConnection socketConnection;
|
SocketConnection socketConnection;
|
||||||
var released = false;
|
var released = false;
|
||||||
await semaphoreSlim.WaitAsync().ConfigureAwait(false);
|
await semaphoreSlim.WaitAsync().ConfigureAwait(false);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var socketResult = await GetSocketConnection(url, query.Authenticated, true).ConfigureAwait(false);
|
var socketResult = await GetSocketConnection(url, query.Authenticated).ConfigureAwait(false);
|
||||||
if (!socketResult)
|
if (!socketResult)
|
||||||
return socketResult.As<THandlerResponse>(default);
|
return socketResult.As<T>(default);
|
||||||
|
|
||||||
socketConnection = socketResult.Data;
|
socketConnection = socketResult.Data;
|
||||||
|
|
||||||
@ -357,9 +319,9 @@ namespace CryptoExchange.Net.Clients
|
|||||||
released = true;
|
released = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
var connectResult = await ConnectIfNeededAsync(socketConnection, query.Authenticated, ct).ConfigureAwait(false);
|
var connectResult = await ConnectIfNeededAsync(socketConnection, query.Authenticated).ConfigureAwait(false);
|
||||||
if (!connectResult)
|
if (!connectResult)
|
||||||
return new CallResult<THandlerResponse>(connectResult.Error!);
|
return new CallResult<T>(connectResult.Error!);
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
@ -370,13 +332,10 @@ namespace CryptoExchange.Net.Clients
|
|||||||
if (socketConnection.PausedActivity)
|
if (socketConnection.PausedActivity)
|
||||||
{
|
{
|
||||||
_logger.HasBeenPausedCantSendQueryAtThisMoment(socketConnection.SocketId);
|
_logger.HasBeenPausedCantSendQueryAtThisMoment(socketConnection.SocketId);
|
||||||
return new CallResult<THandlerResponse>(new ServerError("Socket is paused"));
|
return new CallResult<T>(new ServerError("Socket is paused"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ct.IsCancellationRequested)
|
return await socketConnection.SendAndWaitQueryAsync(query).ConfigureAwait(false);
|
||||||
return new CallResult<THandlerResponse>(new CancellationRequestedError());
|
|
||||||
|
|
||||||
return await socketConnection.SendAndWaitQueryAsync(query, null, ct).ConfigureAwait(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -384,28 +343,23 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="socket">The connection to check</param>
|
/// <param name="socket">The connection to check</param>
|
||||||
/// <param name="authenticated">Whether the socket should authenticated</param>
|
/// <param name="authenticated">Whether the socket should authenticated</param>
|
||||||
/// <param name="ct">Cancellation token</param>
|
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual async Task<CallResult> ConnectIfNeededAsync(SocketConnection socket, bool authenticated, CancellationToken ct)
|
protected virtual async Task<CallResult<bool>> ConnectIfNeededAsync(SocketConnection socket, bool authenticated)
|
||||||
{
|
{
|
||||||
if (socket.Connected)
|
if (socket.Connected)
|
||||||
return CallResult.SuccessResult;
|
return new CallResult<bool>(true);
|
||||||
|
|
||||||
var connectResult = await ConnectSocketAsync(socket, ct).ConfigureAwait(false);
|
var connectResult = await ConnectSocketAsync(socket).ConfigureAwait(false);
|
||||||
if (!connectResult)
|
if (!connectResult)
|
||||||
return connectResult;
|
return new CallResult<bool>(connectResult.Error!);
|
||||||
|
|
||||||
if (ClientOptions.DelayAfterConnect != TimeSpan.Zero)
|
if (ClientOptions.DelayAfterConnect != TimeSpan.Zero)
|
||||||
await Task.Delay(ClientOptions.DelayAfterConnect).ConfigureAwait(false);
|
await Task.Delay(ClientOptions.DelayAfterConnect).ConfigureAwait(false);
|
||||||
|
|
||||||
if (!authenticated || socket.Authenticated)
|
if (!authenticated || socket.Authenticated)
|
||||||
return CallResult.SuccessResult;
|
return new CallResult<bool>(true);
|
||||||
|
|
||||||
var result = await AuthenticateSocketAsync(socket).ConfigureAwait(false);
|
return await AuthenticateSocketAsync(socket).ConfigureAwait(false);
|
||||||
if (!result)
|
|
||||||
await socket.CloseAsync().ConfigureAwait(false);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -413,13 +367,13 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="socket">Socket to authenticate</param>
|
/// <param name="socket">Socket to authenticate</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public virtual async Task<CallResult> AuthenticateSocketAsync(SocketConnection socket)
|
public virtual async Task<CallResult<bool>> AuthenticateSocketAsync(SocketConnection socket)
|
||||||
{
|
{
|
||||||
if (AuthenticationProvider == null)
|
if (AuthenticationProvider == null)
|
||||||
return new CallResult(new NoApiCredentialsError());
|
return new CallResult<bool>(new NoApiCredentialsError());
|
||||||
|
|
||||||
_logger.AttemptingToAuthenticate(socket.SocketId);
|
_logger.AttemptingToAuthenticate(socket.SocketId);
|
||||||
var authRequest = await GetAuthenticationRequestAsync(socket).ConfigureAwait(false);
|
var authRequest = GetAuthenticationRequest();
|
||||||
if (authRequest != null)
|
if (authRequest != null)
|
||||||
{
|
{
|
||||||
var result = await socket.SendAndWaitQueryAsync(authRequest).ConfigureAwait(false);
|
var result = await socket.SendAndWaitQueryAsync(authRequest).ConfigureAwait(false);
|
||||||
@ -431,21 +385,20 @@ namespace CryptoExchange.Net.Clients
|
|||||||
await socket.CloseAsync().ConfigureAwait(false);
|
await socket.CloseAsync().ConfigureAwait(false);
|
||||||
|
|
||||||
result.Error!.Message = "Authentication failed: " + result.Error.Message;
|
result.Error!.Message = "Authentication failed: " + result.Error.Message;
|
||||||
return new CallResult(result.Error)!;
|
return new CallResult<bool>(result.Error)!;
|
||||||
}
|
}
|
||||||
|
|
||||||
_logger.Authenticated(socket.SocketId);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_logger.Authenticated(socket.SocketId);
|
||||||
socket.Authenticated = true;
|
socket.Authenticated = true;
|
||||||
return CallResult.SuccessResult;
|
return new CallResult<bool>(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Should return the request which can be used to authenticate a socket connection
|
/// Should return the request which can be used to authenticate a socket connection
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected internal virtual Task<Query?> GetAuthenticationRequestAsync(SocketConnection connection) => throw new NotImplementedException();
|
protected internal virtual Query? GetAuthenticationRequest() => throw new NotImplementedException();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Adds a system subscription. Used for example to reply to ping requests
|
/// Adds a system subscription. Used for example to reply to ping requests
|
||||||
@ -486,7 +439,7 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected internal virtual Task<CallResult> RevitalizeRequestAsync(Subscription subscription)
|
protected internal virtual Task<CallResult> RevitalizeRequestAsync(Subscription subscription)
|
||||||
{
|
{
|
||||||
return Task.FromResult(CallResult.SuccessResult);
|
return Task.FromResult(new CallResult(null));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -494,36 +447,19 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="address">The address the socket is for</param>
|
/// <param name="address">The address the socket is for</param>
|
||||||
/// <param name="authenticated">Whether the socket should be authenticated</param>
|
/// <param name="authenticated">Whether the socket should be authenticated</param>
|
||||||
/// <param name="dedicatedRequestConnection">Whether a dedicated request connection should be returned</param>
|
|
||||||
/// <param name="topic">The subscription topic, can be provided when multiple of the same topics are not allowed on a connection</param>
|
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual async Task<CallResult<SocketConnection>> GetSocketConnection(string address, bool authenticated, bool dedicatedRequestConnection, string? topic = null)
|
protected virtual async Task<CallResult<SocketConnection>> GetSocketConnection(string address, bool authenticated)
|
||||||
{
|
{
|
||||||
var socketQuery = socketConnections.Where(s => (s.Value.Status == SocketConnection.SocketStatus.None || s.Value.Status == SocketConnection.SocketStatus.Connected)
|
var socketResult = socketConnections.Where(s => (s.Value.Status == SocketConnection.SocketStatus.None || s.Value.Status == SocketConnection.SocketStatus.Connected)
|
||||||
&& s.Value.Tag.TrimEnd('/') == address.TrimEnd('/')
|
&& s.Value.Tag.TrimEnd('/') == address.TrimEnd('/')
|
||||||
&& s.Value.ApiClient.GetType() == GetType()
|
&& s.Value.ApiClient.GetType() == GetType()
|
||||||
&& (s.Value.Authenticated == authenticated || !authenticated)
|
&& (s.Value.Authenticated == authenticated || !authenticated) && s.Value.Connected).OrderBy(s => s.Value.UserSubscriptionCount).FirstOrDefault();
|
||||||
&& (AllowTopicsOnTheSameConnection || !s.Value.Topics.Contains(topic))
|
var result = socketResult.Equals(default(KeyValuePair<int, SocketConnection>)) ? null : socketResult.Value;
|
||||||
&& s.Value.Connected);
|
if (result != null)
|
||||||
|
|
||||||
SocketConnection connection;
|
|
||||||
if (!dedicatedRequestConnection)
|
|
||||||
{
|
{
|
||||||
connection = socketQuery.Where(s => !s.Value.DedicatedRequestConnection.IsDedicatedRequestConnection).OrderBy(s => s.Value.UserSubscriptionCount).FirstOrDefault().Value;
|
if (result.UserSubscriptionCount < ClientOptions.SocketSubscriptionsCombineTarget || socketConnections.Count >= (ApiOptions.MaxSocketConnections ?? ClientOptions.MaxSocketConnections) && socketConnections.All(s => s.Value.UserSubscriptionCount >= ClientOptions.SocketSubscriptionsCombineTarget))
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
connection = socketQuery.Where(s => s.Value.DedicatedRequestConnection.IsDedicatedRequestConnection).FirstOrDefault().Value;
|
|
||||||
if (connection != null && !connection.DedicatedRequestConnection.Authenticated)
|
|
||||||
// Mark dedicated request connection as authenticated if the request is authenticated
|
|
||||||
connection.DedicatedRequestConnection.Authenticated = authenticated;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (connection != null)
|
|
||||||
{
|
|
||||||
if (connection.UserSubscriptionCount < ClientOptions.SocketSubscriptionsCombineTarget || (socketConnections.Count >= (ApiOptions.MaxSocketConnections ?? ClientOptions.MaxSocketConnections) && socketConnections.All(s => s.Value.UserSubscriptionCount >= ClientOptions.SocketSubscriptionsCombineTarget)))
|
|
||||||
// Use existing socket if it has less than target connections OR it has the least connections and we can't make new
|
// Use existing socket if it has less than target connections OR it has the least connections and we can't make new
|
||||||
return new CallResult<SocketConnection>(connection);
|
return new CallResult<SocketConnection>(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
var connectionAddress = await GetConnectionUrlAsync(address, authenticated).ConfigureAwait(false);
|
var connectionAddress = await GetConnectionUrlAsync(address, authenticated).ConfigureAwait(false);
|
||||||
@ -540,15 +476,6 @@ namespace CryptoExchange.Net.Clients
|
|||||||
var socket = CreateSocket(connectionAddress.Data!);
|
var socket = CreateSocket(connectionAddress.Data!);
|
||||||
var socketConnection = new SocketConnection(_logger, this, socket, address);
|
var socketConnection = new SocketConnection(_logger, this, socket, address);
|
||||||
socketConnection.UnhandledMessage += HandleUnhandledMessage;
|
socketConnection.UnhandledMessage += HandleUnhandledMessage;
|
||||||
socketConnection.ConnectRateLimitedAsync += HandleConnectRateLimitedAsync;
|
|
||||||
if (dedicatedRequestConnection)
|
|
||||||
{
|
|
||||||
socketConnection.DedicatedRequestConnection = new DedicatedConnectionState
|
|
||||||
{
|
|
||||||
IsDedicatedRequestConnection = dedicatedRequestConnection,
|
|
||||||
Authenticated = authenticated
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var ptg in PeriodicTaskRegistrations)
|
foreach (var ptg in PeriodicTaskRegistrations)
|
||||||
socketConnection.QueryPeriodic(ptg.Identifier, ptg.Interval, ptg.QueryDelegate, ptg.Callback);
|
socketConnection.QueryPeriodic(ptg.Identifier, ptg.Interval, ptg.QueryDelegate, ptg.Callback);
|
||||||
@ -567,37 +494,21 @@ namespace CryptoExchange.Net.Clients
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Process connect rate limited
|
|
||||||
/// </summary>
|
|
||||||
protected async virtual Task HandleConnectRateLimitedAsync()
|
|
||||||
{
|
|
||||||
if (ClientOptions.RateLimiterEnabled && ClientOptions.ConnectDelayAfterRateLimited.HasValue)
|
|
||||||
{
|
|
||||||
var retryAfter = DateTime.UtcNow.Add(ClientOptions.ConnectDelayAfterRateLimited.Value);
|
|
||||||
_logger.AddingRetryAfterGuard(retryAfter);
|
|
||||||
RateLimiter ??= new RateLimitGate("Connection");
|
|
||||||
await RateLimiter.SetRetryAfterGuardAsync(retryAfter, RateLimitItemType.Connection).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Connect a socket
|
/// Connect a socket
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="socketConnection">The socket to connect</param>
|
/// <param name="socketConnection">The socket to connect</param>
|
||||||
/// <param name="ct">Cancellation token</param>
|
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual async Task<CallResult> ConnectSocketAsync(SocketConnection socketConnection, CancellationToken ct)
|
protected virtual async Task<CallResult<bool>> ConnectSocketAsync(SocketConnection socketConnection)
|
||||||
{
|
{
|
||||||
var connectResult = await socketConnection.ConnectAsync(ct).ConfigureAwait(false);
|
if (await socketConnection.ConnectAsync().ConfigureAwait(false))
|
||||||
if (connectResult)
|
|
||||||
{
|
{
|
||||||
socketConnections.TryAdd(socketConnection.SocketId, socketConnection);
|
socketConnections.TryAdd(socketConnection.SocketId, socketConnection);
|
||||||
return connectResult;
|
return new CallResult<bool>(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
socketConnection.Dispose();
|
socketConnection.Dispose();
|
||||||
return connectResult;
|
return new CallResult<bool>(new CantConnectError());
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -606,16 +517,13 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <param name="address">The address to connect to</param>
|
/// <param name="address">The address to connect to</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual WebSocketParameters GetWebSocketParameters(string address)
|
protected virtual WebSocketParameters GetWebSocketParameters(string address)
|
||||||
=> new(new Uri(address), ClientOptions.ReconnectPolicy)
|
=> new(new Uri(address), ClientOptions.AutoReconnect)
|
||||||
{
|
{
|
||||||
KeepAliveInterval = KeepAliveInterval,
|
KeepAliveInterval = KeepAliveInterval,
|
||||||
KeepAliveTimeout = KeepAliveTimeout,
|
|
||||||
ReconnectInterval = ClientOptions.ReconnectInterval,
|
ReconnectInterval = ClientOptions.ReconnectInterval,
|
||||||
RateLimiter = ClientOptions.RateLimiterEnabled ? RateLimiter : null,
|
RateLimiters = RateLimiters,
|
||||||
RateLimitingBehavior = ClientOptions.RateLimitingBehaviour,
|
|
||||||
Proxy = ClientOptions.Proxy,
|
Proxy = ClientOptions.Proxy,
|
||||||
Timeout = ApiOptions.SocketNoDataTimeout ?? ClientOptions.SocketNoDataTimeout,
|
Timeout = ApiOptions.SocketNoDataTimeout ?? ClientOptions.SocketNoDataTimeout
|
||||||
ReceiveBufferSize = ClientOptions.ReceiveBufferSize,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -685,11 +593,8 @@ namespace CryptoExchange.Net.Clients
|
|||||||
var tasks = new List<Task>();
|
var tasks = new List<Task>();
|
||||||
{
|
{
|
||||||
var socketList = socketConnections.Values;
|
var socketList = socketConnections.Values;
|
||||||
foreach (var connection in socketList)
|
foreach (var sub in socketList)
|
||||||
{
|
tasks.Add(sub.CloseAsync());
|
||||||
foreach(var subscription in connection.Subscriptions.Where(x => x.UserSubscription))
|
|
||||||
tasks.Add(connection.CloseAsync(subscription));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
|
await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
|
||||||
@ -712,117 +617,37 @@ namespace CryptoExchange.Net.Clients
|
|||||||
await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
|
await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public virtual async Task<CallResult> PrepareConnectionsAsync()
|
|
||||||
{
|
|
||||||
foreach (var item in DedicatedConnectionConfigs)
|
|
||||||
{
|
|
||||||
var socketResult = await GetSocketConnection(item.SocketAddress, item.Authenticated, true).ConfigureAwait(false);
|
|
||||||
if (!socketResult)
|
|
||||||
return socketResult.AsDataless();
|
|
||||||
|
|
||||||
var connectResult = await ConnectIfNeededAsync(socketResult.Data, item.Authenticated, default).ConfigureAwait(false);
|
|
||||||
if (!connectResult)
|
|
||||||
return new CallResult(connectResult.Error!);
|
|
||||||
}
|
|
||||||
|
|
||||||
return CallResult.SuccessResult;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void SetOptions<T>(UpdateOptions<T> options)
|
|
||||||
{
|
|
||||||
var previousProxyIsSet = ClientOptions.Proxy != null;
|
|
||||||
base.SetOptions(options);
|
|
||||||
|
|
||||||
if ((!previousProxyIsSet && options.Proxy == null)
|
|
||||||
|| socketConnections.IsEmpty)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.LogInformation("Reconnecting websockets to apply proxy");
|
|
||||||
|
|
||||||
// Update proxy, also triggers reconnect
|
|
||||||
foreach (var connection in socketConnections)
|
|
||||||
_ = connection.Value.UpdateProxy(options.Proxy);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Log the current state of connections and subscriptions
|
/// Log the current state of connections and subscriptions
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string GetSubscriptionsState(bool includeSubDetails = true)
|
public string GetSubscriptionsState(bool includeSubDetails = true)
|
||||||
{
|
{
|
||||||
return GetState(includeSubDetails).ToString();
|
var sb = new StringBuilder();
|
||||||
}
|
sb.AppendLine($"{GetType().Name}");
|
||||||
|
sb.AppendLine($" Connections: {socketConnections.Count}");
|
||||||
/// <summary>
|
sb.AppendLine($" Subscriptions: {CurrentSubscriptions}");
|
||||||
/// Gets the state of the client
|
sb.AppendLine($" Download speed: {IncomingKbps} kbps");
|
||||||
/// </summary>
|
foreach (var connection in socketConnections)
|
||||||
/// <param name="includeSubDetails">True to get details for each subscription</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public SocketApiClientState GetState(bool includeSubDetails = true)
|
|
||||||
{
|
|
||||||
var connectionStates = new List<SocketConnection.SocketConnectionState>();
|
|
||||||
foreach (var socketIdAndConnection in socketConnections)
|
|
||||||
{
|
{
|
||||||
SocketConnection connection = socketIdAndConnection.Value;
|
sb.AppendLine($" Id: {connection.Key}");
|
||||||
SocketConnection.SocketConnectionState connectionState = connection.GetState(includeSubDetails);
|
sb.AppendLine($" Address: {connection.Value.ConnectionUri}");
|
||||||
connectionStates.Add(connectionState);
|
sb.AppendLine($" Subscriptions: {connection.Value.UserSubscriptionCount}");
|
||||||
}
|
sb.AppendLine($" Status: {connection.Value.Status}");
|
||||||
|
sb.AppendLine($" Authenticated: {connection.Value.Authenticated}");
|
||||||
return new SocketApiClientState(socketConnections.Count, CurrentSubscriptions, IncomingKbps, connectionStates);
|
sb.AppendLine($" Download speed: {connection.Value.IncomingKbps} kbps");
|
||||||
}
|
sb.AppendLine($" Subscriptions:");
|
||||||
|
if (includeSubDetails)
|
||||||
/// <summary>
|
|
||||||
/// Get the current state of the client
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="Connections">Number of sockets for this client</param>
|
|
||||||
/// <param name="Subscriptions">Total number of subscriptions</param>
|
|
||||||
/// <param name="DownloadSpeed">Total download speed</param>
|
|
||||||
/// <param name="ConnectionStates">State of each socket connection</param>
|
|
||||||
public record SocketApiClientState(
|
|
||||||
int Connections,
|
|
||||||
int Subscriptions,
|
|
||||||
double DownloadSpeed,
|
|
||||||
List<SocketConnection.SocketConnectionState> ConnectionStates)
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Print the state of the client
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="sb"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected virtual bool PrintMembers(StringBuilder sb)
|
|
||||||
{
|
|
||||||
sb.AppendLine();
|
|
||||||
sb.AppendLine($"\tTotal connections: {Connections}");
|
|
||||||
sb.AppendLine($"\tTotal subscriptions: {Subscriptions}");
|
|
||||||
sb.AppendLine($"\tDownload speed: {DownloadSpeed} kbps");
|
|
||||||
sb.AppendLine($"\tConnections:");
|
|
||||||
ConnectionStates.ForEach(cs =>
|
|
||||||
{
|
{
|
||||||
sb.AppendLine($"\t\tId: {cs.Id}");
|
foreach (var subscription in connection.Value.Subscriptions)
|
||||||
sb.AppendLine($"\t\tAddress: {cs.Address}");
|
|
||||||
sb.AppendLine($"\t\tTotal subscriptions: {cs.Subscriptions}");
|
|
||||||
sb.AppendLine($"\t\tStatus: {cs.Status}");
|
|
||||||
sb.AppendLine($"\t\tAuthenticated: {cs.Authenticated}");
|
|
||||||
sb.AppendLine($"\t\tDownload speed: {cs.DownloadSpeed} kbps");
|
|
||||||
sb.AppendLine($"\t\tPending queries: {cs.PendingQueries}");
|
|
||||||
if (cs.SubscriptionStates?.Count > 0)
|
|
||||||
{
|
{
|
||||||
sb.AppendLine($"\t\tSubscriptions:");
|
sb.AppendLine($" Id: {subscription.Id}");
|
||||||
cs.SubscriptionStates.ForEach(subState =>
|
sb.AppendLine($" Confirmed: {subscription.Confirmed}");
|
||||||
{
|
sb.AppendLine($" Invocations: {subscription.TotalInvocations}");
|
||||||
sb.AppendLine($"\t\t\tId: {subState.Id}");
|
sb.AppendLine($" Identifiers: [{string.Join(", ", subscription.ListenerIdentifiers)}]");
|
||||||
sb.AppendLine($"\t\t\tConfirmed: {subState.Confirmed}");
|
|
||||||
sb.AppendLine($"\t\t\tInvocations: {subState.Invocations}");
|
|
||||||
sb.AppendLine($"\t\t\tIdentifiers: [{string.Join(",", subState.Identifiers)}]");
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
return sb.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -831,18 +656,11 @@ namespace CryptoExchange.Net.Clients
|
|||||||
public override void Dispose()
|
public override void Dispose()
|
||||||
{
|
{
|
||||||
_disposing = true;
|
_disposing = true;
|
||||||
var tasks = new List<Task>();
|
if (socketConnections.Sum(s => s.Value.UserSubscriptionCount) > 0)
|
||||||
{
|
{
|
||||||
var socketList = socketConnections.Values.Where(x => x.UserSubscriptionCount > 0 || x.Connected);
|
_logger.DisposingSocketClient();
|
||||||
if (socketList.Any())
|
_ = UnsubscribeAllAsync();
|
||||||
_logger.DisposingSocketClient();
|
|
||||||
|
|
||||||
foreach (var connection in socketList)
|
|
||||||
{
|
|
||||||
tasks.Add(connection.CloseAsync());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
semaphoreSlim?.Dispose();
|
semaphoreSlim?.Dispose();
|
||||||
base.Dispose();
|
base.Dispose();
|
||||||
}
|
}
|
||||||
@ -857,10 +675,9 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Preprocess a stream message
|
/// Preprocess a stream message
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="connection"></param>
|
|
||||||
/// <param name="type"></param>
|
/// <param name="type"></param>
|
||||||
/// <param name="data"></param>
|
/// <param name="data"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public virtual ReadOnlyMemory<byte> PreprocessStreamMessage(SocketConnection connection, WebSocketMessageType type, ReadOnlyMemory<byte> data) => data;
|
public virtual ReadOnlyMemory<byte> PreprocessStreamMessage(WebSocketMessageType type, ReadOnlyMemory<byte> data) => data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
21
CryptoExchange.Net/CommonObjects/Balance.cs
Normal file
21
CryptoExchange.Net/CommonObjects/Balance.cs
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
namespace CryptoExchange.Net.CommonObjects
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Balance data
|
||||||
|
/// </summary>
|
||||||
|
public class Balance: BaseCommonObject
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The asset name
|
||||||
|
/// </summary>
|
||||||
|
public string Asset { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// Quantity available
|
||||||
|
/// </summary>
|
||||||
|
public decimal? Available { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Total quantity
|
||||||
|
/// </summary>
|
||||||
|
public decimal? Total { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
13
CryptoExchange.Net/CommonObjects/BaseComonObject.cs
Normal file
13
CryptoExchange.Net/CommonObjects/BaseComonObject.cs
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
namespace CryptoExchange.Net.CommonObjects
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Base class for common objects
|
||||||
|
/// </summary>
|
||||||
|
public class BaseCommonObject
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The source object the data is derived from
|
||||||
|
/// </summary>
|
||||||
|
public object SourceObject { get; set; } = null!;
|
||||||
|
}
|
||||||
|
}
|
||||||
73
CryptoExchange.Net/CommonObjects/Enums.cs
Normal file
73
CryptoExchange.Net/CommonObjects/Enums.cs
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
namespace CryptoExchange.Net.CommonObjects
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Order type
|
||||||
|
/// </summary>
|
||||||
|
public enum CommonOrderType
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Limit type
|
||||||
|
/// </summary>
|
||||||
|
Limit,
|
||||||
|
/// <summary>
|
||||||
|
/// Market type
|
||||||
|
/// </summary>
|
||||||
|
Market,
|
||||||
|
/// <summary>
|
||||||
|
/// Other order type
|
||||||
|
/// </summary>
|
||||||
|
Other
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Order side
|
||||||
|
/// </summary>
|
||||||
|
public enum CommonOrderSide
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Buy order
|
||||||
|
/// </summary>
|
||||||
|
Buy,
|
||||||
|
/// <summary>
|
||||||
|
/// Sell order
|
||||||
|
/// </summary>
|
||||||
|
Sell
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Order status
|
||||||
|
/// </summary>
|
||||||
|
public enum CommonOrderStatus
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// placed and not fully filled order
|
||||||
|
/// </summary>
|
||||||
|
Active,
|
||||||
|
/// <summary>
|
||||||
|
/// canceled order
|
||||||
|
/// </summary>
|
||||||
|
Canceled,
|
||||||
|
/// <summary>
|
||||||
|
/// filled order
|
||||||
|
/// </summary>
|
||||||
|
Filled
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Position side
|
||||||
|
/// </summary>
|
||||||
|
public enum CommonPositionSide
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Long position
|
||||||
|
/// </summary>
|
||||||
|
Long,
|
||||||
|
/// <summary>
|
||||||
|
/// Short position
|
||||||
|
/// </summary>
|
||||||
|
Short,
|
||||||
|
/// <summary>
|
||||||
|
/// Both
|
||||||
|
/// </summary>
|
||||||
|
Both
|
||||||
|
}
|
||||||
|
}
|
||||||
35
CryptoExchange.Net/CommonObjects/Kline.cs
Normal file
35
CryptoExchange.Net/CommonObjects/Kline.cs
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.CommonObjects
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Kline data
|
||||||
|
/// </summary>
|
||||||
|
public class Kline: BaseCommonObject
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Opening time of the kline
|
||||||
|
/// </summary>
|
||||||
|
public DateTime OpenTime { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Price at the open time
|
||||||
|
/// </summary>
|
||||||
|
public decimal? OpenPrice { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Highest price of the kline
|
||||||
|
/// </summary>
|
||||||
|
public decimal? HighPrice { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Lowest price of the kline
|
||||||
|
/// </summary>
|
||||||
|
public decimal? LowPrice { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Close price of the kline
|
||||||
|
/// </summary>
|
||||||
|
public decimal? ClosePrice { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Volume of the kline
|
||||||
|
/// </summary>
|
||||||
|
public decimal? Volume { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
47
CryptoExchange.Net/CommonObjects/Order.cs
Normal file
47
CryptoExchange.Net/CommonObjects/Order.cs
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.CommonObjects
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Order data
|
||||||
|
/// </summary>
|
||||||
|
public class Order: BaseCommonObject
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Id of the order
|
||||||
|
/// </summary>
|
||||||
|
public string Id { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// Symbol of the order
|
||||||
|
/// </summary>
|
||||||
|
public string Symbol { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// Price of the order
|
||||||
|
/// </summary>
|
||||||
|
public decimal? Price { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Quantity of the order
|
||||||
|
/// </summary>
|
||||||
|
public decimal? Quantity { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// The quantity of the order which has been filled
|
||||||
|
/// </summary>
|
||||||
|
public decimal? QuantityFilled { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Status of the order
|
||||||
|
/// </summary>
|
||||||
|
public CommonOrderStatus Status { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Side of the order
|
||||||
|
/// </summary>
|
||||||
|
public CommonOrderSide Side { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Type of the order
|
||||||
|
/// </summary>
|
||||||
|
public CommonOrderType Type { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Order time
|
||||||
|
/// </summary>
|
||||||
|
public DateTime Timestamp { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
20
CryptoExchange.Net/CommonObjects/OrderBook.cs
Normal file
20
CryptoExchange.Net/CommonObjects/OrderBook.cs
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.CommonObjects
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Order book data
|
||||||
|
/// </summary>
|
||||||
|
public class OrderBook: BaseCommonObject
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// List of bids
|
||||||
|
/// </summary>
|
||||||
|
public IEnumerable<OrderBookEntry> Bids { get; set; } = Array.Empty<OrderBookEntry>();
|
||||||
|
/// <summary>
|
||||||
|
/// List of asks
|
||||||
|
/// </summary>
|
||||||
|
public IEnumerable<OrderBookEntry> Asks { get; set; } = Array.Empty<OrderBookEntry>();
|
||||||
|
}
|
||||||
|
}
|
||||||
17
CryptoExchange.Net/CommonObjects/OrderBookEntry.cs
Normal file
17
CryptoExchange.Net/CommonObjects/OrderBookEntry.cs
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
namespace CryptoExchange.Net.CommonObjects
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Order book entry
|
||||||
|
/// </summary>
|
||||||
|
public class OrderBookEntry
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Quantity of the entry
|
||||||
|
/// </summary>
|
||||||
|
public decimal Quantity { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Price of the entry
|
||||||
|
/// </summary>
|
||||||
|
public decimal Price { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
13
CryptoExchange.Net/CommonObjects/OrderId.cs
Normal file
13
CryptoExchange.Net/CommonObjects/OrderId.cs
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
namespace CryptoExchange.Net.CommonObjects
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Id of an order
|
||||||
|
/// </summary>
|
||||||
|
public class OrderId: BaseCommonObject
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Id of an order
|
||||||
|
/// </summary>
|
||||||
|
public string Id { get; set; } = string.Empty;
|
||||||
|
}
|
||||||
|
}
|
||||||
65
CryptoExchange.Net/CommonObjects/Position.cs
Normal file
65
CryptoExchange.Net/CommonObjects/Position.cs
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
namespace CryptoExchange.Net.CommonObjects
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Position data
|
||||||
|
/// </summary>
|
||||||
|
public class Position: BaseCommonObject
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Id of the position
|
||||||
|
/// </summary>
|
||||||
|
public string? Id { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Symbol of the position
|
||||||
|
/// </summary>
|
||||||
|
public string Symbol { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// Leverage
|
||||||
|
/// </summary>
|
||||||
|
public decimal Leverage { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Position quantity
|
||||||
|
/// </summary>
|
||||||
|
public decimal Quantity { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Entry price
|
||||||
|
/// </summary>
|
||||||
|
public decimal? EntryPrice { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Liquidation price
|
||||||
|
/// </summary>
|
||||||
|
public decimal? LiquidationPrice { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Unrealized profit and loss
|
||||||
|
/// </summary>
|
||||||
|
public decimal? UnrealizedPnl { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Realized profit and loss
|
||||||
|
/// </summary>
|
||||||
|
public decimal? RealizedPnl { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Mark price
|
||||||
|
/// </summary>
|
||||||
|
public decimal? MarkPrice { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Auto adding margin
|
||||||
|
/// </summary>
|
||||||
|
public bool? AutoMargin { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Position margin
|
||||||
|
/// </summary>
|
||||||
|
public decimal? PositionMargin { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Position side
|
||||||
|
/// </summary>
|
||||||
|
public CommonPositionSide? Side { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Is isolated
|
||||||
|
/// </summary>
|
||||||
|
public bool? Isolated { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Maintenance margin
|
||||||
|
/// </summary>
|
||||||
|
public decimal? MaintananceMargin { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
33
CryptoExchange.Net/CommonObjects/Symbol.cs
Normal file
33
CryptoExchange.Net/CommonObjects/Symbol.cs
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
namespace CryptoExchange.Net.CommonObjects
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Symbol data
|
||||||
|
/// </summary>
|
||||||
|
public class Symbol: BaseCommonObject
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Name of the symbol
|
||||||
|
/// </summary>
|
||||||
|
public string Name { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// Minimal quantity of an order
|
||||||
|
/// </summary>
|
||||||
|
public decimal? MinTradeQuantity { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Step with which the quantity should increase
|
||||||
|
/// </summary>
|
||||||
|
public decimal? QuantityStep { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// step with which the price should increase
|
||||||
|
/// </summary>
|
||||||
|
public decimal? PriceStep { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// The max amount of decimals for quantity
|
||||||
|
/// </summary>
|
||||||
|
public int? QuantityDecimals { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// The max amount of decimal for price
|
||||||
|
/// </summary>
|
||||||
|
public int? PriceDecimals { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
33
CryptoExchange.Net/CommonObjects/Ticker.cs
Normal file
33
CryptoExchange.Net/CommonObjects/Ticker.cs
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
namespace CryptoExchange.Net.CommonObjects
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Ticker data
|
||||||
|
/// </summary>
|
||||||
|
public class Ticker: BaseCommonObject
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Symbol
|
||||||
|
/// </summary>
|
||||||
|
public string Symbol { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// Price 24 hours ago
|
||||||
|
/// </summary>
|
||||||
|
public decimal? Price24H { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Last trade price
|
||||||
|
/// </summary>
|
||||||
|
public decimal? LastPrice { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 24 hour low price
|
||||||
|
/// </summary>
|
||||||
|
public decimal? LowPrice { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 24 hour high price
|
||||||
|
/// </summary>
|
||||||
|
public decimal? HighPrice { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 24 hour volume
|
||||||
|
/// </summary>
|
||||||
|
public decimal? Volume { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
50
CryptoExchange.Net/CommonObjects/Trade.cs
Normal file
50
CryptoExchange.Net/CommonObjects/Trade.cs
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.CommonObjects
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Trade data
|
||||||
|
/// </summary>
|
||||||
|
public class Trade: BaseCommonObject
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Symbol of the trade
|
||||||
|
/// </summary>
|
||||||
|
public string Symbol { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// Price of the trade
|
||||||
|
/// </summary>
|
||||||
|
public decimal Price { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Quantity of the trade
|
||||||
|
/// </summary>
|
||||||
|
public decimal Quantity { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Timestamp of the trade
|
||||||
|
/// </summary>
|
||||||
|
public DateTime Timestamp { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// User trade info
|
||||||
|
/// </summary>
|
||||||
|
public class UserTrade: Trade
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Id of the trade
|
||||||
|
/// </summary>
|
||||||
|
public string Id { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// Order id of the trade
|
||||||
|
/// </summary>
|
||||||
|
public string? OrderId { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Fee of the trade
|
||||||
|
/// </summary>
|
||||||
|
public decimal? Fee { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// The asset the fee is paid in
|
||||||
|
/// </summary>
|
||||||
|
public string? FeeAsset { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,4 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters
|
namespace CryptoExchange.Net.Converters
|
||||||
{
|
{
|
||||||
|
|||||||
195
CryptoExchange.Net/Converters/JsonNet/ArrayConverter.cs
Normal file
195
CryptoExchange.Net/Converters/JsonNet/ArrayConverter.cs
Normal file
@ -0,0 +1,195 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Concurrent;
|
||||||
|
using System.Globalization;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Reflection;
|
||||||
|
using CryptoExchange.Net.Attributes;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Converters.JsonNet
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Converter for arrays to objects. Can deserialize data like [0.1, 0.2, "test"] to an object. Mapping is done by marking the class with [JsonConverter(typeof(ArrayConverter))] and the properties
|
||||||
|
/// with [ArrayProperty(x)] where x is the index of the property in the array
|
||||||
|
/// </summary>
|
||||||
|
public class ArrayConverter : JsonConverter
|
||||||
|
{
|
||||||
|
private static readonly ConcurrentDictionary<(MemberInfo, Type), Attribute> _attributeByMemberInfoAndTypeCache = new ConcurrentDictionary<(MemberInfo, Type), Attribute>();
|
||||||
|
private static readonly ConcurrentDictionary<(Type, Type), Attribute> _attributeByTypeAndTypeCache = new ConcurrentDictionary<(Type, Type), Attribute>();
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
if (reader.TokenType == JsonToken.Null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
if (objectType == typeof(JToken))
|
||||||
|
return JToken.Load(reader);
|
||||||
|
|
||||||
|
var result = Activator.CreateInstance(objectType);
|
||||||
|
var arr = JArray.Load(reader);
|
||||||
|
return ParseObject(arr, result, objectType);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static object ParseObject(JArray arr, object result, Type objectType)
|
||||||
|
{
|
||||||
|
foreach (var property in objectType.GetProperties())
|
||||||
|
{
|
||||||
|
var attribute = GetCustomAttribute<ArrayPropertyAttribute>(property);
|
||||||
|
|
||||||
|
if (attribute == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (attribute.Index >= arr.Count)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (property.PropertyType.BaseType == typeof(Array))
|
||||||
|
{
|
||||||
|
var objType = property.PropertyType.GetElementType();
|
||||||
|
var innerArray = (JArray)arr[attribute.Index];
|
||||||
|
var count = 0;
|
||||||
|
if (innerArray.Count == 0)
|
||||||
|
{
|
||||||
|
var arrayResult = (IList)Activator.CreateInstance(property.PropertyType, new [] { 0 });
|
||||||
|
property.SetValue(result, arrayResult);
|
||||||
|
}
|
||||||
|
else if (innerArray[0].Type == JTokenType.Array)
|
||||||
|
{
|
||||||
|
var arrayResult = (IList)Activator.CreateInstance(property.PropertyType, new [] { innerArray.Count });
|
||||||
|
foreach (var obj in innerArray)
|
||||||
|
{
|
||||||
|
var innerObj = Activator.CreateInstance(objType!);
|
||||||
|
arrayResult[count] = ParseObject((JArray)obj, innerObj, objType!);
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
property.SetValue(result, arrayResult);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var arrayResult = (IList)Activator.CreateInstance(property.PropertyType, new [] { 1 });
|
||||||
|
var innerObj = Activator.CreateInstance(objType!);
|
||||||
|
arrayResult[0] = ParseObject(innerArray, innerObj, objType!);
|
||||||
|
property.SetValue(result, arrayResult);
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var converterAttribute = GetCustomAttribute<JsonConverterAttribute>(property) ?? GetCustomAttribute<JsonConverterAttribute>(property.PropertyType);
|
||||||
|
var conversionAttribute = GetCustomAttribute<JsonConversionAttribute>(property) ?? GetCustomAttribute<JsonConversionAttribute>(property.PropertyType);
|
||||||
|
|
||||||
|
object? value;
|
||||||
|
if (converterAttribute != null)
|
||||||
|
{
|
||||||
|
value = arr[attribute.Index].ToObject(property.PropertyType, new JsonSerializer {Converters = {(JsonConverter) Activator.CreateInstance(converterAttribute.ConverterType)}});
|
||||||
|
}
|
||||||
|
else if (conversionAttribute != null)
|
||||||
|
{
|
||||||
|
value = arr[attribute.Index].ToObject(property.PropertyType);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
value = arr[attribute.Index];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value != null && property.PropertyType.IsInstanceOfType(value))
|
||||||
|
{
|
||||||
|
property.SetValue(result, value);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (value is JToken token)
|
||||||
|
{
|
||||||
|
if (token.Type == JTokenType.Null)
|
||||||
|
value = null;
|
||||||
|
|
||||||
|
if (token.Type == JTokenType.Float)
|
||||||
|
value = token.Value<decimal>();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value is decimal)
|
||||||
|
{
|
||||||
|
property.SetValue(result, value);
|
||||||
|
}
|
||||||
|
else if ((property.PropertyType == typeof(decimal)
|
||||||
|
|| property.PropertyType == typeof(decimal?))
|
||||||
|
&& (value != null && value.ToString().IndexOf("e", StringComparison.OrdinalIgnoreCase) >= 0))
|
||||||
|
{
|
||||||
|
var v = value.ToString();
|
||||||
|
if (decimal.TryParse(v, NumberStyles.Float, CultureInfo.InvariantCulture, out var dec))
|
||||||
|
property.SetValue(result, dec);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
property.SetValue(result, value == null ? null : Convert.ChangeType(value, property.PropertyType));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
if (value == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
writer.WriteStartArray();
|
||||||
|
var props = value.GetType().GetProperties();
|
||||||
|
var ordered = props.OrderBy(p => GetCustomAttribute<ArrayPropertyAttribute>(p)?.Index);
|
||||||
|
|
||||||
|
var last = -1;
|
||||||
|
foreach (var prop in ordered)
|
||||||
|
{
|
||||||
|
var arrayProp = GetCustomAttribute<ArrayPropertyAttribute>(prop);
|
||||||
|
if (arrayProp == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (arrayProp.Index == last)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
while (arrayProp.Index != last + 1)
|
||||||
|
{
|
||||||
|
writer.WriteValue((string?)null);
|
||||||
|
last += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
last = arrayProp.Index;
|
||||||
|
var converterAttribute = GetCustomAttribute<JsonConverterAttribute>(prop);
|
||||||
|
if (converterAttribute != null)
|
||||||
|
writer.WriteRawValue(JsonConvert.SerializeObject(prop.GetValue(value), (JsonConverter)Activator.CreateInstance(converterAttribute.ConverterType)));
|
||||||
|
else if (!IsSimple(prop.PropertyType))
|
||||||
|
serializer.Serialize(writer, prop.GetValue(value));
|
||||||
|
else
|
||||||
|
writer.WriteValue(prop.GetValue(value));
|
||||||
|
}
|
||||||
|
writer.WriteEndArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool IsSimple(Type type)
|
||||||
|
{
|
||||||
|
if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
|
||||||
|
{
|
||||||
|
// nullable type, check if the nested type is simple.
|
||||||
|
return IsSimple(type.GetGenericArguments()[0]);
|
||||||
|
}
|
||||||
|
return type.IsPrimitive
|
||||||
|
|| type.IsEnum
|
||||||
|
|| type == typeof(string)
|
||||||
|
|| type == typeof(decimal);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static T? GetCustomAttribute<T>(MemberInfo memberInfo) where T : Attribute =>
|
||||||
|
(T?)_attributeByMemberInfoAndTypeCache.GetOrAdd((memberInfo, typeof(T)), tuple => memberInfo.GetCustomAttribute(typeof(T)));
|
||||||
|
|
||||||
|
private static T? GetCustomAttribute<T>(Type type) where T : Attribute =>
|
||||||
|
(T?)_attributeByTypeAndTypeCache.GetOrAdd((type, typeof(T)), tuple => type.GetCustomAttribute(typeof(T)));
|
||||||
|
}
|
||||||
|
}
|
||||||
98
CryptoExchange.Net/Converters/JsonNet/BaseConverter.cs
Normal file
98
CryptoExchange.Net/Converters/JsonNet/BaseConverter.cs
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Linq;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Converters.JsonNet
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Base class for enum converters
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">Type of enum to convert</typeparam>
|
||||||
|
public abstract class BaseConverter<T>: JsonConverter where T: struct
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The enum->string mapping
|
||||||
|
/// </summary>
|
||||||
|
protected abstract List<KeyValuePair<T, string>> Mapping { get; }
|
||||||
|
private readonly bool _quotes;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ctor
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="useQuotes"></param>
|
||||||
|
protected BaseConverter(bool useQuotes)
|
||||||
|
{
|
||||||
|
_quotes = useQuotes;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
var stringValue = value == null? null: GetValue((T) value);
|
||||||
|
if (_quotes)
|
||||||
|
writer.WriteValue(stringValue);
|
||||||
|
else
|
||||||
|
writer.WriteRawValue(stringValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
if (reader.Value == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var stringValue = reader.Value.ToString();
|
||||||
|
if (string.IsNullOrWhiteSpace(stringValue))
|
||||||
|
return null;
|
||||||
|
|
||||||
|
if (!GetValue(stringValue, out var result))
|
||||||
|
{
|
||||||
|
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Cannot map enum value. EnumType: {typeof(T)}, Value: {reader.Value}, Known values: {string.Join(", ", Mapping.Select(m => m.Value))}. If you think {reader.Value} should added please open an issue on the Github repo");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Convert a string value
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="data"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public T ReadString(string data)
|
||||||
|
{
|
||||||
|
return Mapping.FirstOrDefault(v => v.Value == data).Key;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
// Check if it is type, or nullable of type
|
||||||
|
return objectType == typeof(T) || Nullable.GetUnderlyingType(objectType) == typeof(T);
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool GetValue(string value, out T result)
|
||||||
|
{
|
||||||
|
// Check for exact match first, then if not found fallback to a case insensitive match
|
||||||
|
var mapping = Mapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCulture));
|
||||||
|
if(mapping.Equals(default(KeyValuePair<T, string>)))
|
||||||
|
mapping = Mapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCultureIgnoreCase));
|
||||||
|
|
||||||
|
if (!mapping.Equals(default(KeyValuePair<T, string>)))
|
||||||
|
{
|
||||||
|
result = mapping.Key;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
result = default;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetValue(T value)
|
||||||
|
{
|
||||||
|
return Mapping.FirstOrDefault(v => v.Key.Equals(value)).Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
80
CryptoExchange.Net/Converters/JsonNet/BoolConverter.cs
Normal file
80
CryptoExchange.Net/Converters/JsonNet/BoolConverter.cs
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
using System;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Converters.JsonNet
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Boolean converter with support for "0"/"1" (strings)
|
||||||
|
/// </summary>
|
||||||
|
public class BoolConverter : JsonConverter
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Determines whether this instance can convert the specified object type.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="objectType">Type of the object.</param>
|
||||||
|
/// <returns>
|
||||||
|
/// <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
|
||||||
|
/// </returns>
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
if (Nullable.GetUnderlyingType(objectType) != null)
|
||||||
|
return Nullable.GetUnderlyingType(objectType) == typeof(bool);
|
||||||
|
return objectType == typeof(bool);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Reads the JSON representation of the object.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
|
||||||
|
/// <param name="objectType">Type of the object.</param>
|
||||||
|
/// <param name="existingValue">The existing value of object being read.</param>
|
||||||
|
/// <param name="serializer">The calling serializer.</param>
|
||||||
|
/// <returns>
|
||||||
|
/// The object value.
|
||||||
|
/// </returns>
|
||||||
|
public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
var value = reader.Value?.ToString().ToLower().Trim();
|
||||||
|
if (value == null || value == "")
|
||||||
|
{
|
||||||
|
if (Nullable.GetUnderlyingType(objectType) != null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (value)
|
||||||
|
{
|
||||||
|
case "true":
|
||||||
|
case "yes":
|
||||||
|
case "y":
|
||||||
|
case "1":
|
||||||
|
case "on":
|
||||||
|
return true;
|
||||||
|
case "false":
|
||||||
|
case "no":
|
||||||
|
case "n":
|
||||||
|
case "0":
|
||||||
|
case "off":
|
||||||
|
case "-1":
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we reach here, we're pretty much going to throw an error so let's let Json.NET throw it's pretty-fied error message.
|
||||||
|
return new JsonSerializer().Deserialize(reader, objectType);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Specifies that this converter will not participate in writing results.
|
||||||
|
/// </summary>
|
||||||
|
public override bool CanWrite { get { return false; } }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Writes the JSON representation of the object.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param><param name="value">The value.</param><param name="serializer">The calling serializer.</param>
|
||||||
|
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
204
CryptoExchange.Net/Converters/JsonNet/DateTimeConverter.cs
Normal file
204
CryptoExchange.Net/Converters/JsonNet/DateTimeConverter.cs
Normal file
@ -0,0 +1,204 @@
|
|||||||
|
using Newtonsoft.Json;
|
||||||
|
using System;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
using System.Globalization;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Converters.JsonNet
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Datetime converter. Supports converting from string/long/double to DateTime and back. Numbers are assumed to be the time since 1970-01-01.
|
||||||
|
/// </summary>
|
||||||
|
public class DateTimeConverter: JsonConverter
|
||||||
|
{
|
||||||
|
private static readonly DateTime _epoch = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
|
||||||
|
private const long _ticksPerSecond = TimeSpan.TicksPerMillisecond * 1000;
|
||||||
|
private const decimal _ticksPerMicrosecond = TimeSpan.TicksPerMillisecond / 1000;
|
||||||
|
private const decimal _ticksPerNanosecond = TimeSpan.TicksPerMillisecond / 1000m / 1000;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
return objectType == typeof(DateTime) || objectType == typeof(DateTime?);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
if (reader.Value == null)
|
||||||
|
{
|
||||||
|
if (objectType == typeof(DateTime))
|
||||||
|
return default(DateTime);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(reader.TokenType is JsonToken.Integer)
|
||||||
|
{
|
||||||
|
var longValue = (long)reader.Value;
|
||||||
|
if (longValue == 0 || longValue == -1)
|
||||||
|
return objectType == typeof(DateTime) ? default(DateTime): null;
|
||||||
|
if (longValue < 19999999999)
|
||||||
|
return ConvertFromSeconds(longValue);
|
||||||
|
if (longValue < 19999999999999)
|
||||||
|
return ConvertFromMilliseconds(longValue);
|
||||||
|
if (longValue < 19999999999999999)
|
||||||
|
return ConvertFromMicroseconds(longValue);
|
||||||
|
|
||||||
|
return ConvertFromNanoseconds(longValue);
|
||||||
|
}
|
||||||
|
else if (reader.TokenType is JsonToken.Float)
|
||||||
|
{
|
||||||
|
var doubleValue = (double)reader.Value;
|
||||||
|
if (doubleValue == 0 || doubleValue == -1)
|
||||||
|
return objectType == typeof(DateTime) ? default(DateTime) : null;
|
||||||
|
|
||||||
|
if (doubleValue < 19999999999)
|
||||||
|
return ConvertFromSeconds(doubleValue);
|
||||||
|
|
||||||
|
return ConvertFromMilliseconds(doubleValue);
|
||||||
|
}
|
||||||
|
else if(reader.TokenType is JsonToken.String)
|
||||||
|
{
|
||||||
|
var stringValue = (string)reader.Value;
|
||||||
|
if (string.IsNullOrWhiteSpace(stringValue)
|
||||||
|
|| stringValue == "-1"
|
||||||
|
|| (double.TryParse(stringValue, out var doubleVal) && doubleVal == 0))
|
||||||
|
{
|
||||||
|
return objectType == typeof(DateTime) ? default(DateTime) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stringValue.Length == 8)
|
||||||
|
{
|
||||||
|
// Parse 20211103 format
|
||||||
|
if (!int.TryParse(stringValue.Substring(0, 4), out var year)
|
||||||
|
|| !int.TryParse(stringValue.Substring(4, 2), out var month)
|
||||||
|
|| !int.TryParse(stringValue.Substring(6, 2), out var day))
|
||||||
|
{
|
||||||
|
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + reader.Value);
|
||||||
|
return default;
|
||||||
|
}
|
||||||
|
return new DateTime(year, month, day, 0, 0, 0, DateTimeKind.Utc);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stringValue.Length == 6)
|
||||||
|
{
|
||||||
|
// Parse 211103 format
|
||||||
|
if (!int.TryParse(stringValue.Substring(0, 2), out var year)
|
||||||
|
|| !int.TryParse(stringValue.Substring(2, 2), out var month)
|
||||||
|
|| !int.TryParse(stringValue.Substring(4, 2), out var day))
|
||||||
|
{
|
||||||
|
Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + reader.Value);
|
||||||
|
return default;
|
||||||
|
}
|
||||||
|
return new DateTime(year + 2000, month, day, 0, 0, 0, DateTimeKind.Utc);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (double.TryParse(stringValue, NumberStyles.Float, CultureInfo.InvariantCulture, out var doubleValue))
|
||||||
|
{
|
||||||
|
// Parse 1637745563.000 format
|
||||||
|
if (doubleValue < 19999999999)
|
||||||
|
return ConvertFromSeconds(doubleValue);
|
||||||
|
if (doubleValue < 19999999999999)
|
||||||
|
return ConvertFromMilliseconds((long)doubleValue);
|
||||||
|
if (doubleValue < 19999999999999999)
|
||||||
|
return ConvertFromMicroseconds((long)doubleValue);
|
||||||
|
|
||||||
|
return ConvertFromNanoseconds((long)doubleValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(stringValue.Length == 10)
|
||||||
|
{
|
||||||
|
// Parse 2021-11-03 format
|
||||||
|
var values = stringValue.Split('-');
|
||||||
|
if(!int.TryParse(values[0], out var year)
|
||||||
|
|| !int.TryParse(values[1], out var month)
|
||||||
|
|| !int.TryParse(values[2], out var day))
|
||||||
|
{
|
||||||
|
Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + reader.Value);
|
||||||
|
return default;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new DateTime(year, month, day, 0, 0, 0, DateTimeKind.Utc);
|
||||||
|
}
|
||||||
|
|
||||||
|
return DateTime.Parse(stringValue, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal);
|
||||||
|
}
|
||||||
|
else if(reader.TokenType == JsonToken.Date)
|
||||||
|
{
|
||||||
|
return (DateTime)reader.Value;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + reader.Value);
|
||||||
|
return default;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Convert a seconds since epoch (01-01-1970) value to DateTime
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="seconds"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static DateTime ConvertFromSeconds(double seconds) => _epoch.AddTicks((long)Math.Round(seconds * _ticksPerSecond));
|
||||||
|
/// <summary>
|
||||||
|
/// Convert a milliseconds since epoch (01-01-1970) value to DateTime
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="milliseconds"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static DateTime ConvertFromMilliseconds(double milliseconds) => _epoch.AddTicks((long)Math.Round(milliseconds * TimeSpan.TicksPerMillisecond));
|
||||||
|
/// <summary>
|
||||||
|
/// Convert a microseconds since epoch (01-01-1970) value to DateTime
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="microseconds"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static DateTime ConvertFromMicroseconds(long microseconds) => _epoch.AddTicks((long)Math.Round(microseconds * _ticksPerMicrosecond));
|
||||||
|
/// <summary>
|
||||||
|
/// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="nanoseconds"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static DateTime ConvertFromNanoseconds(long nanoseconds) => _epoch.AddTicks((long)Math.Round(nanoseconds * _ticksPerNanosecond));
|
||||||
|
/// <summary>
|
||||||
|
/// Convert a DateTime value to seconds since epoch (01-01-1970) value
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="time"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[return: NotNullIfNotNull("time")]
|
||||||
|
public static long? ConvertToSeconds(DateTime? time) => time == null ? null: (long)Math.Round((time.Value - _epoch).TotalSeconds);
|
||||||
|
/// <summary>
|
||||||
|
/// Convert a DateTime value to milliseconds since epoch (01-01-1970) value
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="time"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[return: NotNullIfNotNull("time")]
|
||||||
|
public static long? ConvertToMilliseconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).TotalMilliseconds);
|
||||||
|
/// <summary>
|
||||||
|
/// Convert a DateTime value to microseconds since epoch (01-01-1970) value
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="time"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[return: NotNullIfNotNull("time")]
|
||||||
|
public static long? ConvertToMicroseconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).Ticks / _ticksPerMicrosecond);
|
||||||
|
/// <summary>
|
||||||
|
/// Convert a DateTime value to nanoseconds since epoch (01-01-1970) value
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="time"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[return: NotNullIfNotNull("time")]
|
||||||
|
public static long? ConvertToNanoseconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).Ticks / _ticksPerNanosecond);
|
||||||
|
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
var datetimeValue = (DateTime?)value;
|
||||||
|
if (datetimeValue == null)
|
||||||
|
writer.WriteValue((DateTime?)null);
|
||||||
|
if(datetimeValue == default(DateTime))
|
||||||
|
writer.WriteValue((DateTime?)null);
|
||||||
|
else
|
||||||
|
writer.WriteValue((long)Math.Round(((DateTime)value! - new DateTime(1970, 1, 1)).TotalMilliseconds));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
using Newtonsoft.Json;
|
||||||
|
using System;
|
||||||
|
using System.Globalization;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Converters.JsonNet
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Converter for serializing decimal values as string
|
||||||
|
/// </summary>
|
||||||
|
public class DecimalStringWriterConverter : JsonConverter
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override bool CanRead => false;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override bool CanConvert(Type objectType) => objectType == typeof(decimal) || objectType == typeof(decimal?);
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) => writer.WriteValue(((decimal?)value)?.ToString(CultureInfo.InvariantCulture) ?? null);
|
||||||
|
}
|
||||||
|
}
|
||||||
176
CryptoExchange.Net/Converters/JsonNet/EnumConverter.cs
Normal file
176
CryptoExchange.Net/Converters/JsonNet/EnumConverter.cs
Normal file
@ -0,0 +1,176 @@
|
|||||||
|
using CryptoExchange.Net.Attributes;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Concurrent;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Converters.JsonNet
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Converter for enum values. Enums entries should be noted with a MapAttribute to map the enum value to a string value
|
||||||
|
/// </summary>
|
||||||
|
public class EnumConverter : JsonConverter
|
||||||
|
{
|
||||||
|
private bool _warnOnMissingEntry = true;
|
||||||
|
private bool _writeAsInt;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// </summary>
|
||||||
|
public EnumConverter() { }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="writeAsInt"></param>
|
||||||
|
/// <param name="warnOnMissingEntry"></param>
|
||||||
|
public EnumConverter(bool writeAsInt, bool warnOnMissingEntry)
|
||||||
|
{
|
||||||
|
_writeAsInt = writeAsInt;
|
||||||
|
_warnOnMissingEntry = warnOnMissingEntry;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static readonly ConcurrentDictionary<Type, List<KeyValuePair<object, string>>> _mapping = new();
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
return objectType.IsEnum || Nullable.GetUnderlyingType(objectType)?.IsEnum == true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
var enumType = Nullable.GetUnderlyingType(objectType) ?? objectType;
|
||||||
|
if (!_mapping.TryGetValue(enumType, out var mapping))
|
||||||
|
mapping = AddMapping(enumType);
|
||||||
|
|
||||||
|
var stringValue = reader.Value?.ToString();
|
||||||
|
if (stringValue == null || stringValue == "")
|
||||||
|
{
|
||||||
|
// Received null value
|
||||||
|
var emptyResult = GetDefaultValue(objectType, enumType);
|
||||||
|
if(emptyResult != null)
|
||||||
|
// If the property we're parsing to isn't nullable there isn't a correct way to return this as null will either throw an exception (.net framework) or the default enum value (dotnet core).
|
||||||
|
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received null enum value, but property type is not a nullable enum. EnumType: {enumType.Name}. If you think {enumType.Name} should be nullable please open an issue on the Github repo");
|
||||||
|
|
||||||
|
return emptyResult;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!GetValue(enumType, mapping, stringValue!, out var result))
|
||||||
|
{
|
||||||
|
var defaultValue = GetDefaultValue(objectType, enumType);
|
||||||
|
if (string.IsNullOrWhiteSpace(stringValue))
|
||||||
|
{
|
||||||
|
if (defaultValue != null)
|
||||||
|
// We received an empty string and have no mapping for it, and the property isn't nullable
|
||||||
|
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received empty string as enum value, but property type is not a nullable enum. EnumType: {enumType.Name}. If you think {enumType.Name} should be nullable please open an issue on the Github repo");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// We received an enum value but weren't able to parse it.
|
||||||
|
if (_warnOnMissingEntry)
|
||||||
|
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Cannot map enum value. EnumType: {enumType.Name}, Value: {reader.Value}, Known values: {string.Join(", ", mapping.Select(m => m.Value))}. If you think {reader.Value} should added please open an issue on the Github repo");
|
||||||
|
}
|
||||||
|
|
||||||
|
return defaultValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static object? GetDefaultValue(Type objectType, Type enumType)
|
||||||
|
{
|
||||||
|
if (Nullable.GetUnderlyingType(objectType) != null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return Activator.CreateInstance(enumType); // return default value
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<KeyValuePair<object, string>> AddMapping(Type objectType)
|
||||||
|
{
|
||||||
|
var mapping = new List<KeyValuePair<object, string>>();
|
||||||
|
var enumMembers = objectType.GetMembers();
|
||||||
|
foreach (var member in enumMembers)
|
||||||
|
{
|
||||||
|
var maps = member.GetCustomAttributes(typeof(MapAttribute), false);
|
||||||
|
foreach (MapAttribute attribute in maps)
|
||||||
|
{
|
||||||
|
foreach (var value in attribute.Values)
|
||||||
|
mapping.Add(new KeyValuePair<object, string>(Enum.Parse(objectType, member.Name), value));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_mapping.TryAdd(objectType, mapping);
|
||||||
|
return mapping;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool GetValue(Type objectType, List<KeyValuePair<object, string>> enumMapping, string value, out object? result)
|
||||||
|
{
|
||||||
|
// Check for exact match first, then if not found fallback to a case insensitive match
|
||||||
|
var mapping = enumMapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCulture));
|
||||||
|
if (mapping.Equals(default(KeyValuePair<object, string>)))
|
||||||
|
mapping = enumMapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCultureIgnoreCase));
|
||||||
|
|
||||||
|
if (!mapping.Equals(default(KeyValuePair<object, string>)))
|
||||||
|
{
|
||||||
|
result = mapping.Key;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// If no explicit mapping is found try to parse string
|
||||||
|
result = Enum.Parse(objectType, value, true);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
result = default;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <param name="enumValue"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[return: NotNullIfNotNull("enumValue")]
|
||||||
|
public static string? GetString<T>(T enumValue) => GetString(typeof(T), enumValue);
|
||||||
|
|
||||||
|
|
||||||
|
[return: NotNullIfNotNull("enumValue")]
|
||||||
|
private static string? GetString(Type objectType, object? enumValue)
|
||||||
|
{
|
||||||
|
objectType = Nullable.GetUnderlyingType(objectType) ?? objectType;
|
||||||
|
|
||||||
|
if (!_mapping.TryGetValue(objectType, out var mapping))
|
||||||
|
mapping = AddMapping(objectType);
|
||||||
|
|
||||||
|
return enumValue == null ? null : (mapping.FirstOrDefault(v => v.Key.Equals(enumValue)).Value ?? enumValue.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
if (value == null)
|
||||||
|
{
|
||||||
|
writer.WriteNull();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (!_writeAsInt)
|
||||||
|
{
|
||||||
|
var stringValue = GetString(value.GetType(), value);
|
||||||
|
writer.WriteValue(stringValue);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
writer.WriteValue((int)value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
337
CryptoExchange.Net/Converters/JsonNet/JsonNetMessageAccessor.cs
Normal file
337
CryptoExchange.Net/Converters/JsonNet/JsonNetMessageAccessor.cs
Normal file
@ -0,0 +1,337 @@
|
|||||||
|
using CryptoExchange.Net.Converters.MessageParsing;
|
||||||
|
using CryptoExchange.Net.Interfaces;
|
||||||
|
using CryptoExchange.Net.Objects;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Converters.JsonNet
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Json.Net message accessor
|
||||||
|
/// </summary>
|
||||||
|
public abstract class JsonNetMessageAccessor : IMessageAccessor
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The json token loaded
|
||||||
|
/// </summary>
|
||||||
|
protected JToken? _token;
|
||||||
|
private static readonly JsonSerializer _serializer = JsonSerializer.Create(SerializerOptions.WithConverters);
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public bool IsJson { get; protected set; }
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public abstract bool OriginalDataAvailable { get; }
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public object? Underlying => _token;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public CallResult<object> Deserialize(Type type, MessagePath? path = null)
|
||||||
|
{
|
||||||
|
if (!IsJson)
|
||||||
|
return new CallResult<object>(GetOriginalString());
|
||||||
|
|
||||||
|
var source = _token;
|
||||||
|
if (path != null)
|
||||||
|
source = GetPathNode(path.Value);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = source!.ToObject(type, _serializer)!;
|
||||||
|
return new CallResult<object>(result);
|
||||||
|
}
|
||||||
|
catch (JsonReaderException jre)
|
||||||
|
{
|
||||||
|
var info = $"Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}";
|
||||||
|
return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
|
||||||
|
}
|
||||||
|
catch (JsonSerializationException jse)
|
||||||
|
{
|
||||||
|
var info = $"Deserialize JsonSerializationException: {jse.Message}";
|
||||||
|
return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
var exceptionInfo = ex.ToLogString();
|
||||||
|
var info = $"Deserialize Unknown Exception: {exceptionInfo}";
|
||||||
|
return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public CallResult<T> Deserialize<T>(MessagePath? path = null)
|
||||||
|
{
|
||||||
|
var source = _token;
|
||||||
|
if (path != null)
|
||||||
|
source = GetPathNode(path.Value);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = source!.ToObject<T>(_serializer)!;
|
||||||
|
return new CallResult<T>(result);
|
||||||
|
}
|
||||||
|
catch (JsonReaderException jre)
|
||||||
|
{
|
||||||
|
var info = $"Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}";
|
||||||
|
return new CallResult<T>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
|
||||||
|
}
|
||||||
|
catch (JsonSerializationException jse)
|
||||||
|
{
|
||||||
|
var info = $"Deserialize JsonSerializationException: {jse.Message}";
|
||||||
|
return new CallResult<T>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
var exceptionInfo = ex.ToLogString();
|
||||||
|
var info = $"Deserialize Unknown Exception: {exceptionInfo}";
|
||||||
|
return new CallResult<T>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public NodeType? GetNodeType()
|
||||||
|
{
|
||||||
|
if (!IsJson)
|
||||||
|
throw new InvalidOperationException("Can't access json data on non-json message");
|
||||||
|
|
||||||
|
if (_token == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
if (_token.Type == JTokenType.Object)
|
||||||
|
return NodeType.Object;
|
||||||
|
|
||||||
|
if (_token.Type == JTokenType.Array)
|
||||||
|
return NodeType.Array;
|
||||||
|
|
||||||
|
return NodeType.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public NodeType? GetNodeType(MessagePath path)
|
||||||
|
{
|
||||||
|
if (!IsJson)
|
||||||
|
throw new InvalidOperationException("Can't access json data on non-json message");
|
||||||
|
|
||||||
|
var node = GetPathNode(path);
|
||||||
|
if (node == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
if (node.Type == JTokenType.Object)
|
||||||
|
return NodeType.Object;
|
||||||
|
|
||||||
|
if (node.Type == JTokenType.Array)
|
||||||
|
return NodeType.Array;
|
||||||
|
|
||||||
|
return NodeType.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public T? GetValue<T>(MessagePath path)
|
||||||
|
{
|
||||||
|
if (!IsJson)
|
||||||
|
throw new InvalidOperationException("Can't access json data on non-json message");
|
||||||
|
|
||||||
|
var value = GetPathNode(path);
|
||||||
|
if (value == null)
|
||||||
|
return default;
|
||||||
|
|
||||||
|
if (value.Type == JTokenType.Object || value.Type == JTokenType.Array)
|
||||||
|
return default;
|
||||||
|
|
||||||
|
return value!.Value<T>();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public List<T?>? GetValues<T>(MessagePath path)
|
||||||
|
{
|
||||||
|
if (!IsJson)
|
||||||
|
throw new InvalidOperationException("Can't access json data on non-json message");
|
||||||
|
|
||||||
|
var value = GetPathNode(path);
|
||||||
|
if (value == null)
|
||||||
|
return default;
|
||||||
|
|
||||||
|
if (value.Type == JTokenType.Object)
|
||||||
|
return default;
|
||||||
|
|
||||||
|
return value!.Values<T>().ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private JToken? GetPathNode(MessagePath path)
|
||||||
|
{
|
||||||
|
if (!IsJson)
|
||||||
|
throw new InvalidOperationException("Can't access json data on non-json message");
|
||||||
|
|
||||||
|
var currentToken = _token;
|
||||||
|
foreach (var node in path)
|
||||||
|
{
|
||||||
|
if (node.Type == 0)
|
||||||
|
{
|
||||||
|
// Int value
|
||||||
|
var val = node.Index!.Value;
|
||||||
|
if (currentToken!.Type != JTokenType.Array || ((JArray)currentToken).Count <= val)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
currentToken = currentToken[val];
|
||||||
|
}
|
||||||
|
else if (node.Type == 1)
|
||||||
|
{
|
||||||
|
// String value
|
||||||
|
if (currentToken!.Type != JTokenType.Object)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
currentToken = currentToken[node.Property!];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Property name
|
||||||
|
if (currentToken!.Type != JTokenType.Object)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
currentToken = (currentToken.First as JProperty)?.Name;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (currentToken == null)
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return currentToken;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public abstract string GetOriginalString();
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public abstract void Clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Json.Net stream message accessor
|
||||||
|
/// </summary>
|
||||||
|
public class JsonNetStreamMessageAccessor : JsonNetMessageAccessor, IStreamMessageAccessor
|
||||||
|
{
|
||||||
|
private Stream? _stream;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override bool OriginalDataAvailable => _stream?.CanSeek == true;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public async Task<bool> Read(Stream stream, bool bufferStream)
|
||||||
|
{
|
||||||
|
if (bufferStream && stream is not MemoryStream)
|
||||||
|
{
|
||||||
|
// We need to be buffer the stream, and it's not currently a seekable stream, so copy it to a new memory stream
|
||||||
|
_stream = new MemoryStream();
|
||||||
|
stream.CopyTo(_stream);
|
||||||
|
_stream.Position = 0;
|
||||||
|
}
|
||||||
|
else if (bufferStream)
|
||||||
|
{
|
||||||
|
// We need to buffer the stream, and the current stream is seekable, store as is
|
||||||
|
_stream = stream;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// We don't need to buffer the stream, so don't bother keeping the reference
|
||||||
|
}
|
||||||
|
|
||||||
|
var readStream = _stream ?? stream;
|
||||||
|
var length = readStream.CanSeek ? readStream.Length : 4096;
|
||||||
|
using var reader = new StreamReader(readStream, Encoding.UTF8, false, (int)Math.Max(2, length), true);
|
||||||
|
using var jsonTextReader = new JsonTextReader(reader);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_token = await JToken.LoadAsync(jsonTextReader).ConfigureAwait(false);
|
||||||
|
IsJson = true;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
// Not a json message
|
||||||
|
IsJson = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return IsJson;
|
||||||
|
}
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override string GetOriginalString()
|
||||||
|
{
|
||||||
|
if (_stream is null)
|
||||||
|
throw new NullReferenceException("Stream not initialized");
|
||||||
|
|
||||||
|
_stream.Position = 0;
|
||||||
|
using var textReader = new StreamReader(_stream, Encoding.UTF8, false, 1024, true);
|
||||||
|
return textReader.ReadToEnd();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override void Clear()
|
||||||
|
{
|
||||||
|
_stream?.Dispose();
|
||||||
|
_stream = null;
|
||||||
|
_token = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Json.Net byte message accessor
|
||||||
|
/// </summary>
|
||||||
|
public class JsonNetByteMessageAccessor : JsonNetMessageAccessor, IByteMessageAccessor
|
||||||
|
{
|
||||||
|
private ReadOnlyMemory<byte> _bytes;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public bool Read(ReadOnlyMemory<byte> data)
|
||||||
|
{
|
||||||
|
_bytes = data;
|
||||||
|
|
||||||
|
// Try getting the underlying byte[] instead of the ToArray to prevent creating a copy
|
||||||
|
using var stream = MemoryMarshal.TryGetArray(data, out var arraySegment)
|
||||||
|
? new MemoryStream(arraySegment.Array, arraySegment.Offset, arraySegment.Count)
|
||||||
|
: new MemoryStream(data.ToArray());
|
||||||
|
using var reader = new StreamReader(stream, Encoding.UTF8, false, Math.Max(2, data.Length), true);
|
||||||
|
using var jsonTextReader = new JsonTextReader(reader);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_token = JToken.Load(jsonTextReader);
|
||||||
|
IsJson = true;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
// Not a json message
|
||||||
|
IsJson = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return IsJson;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override string GetOriginalString() =>
|
||||||
|
// Netstandard 2.0 doesn't support GetString from a ReadonlySpan<byte>, so use ToArray there instead
|
||||||
|
#if NETSTANDARD2_0
|
||||||
|
Encoding.UTF8.GetString(_bytes.ToArray());
|
||||||
|
#else
|
||||||
|
Encoding.UTF8.GetString(_bytes.Span);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override bool OriginalDataAvailable => true;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override void Clear()
|
||||||
|
{
|
||||||
|
_bytes = null;
|
||||||
|
_token = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
using CryptoExchange.Net.Interfaces;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Converters.JsonNet
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public class JsonNetMessageSerializer : IMessageSerializer
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public string Serialize(object message) => JsonConvert.SerializeObject(message, Formatting.None);
|
||||||
|
}
|
||||||
|
}
|
||||||
35
CryptoExchange.Net/Converters/JsonNet/SerializerOptions.cs
Normal file
35
CryptoExchange.Net/Converters/JsonNet/SerializerOptions.cs
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
using Newtonsoft.Json;
|
||||||
|
using System.Globalization;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Converters.JsonNet
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Serializer options
|
||||||
|
/// </summary>
|
||||||
|
public static class SerializerOptions
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Json serializer settings which includes the EnumConverter, DateTimeConverter and BoolConverter
|
||||||
|
/// </summary>
|
||||||
|
public static JsonSerializerSettings WithConverters => new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
DateTimeZoneHandling = DateTimeZoneHandling.Utc,
|
||||||
|
Culture = CultureInfo.InvariantCulture,
|
||||||
|
Converters =
|
||||||
|
{
|
||||||
|
new EnumConverter(),
|
||||||
|
new DateTimeConverter(),
|
||||||
|
new BoolConverter()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Default json serializer settings
|
||||||
|
/// </summary>
|
||||||
|
public static JsonSerializerSettings Default => new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
DateTimeZoneHandling = DateTimeZoneHandling.Utc,
|
||||||
|
Culture = CultureInfo.InvariantCulture
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,31 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Concurrent;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Caching for JsonSerializerContext instances
|
|
||||||
/// </summary>
|
|
||||||
public static class JsonSerializerContextCache
|
|
||||||
{
|
|
||||||
private static ConcurrentDictionary<Type, JsonSerializerContext> _cache = new ConcurrentDictionary<Type, JsonSerializerContext>();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get the instance of the provided type T. It will be created if it doesn't exist yet.
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="T">Implementation type of the JsonSerializerContext</typeparam>
|
|
||||||
public static JsonSerializerContext GetOrCreate<T>() where T: JsonSerializerContext, new()
|
|
||||||
{
|
|
||||||
var contextType = typeof(T);
|
|
||||||
if (_cache.TryGetValue(contextType, out var context))
|
|
||||||
return context;
|
|
||||||
|
|
||||||
var instance = new T();
|
|
||||||
_cache[contextType] = instance;
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -3,7 +3,7 @@
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Node accessor
|
/// Node accessor
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public readonly struct NodeAccessor
|
public struct NodeAccessor
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Index
|
/// Index
|
||||||
|
|||||||
@ -6,9 +6,9 @@ namespace CryptoExchange.Net.Converters.MessageParsing
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Message access definition
|
/// Message access definition
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public readonly struct MessagePath : IEnumerable<NodeAccessor>
|
public struct MessagePath : IEnumerable<NodeAccessor>
|
||||||
{
|
{
|
||||||
private readonly List<NodeAccessor> _path;
|
private List<NodeAccessor> _path;
|
||||||
|
|
||||||
internal void Add(NodeAccessor node)
|
internal void Add(NodeAccessor node)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -7,9 +7,6 @@ using System.Text.Json.Serialization;
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using CryptoExchange.Net.Attributes;
|
using CryptoExchange.Net.Attributes;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Diagnostics;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
namespace CryptoExchange.Net.Converters.SystemTextJson
|
||||||
{
|
{
|
||||||
@ -17,139 +14,99 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
/// Converter for arrays to objects. Can deserialize data like [0.1, 0.2, "test"] to an object. Mapping is done by marking the class with [JsonConverter(typeof(ArrayConverter))] and the properties
|
/// Converter for arrays to objects. Can deserialize data like [0.1, 0.2, "test"] to an object. Mapping is done by marking the class with [JsonConverter(typeof(ArrayConverter))] and the properties
|
||||||
/// with [ArrayProperty(x)] where x is the index of the property in the array
|
/// with [ArrayProperty(x)] where x is the index of the property in the array
|
||||||
/// </summary>
|
/// </summary>
|
||||||
#if NET5_0_OR_GREATER
|
public class ArrayConverter : JsonConverterFactory
|
||||||
public class ArrayConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T> : JsonConverter<T> where T : new()
|
|
||||||
#else
|
|
||||||
public class ArrayConverter<T> : JsonConverter<T> where T : new()
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
private static readonly Lazy<List<ArrayPropertyInfo>> _typePropertyInfo = new Lazy<List<ArrayPropertyInfo>>(CacheTypeAttributes, LazyThreadSafetyMode.PublicationOnly);
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
#if NET5_0_OR_GREATER
|
public override bool CanConvert(Type typeToConvert) => true;
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
/// <inheritdoc />
|
||||||
#endif
|
public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
|
||||||
public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
|
|
||||||
{
|
{
|
||||||
if (value == null)
|
Type converterType = typeof(ArrayConverterInner<>).MakeGenericType(typeToConvert);
|
||||||
|
return (JsonConverter)Activator.CreateInstance(converterType);
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ArrayPropertyInfo
|
||||||
|
{
|
||||||
|
public PropertyInfo PropertyInfo { get; set; } = null!;
|
||||||
|
public ArrayPropertyAttribute ArrayProperty { get; set; } = null!;
|
||||||
|
public Type? JsonConverterType { get; set; }
|
||||||
|
public bool DefaultDeserialization { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ArrayConverterInner<T> : JsonConverter<T>
|
||||||
|
{
|
||||||
|
private static readonly ConcurrentDictionary<Type, List<ArrayPropertyInfo>> _typeAttributesCache = new ConcurrentDictionary<Type, List<ArrayPropertyInfo>>();
|
||||||
|
|
||||||
|
|
||||||
|
public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
|
||||||
{
|
{
|
||||||
writer.WriteNullValue();
|
// TODO
|
||||||
return;
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
writer.WriteStartArray();
|
/// <inheritdoc />
|
||||||
|
public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
||||||
var ordered = _typePropertyInfo.Value.Where(x => x.ArrayProperty != null).OrderBy(p => p.ArrayProperty.Index);
|
|
||||||
var last = -1;
|
|
||||||
foreach (var prop in ordered)
|
|
||||||
{
|
{
|
||||||
if (prop.ArrayProperty.Index == last)
|
if (reader.TokenType == JsonTokenType.Null)
|
||||||
continue;
|
return default;
|
||||||
|
|
||||||
while (prop.ArrayProperty.Index != last + 1)
|
var result = Activator.CreateInstance(typeToConvert);
|
||||||
|
return (T)ParseObject(ref reader, result, typeToConvert);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<ArrayPropertyInfo> CacheTypeAttributes(Type type)
|
||||||
|
{
|
||||||
|
var attributes = new List<ArrayPropertyInfo>();
|
||||||
|
var properties = type.GetProperties();
|
||||||
|
foreach (var property in properties)
|
||||||
{
|
{
|
||||||
writer.WriteNullValue();
|
var att = property.GetCustomAttribute<ArrayPropertyAttribute>();
|
||||||
last += 1;
|
if (att == null)
|
||||||
}
|
continue;
|
||||||
|
|
||||||
last = prop.ArrayProperty.Index;
|
attributes.Add(new ArrayPropertyInfo
|
||||||
|
|
||||||
var objValue = prop.PropertyInfo.GetValue(value);
|
|
||||||
if (objValue == null)
|
|
||||||
{
|
|
||||||
writer.WriteNullValue();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonSerializerOptions? typeOptions = null;
|
|
||||||
if (prop.JsonConverter != null)
|
|
||||||
{
|
|
||||||
typeOptions = new JsonSerializerOptions
|
|
||||||
{
|
{
|
||||||
NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.AllowNamedFloatingPointLiterals,
|
ArrayProperty = att,
|
||||||
PropertyNameCaseInsensitive = false,
|
PropertyInfo = property,
|
||||||
TypeInfoResolver = options.TypeInfoResolver,
|
DefaultDeserialization = property.GetCustomAttribute<JsonConversionAttribute>() != null,
|
||||||
};
|
JsonConverterType = property.GetCustomAttribute<JsonConverterAttribute>()?.ConverterType
|
||||||
typeOptions.Converters.Add(prop.JsonConverter);
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prop.JsonConverter == null && IsSimple(prop.PropertyInfo.PropertyType))
|
_typeAttributesCache.TryAdd(type, attributes);
|
||||||
{
|
return attributes;
|
||||||
if (prop.TargetType == typeof(string))
|
|
||||||
writer.WriteStringValue(Convert.ToString(objValue, CultureInfo.InvariantCulture));
|
|
||||||
else if (prop.TargetType == typeof(bool))
|
|
||||||
writer.WriteBooleanValue((bool)objValue);
|
|
||||||
else
|
|
||||||
writer.WriteRawValue(Convert.ToString(objValue, CultureInfo.InvariantCulture)!);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
JsonSerializer.Serialize(writer, objValue, typeOptions ?? options);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
writer.WriteEndArray();
|
private static object ParseObject(ref Utf8JsonReader reader, object result, Type objectType)
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
if (reader.TokenType == JsonTokenType.Null)
|
|
||||||
return default;
|
|
||||||
|
|
||||||
var result = new T();
|
|
||||||
return ParseObject(ref reader, result, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
private static T ParseObject(ref Utf8JsonReader reader, T result, JsonSerializerOptions options)
|
|
||||||
#else
|
|
||||||
private static T ParseObject(ref Utf8JsonReader reader, T result, JsonSerializerOptions options)
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
if (reader.TokenType != JsonTokenType.StartArray)
|
|
||||||
throw new Exception("Not an array");
|
|
||||||
|
|
||||||
int index = 0;
|
|
||||||
while (reader.Read())
|
|
||||||
{
|
{
|
||||||
if (reader.TokenType == JsonTokenType.EndArray)
|
if (reader.TokenType != JsonTokenType.StartArray)
|
||||||
break;
|
throw new Exception("1");
|
||||||
|
|
||||||
var indexAttributes = _typePropertyInfo.Value.Where(a => a.ArrayProperty.Index == index);
|
if (!_typeAttributesCache.TryGetValue(objectType, out var attributes))
|
||||||
if (!indexAttributes.Any())
|
attributes = CacheTypeAttributes(objectType);
|
||||||
{
|
|
||||||
index++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var attribute in indexAttributes)
|
int index = 0;
|
||||||
|
while (reader.Read())
|
||||||
{
|
{
|
||||||
var targetType = attribute.TargetType;
|
if (reader.TokenType == JsonTokenType.EndArray)
|
||||||
|
break;
|
||||||
|
|
||||||
|
var attribute = attributes.SingleOrDefault(a => a.ArrayProperty.Index == index);
|
||||||
|
var targetType = attribute.PropertyInfo.PropertyType;
|
||||||
|
|
||||||
object? value = null;
|
object? value = null;
|
||||||
if (attribute.JsonConverter != null)
|
if (attribute.JsonConverterType != null)
|
||||||
{
|
{
|
||||||
if (attribute.JsonSerializerOptions == null)
|
// Has JsonConverter attribute
|
||||||
{
|
var options = new JsonSerializerOptions();
|
||||||
attribute.JsonSerializerOptions = new JsonSerializerOptions
|
options.Converters.Add((JsonConverter)Activator.CreateInstance(attribute.JsonConverterType));
|
||||||
{
|
value = JsonDocument.ParseValue(ref reader).Deserialize(targetType, options);
|
||||||
NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.AllowNamedFloatingPointLiterals,
|
|
||||||
PropertyNameCaseInsensitive = false,
|
|
||||||
Converters = { attribute.JsonConverter },
|
|
||||||
TypeInfoResolver = options.TypeInfoResolver,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
var doc = JsonDocument.ParseValue(ref reader);
|
|
||||||
value = doc.Deserialize(attribute.PropertyInfo.PropertyType, attribute.JsonSerializerOptions);
|
|
||||||
}
|
}
|
||||||
else if (attribute.DefaultDeserialization)
|
else if (attribute.DefaultDeserialization)
|
||||||
{
|
{
|
||||||
value = JsonDocument.ParseValue(ref reader).Deserialize(options.GetTypeInfo(attribute.PropertyInfo.PropertyType));
|
// Use default deserialization
|
||||||
|
value = JsonDocument.ParseValue(ref reader).Deserialize(targetType);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -160,75 +117,17 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
JsonTokenType.True => true,
|
JsonTokenType.True => true,
|
||||||
JsonTokenType.String => reader.GetString(),
|
JsonTokenType.String => reader.GetString(),
|
||||||
JsonTokenType.Number => reader.GetDecimal(),
|
JsonTokenType.Number => reader.GetDecimal(),
|
||||||
JsonTokenType.StartObject => JsonSerializer.Deserialize(ref reader, attribute.TargetType, options),
|
|
||||||
_ => throw new NotImplementedException($"Array deserialization of type {reader.TokenType} not supported"),
|
_ => throw new NotImplementedException($"Array deserialization of type {reader.TokenType} not supported"),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (targetType.IsAssignableFrom(value?.GetType()))
|
attribute.PropertyInfo.SetValue(result, value == null ? null : Convert.ChangeType(value, attribute.PropertyInfo.PropertyType, CultureInfo.InvariantCulture));
|
||||||
attribute.PropertyInfo.SetValue(result, value);
|
|
||||||
else
|
index++;
|
||||||
attribute.PropertyInfo.SetValue(result, value == null ? null : Convert.ChangeType(value, targetType, CultureInfo.InvariantCulture));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
index++;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static bool IsSimple(Type type)
|
|
||||||
{
|
|
||||||
if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
|
|
||||||
{
|
|
||||||
// nullable type, check if the nested type is simple.
|
|
||||||
return IsSimple(type.GetGenericArguments()[0]);
|
|
||||||
}
|
|
||||||
return type.IsPrimitive
|
|
||||||
|| type.IsEnum
|
|
||||||
|| type == typeof(string)
|
|
||||||
|| type == typeof(decimal);
|
|
||||||
}
|
|
||||||
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
private static List<ArrayPropertyInfo> CacheTypeAttributes()
|
|
||||||
#else
|
|
||||||
private static List<ArrayPropertyInfo> CacheTypeAttributes()
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
var attributes = new List<ArrayPropertyInfo>();
|
|
||||||
var properties = typeof(T).GetProperties();
|
|
||||||
foreach (var property in properties)
|
|
||||||
{
|
|
||||||
var att = property.GetCustomAttribute<ArrayPropertyAttribute>();
|
|
||||||
if (att == null)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
var targetType = Nullable.GetUnderlyingType(property.PropertyType) ?? property.PropertyType;
|
|
||||||
var converterType = property.GetCustomAttribute<JsonConverterAttribute>()?.ConverterType ?? targetType.GetCustomAttribute<JsonConverterAttribute>()?.ConverterType;
|
|
||||||
attributes.Add(new ArrayPropertyInfo
|
|
||||||
{
|
|
||||||
ArrayProperty = att,
|
|
||||||
PropertyInfo = property,
|
|
||||||
DefaultDeserialization = property.GetCustomAttribute<CryptoExchange.Net.Attributes.JsonConversionAttribute>() != null,
|
|
||||||
JsonConverter = converterType == null ? null : (JsonConverter)Activator.CreateInstance(converterType)!,
|
|
||||||
TargetType = targetType
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return attributes;
|
|
||||||
}
|
|
||||||
|
|
||||||
private class ArrayPropertyInfo
|
|
||||||
{
|
|
||||||
public PropertyInfo PropertyInfo { get; set; } = null!;
|
|
||||||
public ArrayPropertyAttribute ArrayProperty { get; set; } = null!;
|
|
||||||
public JsonConverter? JsonConverter { get; set; }
|
|
||||||
public bool DefaultDeserialization { get; set; }
|
|
||||||
public Type TargetType { get; set; } = null!;
|
|
||||||
public JsonSerializerOptions? JsonSerializerOptions { get; set; } = null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,46 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Globalization;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Decimal converter that handles overflowing decimal values (by setting it to decimal.MaxValue)
|
|
||||||
/// </summary>
|
|
||||||
public class BigDecimalConverter : JsonConverter<decimal>
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override decimal Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
if (reader.TokenType == JsonTokenType.String)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return decimal.Parse(reader.GetString()!, NumberStyles.Float, CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
catch(OverflowException)
|
|
||||||
{
|
|
||||||
// Value doesn't fit decimal, default to max value
|
|
||||||
return decimal.MaxValue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return reader.GetDecimal();
|
|
||||||
}
|
|
||||||
catch(FormatException)
|
|
||||||
{
|
|
||||||
// Format issue, assume value is too large
|
|
||||||
return decimal.MaxValue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void Write(Utf8JsonWriter writer, decimal value, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
writer.WriteNumberValue(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -20,14 +20,15 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
|
public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
|
||||||
{
|
{
|
||||||
return typeToConvert == typeof(bool) ? new BoolConverterInner<bool>() : new BoolConverterInner<bool?>();
|
Type converterType = typeof(BoolConverterInner<>).MakeGenericType(typeToConvert);
|
||||||
|
return (JsonConverter)Activator.CreateInstance(converterType);
|
||||||
}
|
}
|
||||||
|
|
||||||
private class BoolConverterInner<T> : JsonConverter<T>
|
private class BoolConverterInner<T> : JsonConverter<T>
|
||||||
{
|
{
|
||||||
public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
||||||
=> (T)((object?)ReadBool(ref reader, typeToConvert, options) ?? default(T))!;
|
=> (T)((object?)ReadBool(ref reader, typeToConvert, options) ?? default(T))!;
|
||||||
|
|
||||||
public bool? ReadBool(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
public bool? ReadBool(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
||||||
{
|
{
|
||||||
if (reader.TokenType == JsonTokenType.True)
|
if (reader.TokenType == JsonTokenType.True)
|
||||||
@ -73,10 +74,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
|
|
||||||
public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
|
public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
|
||||||
{
|
{
|
||||||
if (value is bool boolVal)
|
writer.WriteNullValue();
|
||||||
writer.WriteBooleanValue(boolVal);
|
|
||||||
else
|
|
||||||
writer.WriteNullValue();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,37 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Converter for comma separated enum values
|
|
||||||
/// </summary>
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
public class CommaSplitEnumConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicFields)] T> : JsonConverter<T[]> where T : struct, Enum
|
|
||||||
#else
|
|
||||||
public class CommaSplitEnumConverter<T> : JsonConverter<T[]> where T : struct, Enum
|
|
||||||
#endif
|
|
||||||
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override T[]? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
var str = reader.GetString();
|
|
||||||
if (string.IsNullOrEmpty(str))
|
|
||||||
return [];
|
|
||||||
|
|
||||||
return str!.Split(',').Select(x => (T)EnumConverter.ParseString<T>(x)!).ToArray() ?? [];
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void Write(Utf8JsonWriter writer, T[] value, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
writer.WriteStringValue(string.Join(",", value.Select(x => EnumConverter.GetString(x))));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -26,7 +26,8 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
|
public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
|
||||||
{
|
{
|
||||||
return typeToConvert == typeof(DateTime) ? new DateTimeConverterInner<DateTime>() : new DateTimeConverterInner<DateTime?>();
|
Type converterType = typeof(DateTimeConverterInner<>).MakeGenericType(typeToConvert);
|
||||||
|
return (JsonConverter)Activator.CreateInstance(converterType);
|
||||||
}
|
}
|
||||||
|
|
||||||
private class DateTimeConverterInner<T> : JsonConverter<T>
|
private class DateTimeConverterInner<T> : JsonConverter<T>
|
||||||
@ -46,23 +47,82 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
if (reader.TokenType is JsonTokenType.Number)
|
if (reader.TokenType is JsonTokenType.Number)
|
||||||
{
|
{
|
||||||
var longValue = reader.GetDouble();
|
var longValue = reader.GetDouble();
|
||||||
if (longValue == 0 || longValue < 0)
|
if (longValue == 0 || longValue == -1)
|
||||||
return default;
|
return default;
|
||||||
|
if (longValue < 19999999999)
|
||||||
|
return ConvertFromSeconds(longValue);
|
||||||
|
if (longValue < 19999999999999)
|
||||||
|
return ConvertFromMilliseconds(longValue);
|
||||||
|
if (longValue < 19999999999999999)
|
||||||
|
return ConvertFromMicroseconds(longValue);
|
||||||
|
|
||||||
return ParseFromDouble(longValue);
|
return ConvertFromNanoseconds(longValue);
|
||||||
}
|
}
|
||||||
else if (reader.TokenType is JsonTokenType.String)
|
else if (reader.TokenType is JsonTokenType.String)
|
||||||
{
|
{
|
||||||
var stringValue = reader.GetString();
|
var stringValue = reader.GetString();
|
||||||
if (string.IsNullOrWhiteSpace(stringValue)
|
if (string.IsNullOrWhiteSpace(stringValue)
|
||||||
|| stringValue == "-1"
|
|| stringValue == "-1"
|
||||||
|| stringValue == "0001-01-01T00:00:00Z"
|
|
||||||
|| double.TryParse(stringValue, out var doubleVal) && doubleVal == 0)
|
|| double.TryParse(stringValue, out var doubleVal) && doubleVal == 0)
|
||||||
{
|
{
|
||||||
return default;
|
return default;
|
||||||
}
|
}
|
||||||
|
|
||||||
return ParseFromString(stringValue!);
|
if (stringValue!.Length == 8)
|
||||||
|
{
|
||||||
|
// Parse 20211103 format
|
||||||
|
if (!int.TryParse(stringValue.Substring(0, 4), out var year)
|
||||||
|
|| !int.TryParse(stringValue.Substring(4, 2), out var month)
|
||||||
|
|| !int.TryParse(stringValue.Substring(6, 2), out var day))
|
||||||
|
{
|
||||||
|
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
|
||||||
|
return default;
|
||||||
|
}
|
||||||
|
return new DateTime(year, month, day, 0, 0, 0, DateTimeKind.Utc);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stringValue.Length == 6)
|
||||||
|
{
|
||||||
|
// Parse 211103 format
|
||||||
|
if (!int.TryParse(stringValue.Substring(0, 2), out var year)
|
||||||
|
|| !int.TryParse(stringValue.Substring(2, 2), out var month)
|
||||||
|
|| !int.TryParse(stringValue.Substring(4, 2), out var day))
|
||||||
|
{
|
||||||
|
Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
|
||||||
|
return default;
|
||||||
|
}
|
||||||
|
return new DateTime(year + 2000, month, day, 0, 0, 0, DateTimeKind.Utc);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (double.TryParse(stringValue, NumberStyles.Float, CultureInfo.InvariantCulture, out var doubleValue))
|
||||||
|
{
|
||||||
|
// Parse 1637745563.000 format
|
||||||
|
if (doubleValue < 19999999999)
|
||||||
|
return ConvertFromSeconds(doubleValue);
|
||||||
|
if (doubleValue < 19999999999999)
|
||||||
|
return ConvertFromMilliseconds((long)doubleValue);
|
||||||
|
if (doubleValue < 19999999999999999)
|
||||||
|
return ConvertFromMicroseconds((long)doubleValue);
|
||||||
|
|
||||||
|
return ConvertFromNanoseconds((long)doubleValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stringValue.Length == 10)
|
||||||
|
{
|
||||||
|
// Parse 2021-11-03 format
|
||||||
|
var values = stringValue.Split('-');
|
||||||
|
if (!int.TryParse(values[0], out var year)
|
||||||
|
|| !int.TryParse(values[1], out var month)
|
||||||
|
|| !int.TryParse(values[2], out var day))
|
||||||
|
{
|
||||||
|
Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
|
||||||
|
return default;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new DateTime(year, month, day, 0, 0, 0, DateTimeKind.Utc);
|
||||||
|
}
|
||||||
|
|
||||||
|
return DateTime.Parse(stringValue, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -73,9 +133,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
|
public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
|
||||||
{
|
{
|
||||||
if (value == null)
|
if (value == null)
|
||||||
{
|
|
||||||
writer.WriteNullValue();
|
writer.WriteNullValue();
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var dtValue = (DateTime)(object)value;
|
var dtValue = (DateTime)(object)value;
|
||||||
@ -87,104 +145,6 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Parse a long value to datetime
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="longValue"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static DateTime ParseFromDouble(double longValue)
|
|
||||||
{
|
|
||||||
if (longValue < 19999999999)
|
|
||||||
return ConvertFromSeconds(longValue);
|
|
||||||
if (longValue < 19999999999999)
|
|
||||||
return ConvertFromMilliseconds(longValue);
|
|
||||||
if (longValue < 19999999999999999)
|
|
||||||
return ConvertFromMicroseconds(longValue);
|
|
||||||
|
|
||||||
return ConvertFromNanoseconds(longValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Parse a string value to datetime
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="stringValue"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static DateTime ParseFromString(string stringValue)
|
|
||||||
{
|
|
||||||
if (stringValue!.Length == 12 && stringValue.StartsWith("202"))
|
|
||||||
{
|
|
||||||
// Parse 202303261200 format
|
|
||||||
if (!int.TryParse(stringValue.Substring(0, 4), out var year)
|
|
||||||
|| !int.TryParse(stringValue.Substring(4, 2), out var month)
|
|
||||||
|| !int.TryParse(stringValue.Substring(6, 2), out var day)
|
|
||||||
|| !int.TryParse(stringValue.Substring(8, 2), out var hour)
|
|
||||||
|| !int.TryParse(stringValue.Substring(10, 2), out var minute))
|
|
||||||
{
|
|
||||||
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
|
|
||||||
return default;
|
|
||||||
}
|
|
||||||
return new DateTime(year, month, day, hour, minute, 0, DateTimeKind.Utc);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (stringValue.Length == 8)
|
|
||||||
{
|
|
||||||
// Parse 20211103 format
|
|
||||||
if (!int.TryParse(stringValue.Substring(0, 4), out var year)
|
|
||||||
|| !int.TryParse(stringValue.Substring(4, 2), out var month)
|
|
||||||
|| !int.TryParse(stringValue.Substring(6, 2), out var day))
|
|
||||||
{
|
|
||||||
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
|
|
||||||
return default;
|
|
||||||
}
|
|
||||||
return new DateTime(year, month, day, 0, 0, 0, DateTimeKind.Utc);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (stringValue.Length == 6)
|
|
||||||
{
|
|
||||||
// Parse 211103 format
|
|
||||||
if (!int.TryParse(stringValue.Substring(0, 2), out var year)
|
|
||||||
|| !int.TryParse(stringValue.Substring(2, 2), out var month)
|
|
||||||
|| !int.TryParse(stringValue.Substring(4, 2), out var day))
|
|
||||||
{
|
|
||||||
Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
|
|
||||||
return default;
|
|
||||||
}
|
|
||||||
return new DateTime(year + 2000, month, day, 0, 0, 0, DateTimeKind.Utc);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (double.TryParse(stringValue, NumberStyles.Float, CultureInfo.InvariantCulture, out var doubleValue))
|
|
||||||
{
|
|
||||||
// Parse 1637745563.000 format
|
|
||||||
if (doubleValue <= 0)
|
|
||||||
return default;
|
|
||||||
if (doubleValue < 19999999999)
|
|
||||||
return ConvertFromSeconds(doubleValue);
|
|
||||||
if (doubleValue < 19999999999999)
|
|
||||||
return ConvertFromMilliseconds((long)doubleValue);
|
|
||||||
if (doubleValue < 19999999999999999)
|
|
||||||
return ConvertFromMicroseconds((long)doubleValue);
|
|
||||||
|
|
||||||
return ConvertFromNanoseconds((long)doubleValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (stringValue.Length == 10)
|
|
||||||
{
|
|
||||||
// Parse 2021-11-03 format
|
|
||||||
var values = stringValue.Split('-');
|
|
||||||
if (!int.TryParse(values[0], out var year)
|
|
||||||
|| !int.TryParse(values[1], out var month)
|
|
||||||
|| !int.TryParse(values[2], out var day))
|
|
||||||
{
|
|
||||||
Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
|
|
||||||
return default;
|
|
||||||
}
|
|
||||||
|
|
||||||
return new DateTime(year, month, day, 0, 0, 0, DateTimeKind.Utc);
|
|
||||||
}
|
|
||||||
|
|
||||||
return DateTime.Parse(stringValue, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Convert a seconds since epoch (01-01-1970) value to DateTime
|
/// Convert a seconds since epoch (01-01-1970) value to DateTime
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -19,18 +19,13 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
if (reader.TokenType == JsonTokenType.String)
|
if (reader.TokenType == JsonTokenType.String)
|
||||||
{
|
{
|
||||||
var value = reader.GetString();
|
var value = reader.GetString();
|
||||||
return ExchangeHelpers.ParseDecimal(value);
|
if (string.IsNullOrEmpty(value))
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return decimal.Parse(value, NumberStyles.Float, CultureInfo.InvariantCulture);
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
return reader.GetDecimal();
|
||||||
{
|
|
||||||
return reader.GetDecimal();
|
|
||||||
}
|
|
||||||
catch(FormatException)
|
|
||||||
{
|
|
||||||
// Format issue, assume value is too large
|
|
||||||
return decimal.MaxValue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
|
|||||||
@ -11,78 +11,127 @@ using System.Text.Json.Serialization;
|
|||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
namespace CryptoExchange.Net.Converters.SystemTextJson
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Static EnumConverter methods
|
|
||||||
/// </summary>
|
|
||||||
public static class EnumConverter
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Get the enum value from a string
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="value">String value</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
public static T? ParseString<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicFields)] T>(string value) where T : struct, Enum
|
|
||||||
#else
|
|
||||||
public static T? ParseString<T>(string value) where T : struct, Enum
|
|
||||||
#endif
|
|
||||||
=> EnumConverter<T>.ParseString(value);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="enumValue"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
public static string GetString<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicFields)] T>(T enumValue) where T : struct, Enum
|
|
||||||
#else
|
|
||||||
public static string GetString<T>(T enumValue) where T : struct, Enum
|
|
||||||
#endif
|
|
||||||
=> EnumConverter<T>.GetString(enumValue);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="enumValue"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
[return: NotNullIfNotNull("enumValue")]
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
public static string? GetString<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicFields)] T>(T? enumValue) where T : struct, Enum
|
|
||||||
#else
|
|
||||||
public static string? GetString<T>(T? enumValue) where T : struct, Enum
|
|
||||||
#endif
|
|
||||||
=> EnumConverter<T>.GetString(enumValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Converter for enum values. Enums entries should be noted with a MapAttribute to map the enum value to a string value
|
/// Converter for enum values. Enums entries should be noted with a MapAttribute to map the enum value to a string value
|
||||||
/// </summary>
|
/// </summary>
|
||||||
#if NET5_0_OR_GREATER
|
public class EnumConverter : JsonConverterFactory
|
||||||
public class EnumConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicFields)] T>
|
|
||||||
#else
|
|
||||||
public class EnumConverter<T>
|
|
||||||
#endif
|
|
||||||
: JsonConverter<T>, INullableConverterFactory where T : struct, Enum
|
|
||||||
{
|
{
|
||||||
private static List<KeyValuePair<T, string>>? _mapping = null;
|
private bool _warnOnMissingEntry = true;
|
||||||
private NullableEnumConverter? _nullableEnumConverter = null;
|
private bool _writeAsInt;
|
||||||
|
private static readonly ConcurrentDictionary<Type, List<KeyValuePair<object, string>>> _mapping = new();
|
||||||
|
|
||||||
private static ConcurrentBag<string> _unknownValuesWarned = new ConcurrentBag<string>();
|
/// <summary>
|
||||||
|
/// </summary>
|
||||||
|
public EnumConverter() { }
|
||||||
|
|
||||||
internal class NullableEnumConverter : JsonConverter<T?>
|
/// <summary>
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="writeAsInt"></param>
|
||||||
|
/// <param name="warnOnMissingEntry"></param>
|
||||||
|
public EnumConverter(bool writeAsInt, bool warnOnMissingEntry)
|
||||||
{
|
{
|
||||||
private readonly EnumConverter<T> _enumConverter;
|
_writeAsInt = writeAsInt;
|
||||||
|
_warnOnMissingEntry = warnOnMissingEntry;
|
||||||
|
}
|
||||||
|
|
||||||
public NullableEnumConverter(EnumConverter<T> enumConverter)
|
/// <inheritdoc />
|
||||||
|
public override bool CanConvert(Type typeToConvert)
|
||||||
|
{
|
||||||
|
return typeToConvert.IsEnum || Nullable.GetUnderlyingType(typeToConvert)?.IsEnum == true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
|
||||||
|
{
|
||||||
|
JsonConverter converter = (JsonConverter)Activator.CreateInstance(
|
||||||
|
typeof(EnumConverterInner<>).MakeGenericType(
|
||||||
|
new Type[] { typeToConvert }),
|
||||||
|
BindingFlags.Instance | BindingFlags.Public,
|
||||||
|
binder: null,
|
||||||
|
args: new object[] { _writeAsInt, _warnOnMissingEntry },
|
||||||
|
culture: null)!;
|
||||||
|
|
||||||
|
return converter;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<KeyValuePair<object, string>> AddMapping(Type objectType)
|
||||||
|
{
|
||||||
|
var mapping = new List<KeyValuePair<object, string>>();
|
||||||
|
var enumMembers = objectType.GetMembers();
|
||||||
|
foreach (var member in enumMembers)
|
||||||
{
|
{
|
||||||
_enumConverter = enumConverter;
|
var maps = member.GetCustomAttributes(typeof(MapAttribute), false);
|
||||||
|
foreach (MapAttribute attribute in maps)
|
||||||
|
{
|
||||||
|
foreach (var value in attribute.Values)
|
||||||
|
mapping.Add(new KeyValuePair<object, string>(Enum.Parse(objectType, member.Name), value));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
_mapping.TryAdd(objectType, mapping);
|
||||||
|
return mapping;
|
||||||
|
}
|
||||||
|
|
||||||
|
private class EnumConverterInner<T> : JsonConverter<T>
|
||||||
|
{
|
||||||
|
private bool _warnOnMissingEntry = true;
|
||||||
|
private bool _writeAsInt;
|
||||||
|
|
||||||
|
public EnumConverterInner(bool writeAsInt, bool warnOnMissingEntry)
|
||||||
|
{
|
||||||
|
_warnOnMissingEntry = warnOnMissingEntry;
|
||||||
|
_writeAsInt = writeAsInt;
|
||||||
|
}
|
||||||
|
|
||||||
public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
||||||
{
|
{
|
||||||
return _enumConverter.ReadNullable(ref reader, typeToConvert, options, out var isEmptyString, out var warn);
|
var enumType = Nullable.GetUnderlyingType(typeToConvert) ?? typeToConvert;
|
||||||
|
if (!_mapping.TryGetValue(enumType, out var mapping))
|
||||||
|
mapping = AddMapping(enumType);
|
||||||
|
|
||||||
|
var stringValue = reader.TokenType switch
|
||||||
|
{
|
||||||
|
JsonTokenType.String => reader.GetString(),
|
||||||
|
JsonTokenType.Number => reader.GetInt16().ToString(),
|
||||||
|
JsonTokenType.True => reader.GetBoolean().ToString(),
|
||||||
|
JsonTokenType.False => reader.GetBoolean().ToString(),
|
||||||
|
JsonTokenType.Null => null,
|
||||||
|
_ => throw new Exception("Invalid token type for enum deserialization: " + reader.TokenType)
|
||||||
|
};
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(stringValue))
|
||||||
|
{
|
||||||
|
// Received null value
|
||||||
|
var emptyResult = GetDefaultValue(typeToConvert, enumType);
|
||||||
|
if (emptyResult != null)
|
||||||
|
// If the property we're parsing to isn't nullable there isn't a correct way to return this as null will either throw an exception (.net framework) or the default enum value (dotnet core).
|
||||||
|
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received null enum value, but property type is not a nullable enum. EnumType: {enumType.Name}. If you think {enumType.Name} should be nullable please open an issue on the Github repo");
|
||||||
|
|
||||||
|
return (T?)emptyResult;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!GetValue(enumType, mapping, stringValue!, out var result))
|
||||||
|
{
|
||||||
|
var defaultValue = GetDefaultValue(typeToConvert, enumType);
|
||||||
|
if (string.IsNullOrWhiteSpace(stringValue))
|
||||||
|
{
|
||||||
|
if (defaultValue != null)
|
||||||
|
// We received an empty string and have no mapping for it, and the property isn't nullable
|
||||||
|
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received empty string as enum value, but property type is not a nullable enum. EnumType: {enumType.Name}. If you think {enumType.Name} should be nullable please open an issue on the Github repo");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// We received an enum value but weren't able to parse it.
|
||||||
|
if (_warnOnMissingEntry)
|
||||||
|
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Cannot map enum value. EnumType: {enumType.Name}, Value: {stringValue}, Known values: {string.Join(", ", mapping.Select(m => m.Value))}. If you think {stringValue} should added please open an issue on the Github repo");
|
||||||
|
}
|
||||||
|
|
||||||
|
return (T?)defaultValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (T?)result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options)
|
public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
|
||||||
{
|
{
|
||||||
if (value == null)
|
if (value == null)
|
||||||
{
|
{
|
||||||
@ -90,200 +139,77 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_enumConverter.Write(writer, value.Value, options);
|
if (!_writeAsInt)
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
var t = ReadNullable(ref reader, typeToConvert, options, out var isEmptyString, out var warn);
|
|
||||||
if (t == null)
|
|
||||||
{
|
|
||||||
if (warn)
|
|
||||||
{
|
|
||||||
if (isEmptyString)
|
|
||||||
{
|
{
|
||||||
// We received an empty string and have no mapping for it, and the property isn't nullable
|
var stringValue = GetString(value.GetType(), value);
|
||||||
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received empty string as enum value, but property type is not a nullable enum. EnumType: {typeof(T).Name}. If you think {typeof(T).Name} should be nullable please open an issue on the Github repo");
|
writer.WriteStringValue(stringValue);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received null enum value, but property type is not a nullable enum. EnumType: {typeof(T).Name}. If you think {typeof(T).Name} should be nullable please open an issue on the Github repo");
|
writer.WriteNumberValue((int)Convert.ChangeType(value, typeof(int)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return new T(); // return default value
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return t.Value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private T? ReadNullable(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options, out bool isEmptyString, out bool warn)
|
|
||||||
{
|
|
||||||
isEmptyString = false;
|
|
||||||
warn = false;
|
|
||||||
var enumType = typeof(T);
|
|
||||||
if (_mapping == null)
|
|
||||||
_mapping = AddMapping();
|
|
||||||
|
|
||||||
var stringValue = reader.TokenType switch
|
|
||||||
{
|
|
||||||
JsonTokenType.String => reader.GetString(),
|
|
||||||
JsonTokenType.Number => reader.GetInt32().ToString(),
|
|
||||||
JsonTokenType.True => reader.GetBoolean().ToString(),
|
|
||||||
JsonTokenType.False => reader.GetBoolean().ToString(),
|
|
||||||
JsonTokenType.Null => null,
|
|
||||||
_ => throw new Exception("Invalid token type for enum deserialization: " + reader.TokenType)
|
|
||||||
};
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(stringValue))
|
|
||||||
return null;
|
|
||||||
|
|
||||||
if (!GetValue(enumType, stringValue!, out var result))
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(stringValue))
|
|
||||||
{
|
|
||||||
isEmptyString = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// We received an enum value but weren't able to parse it.
|
|
||||||
if (!_unknownValuesWarned.Contains(stringValue))
|
|
||||||
{
|
|
||||||
warn = true;
|
|
||||||
_unknownValuesWarned.Add(stringValue!);
|
|
||||||
Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Cannot map enum value. EnumType: {enumType.Name}, Value: {stringValue}, Known values: {string.Join(", ", _mapping.Select(m => m.Value))}. If you think {stringValue} should added please open an issue on the Github repo");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
private static object? GetDefaultValue(Type objectType, Type enumType)
|
||||||
}
|
{
|
||||||
|
if (Nullable.GetUnderlyingType(objectType) != null)
|
||||||
|
return null;
|
||||||
|
|
||||||
/// <inheritdoc />
|
return Activator.CreateInstance(enumType); // return default value
|
||||||
public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
|
}
|
||||||
{
|
|
||||||
var stringValue = GetString(value);
|
|
||||||
writer.WriteStringValue(stringValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static bool GetValue(Type objectType, string value, out T? result)
|
private static bool GetValue(Type objectType, List<KeyValuePair<object, string>> enumMapping, string value, out object? result)
|
||||||
{
|
|
||||||
if (_mapping != null)
|
|
||||||
{
|
{
|
||||||
// Check for exact match first, then if not found fallback to a case insensitive match
|
// Check for exact match first, then if not found fallback to a case insensitive match
|
||||||
var mapping = _mapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCulture));
|
var mapping = enumMapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCulture));
|
||||||
if (mapping.Equals(default(KeyValuePair<T, string>)))
|
if (mapping.Equals(default(KeyValuePair<object, string>)))
|
||||||
mapping = _mapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCultureIgnoreCase));
|
mapping = enumMapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCultureIgnoreCase));
|
||||||
|
|
||||||
if (!mapping.Equals(default(KeyValuePair<T, string>)))
|
if (!mapping.Equals(default(KeyValuePair<object, string>)))
|
||||||
{
|
{
|
||||||
result = mapping.Key;
|
result = mapping.Key;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (objectType.IsDefined(typeof(FlagsAttribute)))
|
try
|
||||||
{
|
|
||||||
var intValue = int.Parse(value);
|
|
||||||
result = (T)Enum.ToObject(objectType, intValue);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_unknownValuesWarned.Contains(value))
|
|
||||||
{
|
|
||||||
// Check if it is an known unknown value
|
|
||||||
// Done here to prevent lookup overhead for normal conversions, but prevent expensive exception throwing
|
|
||||||
result = default;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// If no explicit mapping is found try to parse string
|
|
||||||
result = (T)Enum.Parse(objectType, value, true);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
catch (Exception)
|
|
||||||
{
|
|
||||||
result = default;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static List<KeyValuePair<T, string>> AddMapping()
|
|
||||||
{
|
|
||||||
var mapping = new List<KeyValuePair<T, string>>();
|
|
||||||
var enumType = Nullable.GetUnderlyingType(typeof(T)) ?? typeof(T);
|
|
||||||
var enumMembers = enumType.GetFields();
|
|
||||||
foreach (var member in enumMembers)
|
|
||||||
{
|
|
||||||
var maps = member.GetCustomAttributes(typeof(MapAttribute), false);
|
|
||||||
foreach (MapAttribute attribute in maps)
|
|
||||||
{
|
{
|
||||||
foreach (var value in attribute.Values)
|
// If no explicit mapping is found try to parse string
|
||||||
mapping.Add(new KeyValuePair<T, string>((T)Enum.Parse(enumType, member.Name), value));
|
result = Enum.Parse(objectType, value, true);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
result = default;
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_mapping = mapping;
|
|
||||||
return mapping;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
|
/// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
/// <param name="enumValue"></param>
|
/// <param name="enumValue"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[return: NotNullIfNotNull("enumValue")]
|
[return: NotNullIfNotNull("enumValue")]
|
||||||
public static string? GetString(T? enumValue)
|
public static string? GetString<T>(T enumValue) => GetString(typeof(T), enumValue);
|
||||||
{
|
|
||||||
if (_mapping == null)
|
|
||||||
_mapping = AddMapping();
|
|
||||||
|
|
||||||
return enumValue == null ? null : (_mapping.FirstOrDefault(v => v.Key.Equals(enumValue)).Value ?? enumValue.ToString());
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the enum value from a string
|
/// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="value">String value</param>
|
/// <param name="objectType"></param>
|
||||||
|
/// <param name="enumValue"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static T? ParseString(string value)
|
[return: NotNullIfNotNull("enumValue")]
|
||||||
|
public static string? GetString(Type objectType, object? enumValue)
|
||||||
{
|
{
|
||||||
var type = Nullable.GetUnderlyingType(typeof(T)) ?? typeof(T);
|
objectType = Nullable.GetUnderlyingType(objectType) ?? objectType;
|
||||||
if (_mapping == null)
|
|
||||||
_mapping = AddMapping();
|
|
||||||
|
|
||||||
var mapping = _mapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCulture));
|
if (!_mapping.TryGetValue(objectType, out var mapping))
|
||||||
if (mapping.Equals(default(KeyValuePair<T, string>)))
|
mapping = AddMapping(objectType);
|
||||||
mapping = _mapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCultureIgnoreCase));
|
|
||||||
|
|
||||||
if (!mapping.Equals(default(KeyValuePair<T, string>)))
|
return enumValue == null ? null : (mapping.FirstOrDefault(v => v.Key.Equals(enumValue)).Value ?? enumValue.ToString());
|
||||||
return mapping.Key;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// If no explicit mapping is found try to parse string
|
|
||||||
return (T)Enum.Parse(type, value, true);
|
|
||||||
}
|
|
||||||
catch (Exception)
|
|
||||||
{
|
|
||||||
return default;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public JsonConverter CreateNullableConverter()
|
|
||||||
{
|
|
||||||
_nullableEnumConverter ??= new NullableEnumConverter(this);
|
|
||||||
return _nullableEnumConverter;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,23 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Globalization;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Converter for serializing enum values as int
|
|
||||||
/// </summary>
|
|
||||||
public class EnumIntWriterConverter<T> : JsonConverter<T> where T: struct, Enum
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
|
|
||||||
=> writer.WriteNumberValue((int)(object)value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
internal interface INullableConverterFactory
|
|
||||||
{
|
|
||||||
JsonConverter CreateNullableConverter();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Globalization;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Int converter
|
|
||||||
/// </summary>
|
|
||||||
public class IntConverter : JsonConverter<int?>
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override int? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
if (reader.TokenType == JsonTokenType.Null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
if (reader.TokenType == JsonTokenType.String)
|
|
||||||
{
|
|
||||||
var value = reader.GetString();
|
|
||||||
if (string.IsNullOrEmpty(value))
|
|
||||||
return null;
|
|
||||||
|
|
||||||
return int.Parse(value, NumberStyles.Integer, CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
|
|
||||||
return reader.GetInt32();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void Write(Utf8JsonWriter writer, int? value, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
if (value == null)
|
|
||||||
writer.WriteNullValue();
|
|
||||||
else
|
|
||||||
writer.WriteNumberValue(value.Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Globalization;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Int converter
|
|
||||||
/// </summary>
|
|
||||||
public class LongConverter : JsonConverter<long?>
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override long? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
if (reader.TokenType == JsonTokenType.Null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
if (reader.TokenType == JsonTokenType.String)
|
|
||||||
{
|
|
||||||
var value = reader.GetString();
|
|
||||||
if (string.IsNullOrEmpty(value))
|
|
||||||
return null;
|
|
||||||
|
|
||||||
return long.Parse(value, NumberStyles.Integer, CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
|
|
||||||
return reader.GetInt64();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void Write(Utf8JsonWriter writer, long? value, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
if (value == null)
|
|
||||||
writer.WriteNullValue();
|
|
||||||
else
|
|
||||||
writer.WriteNumberValue(value.Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json.Serialization.Metadata;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
internal class NullableEnumConverterFactory : JsonConverterFactory
|
|
||||||
{
|
|
||||||
private readonly IJsonTypeInfoResolver _jsonTypeInfoResolver;
|
|
||||||
private static readonly JsonSerializerOptions _options = new JsonSerializerOptions();
|
|
||||||
|
|
||||||
public NullableEnumConverterFactory(IJsonTypeInfoResolver jsonTypeInfoResolver)
|
|
||||||
{
|
|
||||||
_jsonTypeInfoResolver = jsonTypeInfoResolver;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool CanConvert(Type typeToConvert)
|
|
||||||
{
|
|
||||||
var b = Nullable.GetUnderlyingType(typeToConvert);
|
|
||||||
if (b == null)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
var typeInfo = _jsonTypeInfoResolver.GetTypeInfo(b, _options);
|
|
||||||
if (typeInfo == null)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
return typeInfo.Converter is INullableConverterFactory;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
var b = Nullable.GetUnderlyingType(typeToConvert) ?? throw new ArgumentNullException($"Not nullable {typeToConvert.Name}");
|
|
||||||
var typeInfo = _jsonTypeInfoResolver.GetTypeInfo(b, _options) ?? throw new ArgumentNullException($"Can find type {typeToConvert.Name}");
|
|
||||||
if (typeInfo.Converter is not INullableConverterFactory nullConverterFactory)
|
|
||||||
throw new ArgumentNullException($"Can find type converter for {typeToConvert.Name}");
|
|
||||||
|
|
||||||
return nullConverterFactory.CreateNullableConverter();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Read string or number as string
|
|
||||||
/// </summary>
|
|
||||||
public class NumberStringConverter : JsonConverter<string?>
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
if (reader.TokenType == JsonTokenType.Null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
if (reader.TokenType == JsonTokenType.Number)
|
|
||||||
{
|
|
||||||
if (reader.TryGetInt64(out var value))
|
|
||||||
return value.ToString();
|
|
||||||
|
|
||||||
return reader.GetDecimal().ToString();
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return reader.GetString();
|
|
||||||
}
|
|
||||||
catch (Exception)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void Write(Utf8JsonWriter writer, string? value, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
writer.WriteStringValue(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Converter for values which contain a nested json value
|
|
||||||
/// </summary>
|
|
||||||
public class ObjectStringConverter<T> : JsonConverter<T>
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
if (reader.TokenType == JsonTokenType.Null)
|
|
||||||
return default;
|
|
||||||
|
|
||||||
var value = reader.GetString();
|
|
||||||
if (string.IsNullOrEmpty(value))
|
|
||||||
return default;
|
|
||||||
|
|
||||||
return (T?)JsonDocument.Parse(value!).Deserialize(typeof(T), options);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
if (value is null)
|
|
||||||
writer.WriteStringValue("");
|
|
||||||
|
|
||||||
writer.WriteStringValue(JsonSerializer.Serialize(value, options));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Replace a value on a string property
|
|
||||||
/// </summary>
|
|
||||||
public abstract class ReplaceConverter : JsonConverter<string>
|
|
||||||
{
|
|
||||||
private readonly (string ValueToReplace, string ValueToReplaceWith)[] _replacementSets;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
public ReplaceConverter(params string[] replaceSets)
|
|
||||||
{
|
|
||||||
_replacementSets = replaceSets.Select(x =>
|
|
||||||
{
|
|
||||||
var split = x.Split(new string[] { "->" }, StringSplitOptions.None);
|
|
||||||
if (split.Length != 2)
|
|
||||||
throw new ArgumentException("Invalid replacement config");
|
|
||||||
return (split[0], split[1]);
|
|
||||||
}).ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
var value = reader.GetString();
|
|
||||||
foreach (var set in _replacementSets)
|
|
||||||
value = value?.Replace(set.ValueToReplace, set.ValueToReplaceWith);
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options) => writer.WriteStringValue(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Attribute to mark a model as json serializable. Used for AOT compilation.
|
|
||||||
/// </summary>
|
|
||||||
[AttributeUsage(System.AttributeTargets.Class | AttributeTargets.Enum | System.AttributeTargets.Interface)]
|
|
||||||
public class SerializationModelAttribute : Attribute
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
public SerializationModelAttribute() { }
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="type"></param>
|
|
||||||
public SerializationModelAttribute(Type type) { }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,5 +1,4 @@
|
|||||||
using System.Collections.Concurrent;
|
using System.Text.Json;
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
namespace CryptoExchange.Net.Converters.SystemTextJson
|
||||||
@ -9,39 +8,20 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static class SerializerOptions
|
public static class SerializerOptions
|
||||||
{
|
{
|
||||||
private static readonly ConcurrentDictionary<JsonSerializerContext, JsonSerializerOptions> _cache = new ConcurrentDictionary<JsonSerializerContext, JsonSerializerOptions>();
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get Json serializer settings which includes standard converters for DateTime, bool, enum and number types
|
/// Json serializer settings which includes the EnumConverter, DateTimeConverter, BoolConverter and DecimalConverter
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static JsonSerializerOptions WithConverters(JsonSerializerContext typeResolver, params JsonConverter[] additionalConverters)
|
public static JsonSerializerOptions WithConverters { get; } = new JsonSerializerOptions
|
||||||
{
|
{
|
||||||
if (!_cache.TryGetValue(typeResolver, out var options))
|
NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.AllowNamedFloatingPointLiterals,
|
||||||
{
|
PropertyNameCaseInsensitive = false,
|
||||||
options = new JsonSerializerOptions
|
Converters =
|
||||||
{
|
|
||||||
NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.AllowNamedFloatingPointLiterals,
|
|
||||||
PropertyNameCaseInsensitive = false,
|
|
||||||
Converters =
|
|
||||||
{
|
{
|
||||||
new DateTimeConverter(),
|
new DateTimeConverter(),
|
||||||
|
new EnumConverter(),
|
||||||
new BoolConverter(),
|
new BoolConverter(),
|
||||||
new DecimalConverter(),
|
new DecimalConverter(),
|
||||||
new IntConverter(),
|
}
|
||||||
new LongConverter(),
|
};
|
||||||
new NullableEnumConverterFactory(typeResolver)
|
|
||||||
},
|
|
||||||
TypeInfoResolver = typeResolver,
|
|
||||||
};
|
|
||||||
|
|
||||||
foreach (var converter in additionalConverters)
|
|
||||||
options.Converters.Add(converter);
|
|
||||||
|
|
||||||
options.TypeInfoResolver = typeResolver;
|
|
||||||
_cache.TryAdd(typeResolver, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
return options;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,60 +0,0 @@
|
|||||||
using CryptoExchange.Net.SharedApis;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
internal class SharedQuantityConverter : SharedQuantityReferenceConverter<SharedQuantity> { }
|
|
||||||
internal class SharedOrderQuantityConverter : SharedQuantityReferenceConverter<SharedOrderQuantity> { }
|
|
||||||
|
|
||||||
internal class SharedQuantityReferenceConverter<T> : JsonConverter<T> where T: SharedQuantityReference, new()
|
|
||||||
{
|
|
||||||
public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
if (reader.TokenType != JsonTokenType.StartArray)
|
|
||||||
throw new Exception("");
|
|
||||||
|
|
||||||
reader.Read(); // Start array
|
|
||||||
var baseQuantity = reader.TokenType == JsonTokenType.Null ? (decimal?)null : reader.GetDecimal();
|
|
||||||
reader.Read();
|
|
||||||
var quoteQuantity = reader.TokenType == JsonTokenType.Null ? (decimal?)null : reader.GetDecimal();
|
|
||||||
reader.Read();
|
|
||||||
var contractQuantity = reader.TokenType == JsonTokenType.Null ? (decimal?)null : reader.GetDecimal();
|
|
||||||
reader.Read();
|
|
||||||
|
|
||||||
if (reader.TokenType != JsonTokenType.EndArray)
|
|
||||||
throw new Exception("");
|
|
||||||
|
|
||||||
reader.Read(); // End array
|
|
||||||
|
|
||||||
var result = new T();
|
|
||||||
result.QuantityInBaseAsset = baseQuantity;
|
|
||||||
result.QuantityInQuoteAsset = quoteQuantity;
|
|
||||||
result.QuantityInContracts = contractQuantity;
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
writer.WriteStartArray();
|
|
||||||
if (value.QuantityInBaseAsset == null)
|
|
||||||
writer.WriteNullValue();
|
|
||||||
else
|
|
||||||
writer.WriteNumberValue(value.QuantityInBaseAsset.Value);
|
|
||||||
|
|
||||||
if (value.QuantityInQuoteAsset == null)
|
|
||||||
writer.WriteNullValue();
|
|
||||||
else
|
|
||||||
writer.WriteNumberValue(value.QuantityInQuoteAsset.Value);
|
|
||||||
|
|
||||||
if (value.QuantityInContracts == null)
|
|
||||||
writer.WriteNullValue();
|
|
||||||
else
|
|
||||||
writer.WriteNumberValue(value.QuantityInContracts.Value);
|
|
||||||
writer.WriteEndArray();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
using CryptoExchange.Net.SharedApis;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
|
||||||
{
|
|
||||||
internal class SharedSymbolConverter : JsonConverter<SharedSymbol>
|
|
||||||
{
|
|
||||||
public override SharedSymbol? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
if (reader.TokenType != JsonTokenType.StartArray)
|
|
||||||
throw new Exception("");
|
|
||||||
|
|
||||||
reader.Read(); // Start array
|
|
||||||
var tradingMode = (TradingMode)Enum.Parse(typeof(TradingMode), reader.GetString()!);
|
|
||||||
reader.Read();
|
|
||||||
var baseAsset = reader.GetString()!;
|
|
||||||
reader.Read();
|
|
||||||
var quoteAsset = reader.GetString()!;
|
|
||||||
reader.Read();
|
|
||||||
var timeStr = reader.GetString()!;
|
|
||||||
var deliverTime = string.IsNullOrEmpty(timeStr) ? (DateTime?)null : DateTime.Parse(timeStr);
|
|
||||||
reader.Read();
|
|
||||||
|
|
||||||
if (reader.TokenType != JsonTokenType.EndArray)
|
|
||||||
throw new Exception("");
|
|
||||||
|
|
||||||
reader.Read(); // End array
|
|
||||||
|
|
||||||
return new SharedSymbol(tradingMode, baseAsset, quoteAsset, deliverTime);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Write(Utf8JsonWriter writer, SharedSymbol value, JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
writer.WriteStartArray();
|
|
||||||
writer.WriteStringValue(value.TradingMode.ToString());
|
|
||||||
writer.WriteStringValue(value.BaseAsset);
|
|
||||||
writer.WriteStringValue(value.QuoteAsset);
|
|
||||||
writer.WriteStringValue(value.DeliverTime?.ToString());
|
|
||||||
writer.WriteEndArray();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -3,7 +3,6 @@ using CryptoExchange.Net.Interfaces;
|
|||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
@ -21,10 +20,10 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected JsonDocument? _document;
|
protected JsonDocument? _document;
|
||||||
|
|
||||||
private readonly JsonSerializerOptions? _customSerializerOptions;
|
private static JsonSerializerOptions _serializerOptions = SerializerOptions.WithConverters;
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public bool IsValid { get; set; }
|
public bool IsJson { get; set; }
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public abstract bool OriginalDataAvailable { get; }
|
public abstract bool OriginalDataAvailable { get; }
|
||||||
@ -32,22 +31,10 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public object? Underlying => throw new NotImplementedException();
|
public object? Underlying => throw new NotImplementedException();
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
public SystemTextJsonMessageAccessor(JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
_customSerializerOptions = options;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
public CallResult<object> Deserialize(Type type, MessagePath? path = null)
|
public CallResult<object> Deserialize(Type type, MessagePath? path = null)
|
||||||
{
|
{
|
||||||
if (!IsValid)
|
if (!IsJson)
|
||||||
return new CallResult<object>(GetOriginalString());
|
return new CallResult<object>(GetOriginalString());
|
||||||
|
|
||||||
if (_document == null)
|
if (_document == null)
|
||||||
@ -55,26 +42,17 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var result = _document.Deserialize(type, _customSerializerOptions);
|
var result = _document.Deserialize(type, _serializerOptions);
|
||||||
return new CallResult<object>(result!);
|
return new CallResult<object>(result!);
|
||||||
}
|
}
|
||||||
catch (JsonException ex)
|
catch (JsonException ex)
|
||||||
{
|
{
|
||||||
var info = $"Deserialize JsonException: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
|
var info = $"Deserialize JsonException: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
|
||||||
return new CallResult<object>(new DeserializeError(info, ex));
|
return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
var info = $"Deserialize unknown Exception: {ex.Message}";
|
|
||||||
return new CallResult<object>(new DeserializeError(info, ex));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
public CallResult<T> Deserialize<T>(MessagePath? path = null)
|
public CallResult<T> Deserialize<T>(MessagePath? path = null)
|
||||||
{
|
{
|
||||||
if (_document == null)
|
if (_document == null)
|
||||||
@ -82,25 +60,20 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var result = _document.Deserialize<T>(_customSerializerOptions);
|
var result = _document.Deserialize<T>(_serializerOptions);
|
||||||
return new CallResult<T>(result!);
|
return new CallResult<T>(result!);
|
||||||
}
|
}
|
||||||
catch (JsonException ex)
|
catch (JsonException ex)
|
||||||
{
|
{
|
||||||
var info = $"Deserialize JsonException: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
|
var info = $"Deserialize JsonException: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
|
||||||
return new CallResult<T>(new DeserializeError(info, ex));
|
return new CallResult<T>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
var info = $"Unknown exception: {ex.Message}";
|
|
||||||
return new CallResult<T>(new DeserializeError(info, ex));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public NodeType? GetNodeType()
|
public NodeType? GetNodeType()
|
||||||
{
|
{
|
||||||
if (!IsValid)
|
if (!IsJson)
|
||||||
throw new InvalidOperationException("Can't access json data on non-json message");
|
throw new InvalidOperationException("Can't access json data on non-json message");
|
||||||
|
|
||||||
if (_document == null)
|
if (_document == null)
|
||||||
@ -117,7 +90,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public NodeType? GetNodeType(MessagePath path)
|
public NodeType? GetNodeType(MessagePath path)
|
||||||
{
|
{
|
||||||
if (!IsValid)
|
if (!IsJson)
|
||||||
throw new InvalidOperationException("Can't access json data on non-json message");
|
throw new InvalidOperationException("Can't access json data on non-json message");
|
||||||
|
|
||||||
var node = GetPathNode(path);
|
var node = GetPathNode(path);
|
||||||
@ -133,13 +106,9 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
public T? GetValue<T>(MessagePath path)
|
public T? GetValue<T>(MessagePath path)
|
||||||
{
|
{
|
||||||
if (!IsValid)
|
if (!IsJson)
|
||||||
throw new InvalidOperationException("Can't access json data on non-json message");
|
throw new InvalidOperationException("Can't access json data on non-json message");
|
||||||
|
|
||||||
var value = GetPathNode(path);
|
var value = GetPathNode(path);
|
||||||
@ -147,48 +116,27 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
return default;
|
return default;
|
||||||
|
|
||||||
if (value.Value.ValueKind == JsonValueKind.Object || value.Value.ValueKind == JsonValueKind.Array)
|
if (value.Value.ValueKind == JsonValueKind.Object || value.Value.ValueKind == JsonValueKind.Array)
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return value.Value.Deserialize<T>(_customSerializerOptions);
|
|
||||||
}
|
|
||||||
catch { }
|
|
||||||
|
|
||||||
return default;
|
return default;
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof(T) == typeof(string))
|
var ttype = typeof(T);
|
||||||
{
|
if (ttype == typeof(string))
|
||||||
if (value.Value.ValueKind == JsonValueKind.Number)
|
return (T?)(object?)value.Value.GetString();
|
||||||
return (T)(object)value.Value.GetInt64().ToString();
|
if (ttype == typeof(short))
|
||||||
}
|
return (T)(object)value.Value.GetInt16();
|
||||||
|
if (ttype == typeof(int))
|
||||||
|
return (T)(object)value.Value.GetInt32();
|
||||||
|
if (ttype == typeof(long))
|
||||||
|
return (T)(object)value.Value.GetInt64();
|
||||||
|
|
||||||
return value.Value.Deserialize<T>(_customSerializerOptions);
|
return default;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
#if NET5_0_OR_GREATER
|
public List<T?>? GetValues<T>(MessagePath path) => throw new NotImplementedException();
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
public T?[]? GetValues<T>(MessagePath path)
|
|
||||||
{
|
|
||||||
if (!IsValid)
|
|
||||||
throw new InvalidOperationException("Can't access json data on non-json message");
|
|
||||||
|
|
||||||
var value = GetPathNode(path);
|
|
||||||
if (value == null)
|
|
||||||
return default;
|
|
||||||
|
|
||||||
if (value.Value.ValueKind != JsonValueKind.Array)
|
|
||||||
return default;
|
|
||||||
|
|
||||||
return value.Value.Deserialize<T[]>(_customSerializerOptions)!;
|
|
||||||
}
|
|
||||||
|
|
||||||
private JsonElement? GetPathNode(MessagePath path)
|
private JsonElement? GetPathNode(MessagePath path)
|
||||||
{
|
{
|
||||||
if (!IsValid)
|
if (!IsJson)
|
||||||
throw new InvalidOperationException("Can't access json data on non-json message");
|
throw new InvalidOperationException("Can't access json data on non-json message");
|
||||||
|
|
||||||
if (_document == null)
|
if (_document == null)
|
||||||
@ -249,15 +197,8 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override bool OriginalDataAvailable => _stream?.CanSeek == true;
|
public override bool OriginalDataAvailable => _stream?.CanSeek == true;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
public SystemTextJsonStreamMessageAccessor(JsonSerializerOptions options): base(options)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public async Task<CallResult> Read(Stream stream, bool bufferStream)
|
public async Task<bool> Read(Stream stream, bool bufferStream)
|
||||||
{
|
{
|
||||||
if (bufferStream && stream is not MemoryStream)
|
if (bufferStream && stream is not MemoryStream)
|
||||||
{
|
{
|
||||||
@ -279,17 +220,16 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
_document = await JsonDocument.ParseAsync(_stream ?? stream).ConfigureAwait(false);
|
_document = await JsonDocument.ParseAsync(_stream ?? stream).ConfigureAwait(false);
|
||||||
IsValid = true;
|
IsJson = true;
|
||||||
return CallResult.SuccessResult;
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
// Not a json message
|
// Not a json message
|
||||||
IsValid = false;
|
IsJson = false;
|
||||||
return new CallResult(new DeserializeError("JsonError: " + ex.Message, ex));
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
return IsJson;
|
||||||
|
}
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override string GetOriginalString()
|
public override string GetOriginalString()
|
||||||
{
|
{
|
||||||
@ -306,7 +246,6 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
{
|
{
|
||||||
_stream?.Dispose();
|
_stream?.Dispose();
|
||||||
_stream = null;
|
_stream = null;
|
||||||
_document?.Dispose();
|
|
||||||
_document = null;
|
_document = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -319,43 +258,28 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
{
|
{
|
||||||
private ReadOnlyMemory<byte> _bytes;
|
private ReadOnlyMemory<byte> _bytes;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
public SystemTextJsonByteMessageAccessor(JsonSerializerOptions options) : base(options)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public CallResult Read(ReadOnlyMemory<byte> data)
|
public bool Read(ReadOnlyMemory<byte> data)
|
||||||
{
|
{
|
||||||
_bytes = data;
|
_bytes = data;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var firstByte = data.Span[0];
|
|
||||||
if (firstByte != 0x7b && firstByte != 0x5b)
|
|
||||||
{
|
|
||||||
// Value doesn't start with `{` or `[`, prevent deserialization attempt as it's slow
|
|
||||||
IsValid = false;
|
|
||||||
return new CallResult(new ServerError("Not a json value"));
|
|
||||||
}
|
|
||||||
|
|
||||||
_document = JsonDocument.Parse(data);
|
_document = JsonDocument.Parse(data);
|
||||||
IsValid = true;
|
IsJson = true;
|
||||||
return CallResult.SuccessResult;
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
// Not a json message
|
// Not a json message
|
||||||
IsValid = false;
|
IsJson = false;
|
||||||
return new CallResult(new DeserializeError("JsonError: " + ex.Message, ex));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return IsJson;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override string GetOriginalString() =>
|
public override string GetOriginalString() =>
|
||||||
// NetStandard 2.0 doesn't support GetString from a ReadonlySpan<byte>, so use ToArray there instead
|
// Netstandard 2.0 doesn't support GetString from a ReadonlySpan<byte>, so use ToArray there instead
|
||||||
#if NETSTANDARD2_0
|
#if NETSTANDARD2_0
|
||||||
Encoding.UTF8.GetString(_bytes.ToArray());
|
Encoding.UTF8.GetString(_bytes.ToArray());
|
||||||
#else
|
#else
|
||||||
@ -369,7 +293,6 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
|||||||
public override void Clear()
|
public override void Clear()
|
||||||
{
|
{
|
||||||
_bytes = null;
|
_bytes = null;
|
||||||
_document?.Dispose();
|
|
||||||
_document = null;
|
_document = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,29 +1,12 @@
|
|||||||
using CryptoExchange.Net.Interfaces;
|
using CryptoExchange.Net.Interfaces;
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using System.Text.Json.Serialization.Metadata;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Converters.SystemTextJson
|
namespace CryptoExchange.Net.Converters.SystemTextJson
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class SystemTextJsonMessageSerializer : IStringMessageSerializer
|
public class SystemTextJsonMessageSerializer : IMessageSerializer
|
||||||
{
|
{
|
||||||
private readonly JsonSerializerOptions _options;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ctor
|
|
||||||
/// </summary>
|
|
||||||
public SystemTextJsonMessageSerializer(JsonSerializerOptions options)
|
|
||||||
{
|
|
||||||
_options = options;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
#if NET5_0_OR_GREATER
|
public string Serialize(object message) => JsonSerializer.Serialize(message, SerializerOptions.WithConverters);
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "Everything referenced in the loaded assembly is manually preserved, so it's safe")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "Everything referenced in the loaded assembly is manually preserved, so it's safe")]
|
|
||||||
#endif
|
|
||||||
public string Serialize<T>(T message) => JsonSerializer.Serialize(message, _options);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
<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</TargetFrameworks>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<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.1</PackageVersion>
|
<PackageVersion>7.2.0</PackageVersion>
|
||||||
<AssemblyVersion>9.2.1</AssemblyVersion>
|
<AssemblyVersion>7.2.0</AssemblyVersion>
|
||||||
<FileVersion>9.2.1</FileVersion>
|
<FileVersion>7.2.0</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>
|
||||||
@ -20,16 +20,13 @@
|
|||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
<PackageReleaseNotes>https://github.com/JKorf/CryptoExchange.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
|
<PackageReleaseNotes>https://github.com/JKorf/CryptoExchange.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<LangVersion>12.0</LangVersion>
|
<LangVersion>10.0</LangVersion>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Icon\icon.png" Pack="true" PackagePath="\" />
|
<None Include="Icon\icon.png" Pack="true" PackagePath="\" />
|
||||||
<None Include="..\README.md" Pack="true" PackagePath="\" />
|
<None Include="..\README.md" Pack="true" PackagePath="\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="AOT" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
|
|
||||||
<IsAotCompatible>true</IsAotCompatible>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Label="Deterministic Build" Condition="'$(Configuration)' == 'Release'">
|
<PropertyGroup Label="Deterministic Build" Condition="'$(Configuration)' == 'Release'">
|
||||||
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
||||||
<IncludeSymbols>true</IncludeSymbols>
|
<IncludeSymbols>true</IncludeSymbols>
|
||||||
@ -37,6 +34,12 @@
|
|||||||
<EmbedUntrackedSources>true</EmbedUntrackedSources>
|
<EmbedUntrackedSources>true</EmbedUntrackedSources>
|
||||||
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<ItemGroup Label="Deterministic Build" Condition="'$(Configuration)' == 'Release'">
|
||||||
|
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<DocumentationFile>CryptoExchange.Net.xml</DocumentationFile>
|
<DocumentationFile>CryptoExchange.Net.xml</DocumentationFile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
@ -45,17 +48,16 @@
|
|||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
|
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
|
||||||
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
|
||||||
<PackageReference Include="System.Text.Json" Version="9.0.6" />
|
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
|
||||||
</ItemGroup>
|
<PackageReference Include="System.Text.Json" Version="8.0.3" />
|
||||||
<ItemGroup Label="Transitive Client Packages">
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.6" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.6" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@ -1,12 +1,6 @@
|
|||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using CryptoExchange.Net.SharedApis;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Globalization;
|
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net
|
namespace CryptoExchange.Net
|
||||||
{
|
{
|
||||||
@ -16,28 +10,15 @@ namespace CryptoExchange.Net
|
|||||||
public static class ExchangeHelpers
|
public static class ExchangeHelpers
|
||||||
{
|
{
|
||||||
private const string _allowedRandomChars = "ABCDEFGHIJKLMONOPQRSTUVWXYZabcdefghijklmonopqrstuvwxyz0123456789";
|
private const string _allowedRandomChars = "ABCDEFGHIJKLMONOPQRSTUVWXYZabcdefghijklmonopqrstuvwxyz0123456789";
|
||||||
private const string _allowedRandomHexChars = "0123456789ABCDEF";
|
|
||||||
|
|
||||||
private static readonly Dictionary<int, string> _monthSymbols = new Dictionary<int, string>()
|
|
||||||
{
|
|
||||||
{ 1, "F" },
|
|
||||||
{ 2, "G" },
|
|
||||||
{ 3, "H" },
|
|
||||||
{ 4, "J" },
|
|
||||||
{ 5, "K" },
|
|
||||||
{ 6, "M" },
|
|
||||||
{ 7, "N" },
|
|
||||||
{ 8, "Q" },
|
|
||||||
{ 9, "U" },
|
|
||||||
{ 10, "V" },
|
|
||||||
{ 11, "X" },
|
|
||||||
{ 12, "Z" },
|
|
||||||
};
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The last used id, use NextId() to get the next id and up this
|
/// The last used id, use NextId() to get the next id and up this
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static int _lastId;
|
private static int _lastId;
|
||||||
|
/// <summary>
|
||||||
|
/// Lock for id generating
|
||||||
|
/// </summary>
|
||||||
|
private static object _idLock = new();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Clamp a value between a min and max
|
/// Clamp a value between a min and max
|
||||||
@ -77,11 +58,6 @@ namespace CryptoExchange.Net
|
|||||||
{
|
{
|
||||||
value -= offset;
|
value -= offset;
|
||||||
}
|
}
|
||||||
else if(roundingType == RoundingType.Up)
|
|
||||||
{
|
|
||||||
if (offset != 0)
|
|
||||||
value += (step.Value - offset);
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (offset < step / 2)
|
if (offset < step / 2)
|
||||||
@ -113,34 +89,6 @@ namespace CryptoExchange.Net
|
|||||||
return RoundToSignificantDigits(value, precision.Value, roundingType);
|
return RoundToSignificantDigits(value, precision.Value, roundingType);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apply the provided rules to the value
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="value">Value to be adjusted</param>
|
|
||||||
/// <param name="decimals">Max decimal places</param>
|
|
||||||
/// <param name="valueStep">The value step for increase/decrease value</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static decimal ApplyRules(
|
|
||||||
decimal value,
|
|
||||||
int? decimals = null,
|
|
||||||
decimal? valueStep = null)
|
|
||||||
{
|
|
||||||
if (valueStep.HasValue)
|
|
||||||
{
|
|
||||||
var offset = value % valueStep.Value;
|
|
||||||
if (offset != 0)
|
|
||||||
{
|
|
||||||
if (offset < valueStep.Value / 2)
|
|
||||||
value -= offset;
|
|
||||||
else value += (valueStep.Value - offset);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (decimals.HasValue)
|
|
||||||
value = Math.Round(value, decimals.Value);
|
|
||||||
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Round a value to have the provided total number of digits. For example, value 253.12332 with 5 digits would be 253.12
|
/// Round a value to have the provided total number of digits. For example, value 253.12332 with 5 digits would be 253.12
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -162,23 +110,17 @@ namespace CryptoExchange.Net
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Rounds a value down
|
/// Rounds a value down to
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="i"></param>
|
||||||
|
/// <param name="decimalPlaces"></param>
|
||||||
|
/// <returns></returns>
|
||||||
public static decimal RoundDown(decimal i, double decimalPlaces)
|
public static decimal RoundDown(decimal i, double decimalPlaces)
|
||||||
{
|
{
|
||||||
var power = Convert.ToDecimal(Math.Pow(10, decimalPlaces));
|
var power = Convert.ToDecimal(Math.Pow(10, decimalPlaces));
|
||||||
return Math.Floor(i * power) / power;
|
return Math.Floor(i * power) / power;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Rounds a value up
|
|
||||||
/// </summary>
|
|
||||||
public static decimal RoundUp(decimal i, double decimalPlaces)
|
|
||||||
{
|
|
||||||
var power = Convert.ToDecimal(Math.Pow(10, decimalPlaces));
|
|
||||||
return Math.Ceiling(i * power) / power;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Strips any trailing zero's of a decimal value, useful when converting the value to string.
|
/// Strips any trailing zero's of a decimal value, useful when converting the value to string.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -190,16 +132,27 @@ namespace CryptoExchange.Net
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Generate a new unique id. The id is statically stored so it is guaranteed to be unique
|
/// Generate a new unique id. The id is staticly stored so it is guarenteed to be unique
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static int NextId() => Interlocked.Increment(ref _lastId);
|
public static int NextId()
|
||||||
|
{
|
||||||
|
lock (_idLock)
|
||||||
|
{
|
||||||
|
_lastId += 1;
|
||||||
|
return _lastId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Return the last unique id that was generated
|
/// Return the last unique id that was generated
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static int LastId() => _lastId;
|
public static int LastId()
|
||||||
|
{
|
||||||
|
lock (_idLock)
|
||||||
|
return _lastId;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Generate a random string of specified length
|
/// Generate a random string of specified length
|
||||||
@ -210,7 +163,7 @@ namespace CryptoExchange.Net
|
|||||||
{
|
{
|
||||||
var randomChars = new char[length];
|
var randomChars = new char[length];
|
||||||
|
|
||||||
#if NETSTANDARD2_1_OR_GREATER || NET9_0_OR_GREATER
|
#if NETSTANDARD2_1_OR_GREATER
|
||||||
for (int i = 0; i < length; i++)
|
for (int i = 0; i < length; i++)
|
||||||
randomChars[i] = _allowedRandomChars[RandomNumberGenerator.GetInt32(0, _allowedRandomChars.Length)];
|
randomChars[i] = _allowedRandomChars[RandomNumberGenerator.GetInt32(0, _allowedRandomChars.Length)];
|
||||||
#else
|
#else
|
||||||
@ -222,44 +175,6 @@ namespace CryptoExchange.Net
|
|||||||
return new string(randomChars);
|
return new string(randomChars);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Generate a random string of specified length
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="length">Length of the random string</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static string RandomHexString(int length)
|
|
||||||
{
|
|
||||||
#if NET9_0_OR_GREATER
|
|
||||||
return "0x" + RandomNumberGenerator.GetHexString(length * 2);
|
|
||||||
#else
|
|
||||||
var randomChars = new char[length * 2];
|
|
||||||
var random = new Random();
|
|
||||||
for (int i = 0; i < length * 2; i++)
|
|
||||||
randomChars[i] = _allowedRandomHexChars[random.Next(0, _allowedRandomHexChars.Length)];
|
|
||||||
return "0x" + new string(randomChars);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Generate a long value
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="maxLength">Max character length</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static long RandomLong(int maxLength)
|
|
||||||
{
|
|
||||||
#if NETSTANDARD2_1_OR_GREATER || NET9_0_OR_GREATER
|
|
||||||
var value = RandomNumberGenerator.GetInt32(0, int.MaxValue);
|
|
||||||
#else
|
|
||||||
var random = new Random();
|
|
||||||
var value = random.Next(0, int.MaxValue);
|
|
||||||
#endif
|
|
||||||
var val = value.ToString();
|
|
||||||
if (val.Length > maxLength)
|
|
||||||
return int.Parse(val.Substring(0, maxLength));
|
|
||||||
else
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Generate a random string of specified length
|
/// Generate a random string of specified length
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -276,94 +191,5 @@ namespace CryptoExchange.Net
|
|||||||
|
|
||||||
return source + RandomString(totalLength - source.Length);
|
return source + RandomString(totalLength - source.Length);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get the month representation for futures symbol based on the delivery month
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="time">Delivery time</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static string GetDeliveryMonthSymbol(DateTime time) => _monthSymbols[time.Month];
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Execute multiple requests to retrieve multiple pages of the result set
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="T">Type of the client</typeparam>
|
|
||||||
/// <typeparam name="U">Type of the request</typeparam>
|
|
||||||
/// <param name="paginatedFunc">The func to execute with each request</param>
|
|
||||||
/// <param name="request">The request parameters</param>
|
|
||||||
/// <param name="ct">Cancellation token</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static async IAsyncEnumerable<ExchangeWebResult<T[]>> ExecutePages<T, U>(Func<U, INextPageToken?, CancellationToken, Task<ExchangeWebResult<T[]>>> paginatedFunc, U request, [EnumeratorCancellation]CancellationToken ct = default)
|
|
||||||
{
|
|
||||||
var result = new List<T>();
|
|
||||||
ExchangeWebResult<T[]> batch;
|
|
||||||
INextPageToken? nextPageToken = null;
|
|
||||||
while (true)
|
|
||||||
{
|
|
||||||
batch = await paginatedFunc(request, nextPageToken, ct).ConfigureAwait(false);
|
|
||||||
yield return batch;
|
|
||||||
if (!batch || ct.IsCancellationRequested)
|
|
||||||
break;
|
|
||||||
|
|
||||||
result.AddRange(batch.Data);
|
|
||||||
nextPageToken = batch.NextPageToken;
|
|
||||||
if (nextPageToken == null)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apply the rules (price and quantity step size and decimals precision, min/max quantity) from the symbol to the quantity and price
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="symbol">The symbol as retrieved from the exchange</param>
|
|
||||||
/// <param name="quantity">Quantity to trade</param>
|
|
||||||
/// <param name="price">Price to trade at</param>
|
|
||||||
/// <param name="adjustedQuantity">Quantity adjusted to match all trading rules</param>
|
|
||||||
/// <param name="adjustedPrice">Price adjusted to match all trading rules</param>
|
|
||||||
public static void ApplySymbolRules(SharedSpotSymbol symbol, decimal quantity, decimal? price, out decimal adjustedQuantity, out decimal? adjustedPrice)
|
|
||||||
{
|
|
||||||
adjustedPrice = price;
|
|
||||||
adjustedQuantity = quantity;
|
|
||||||
var minNotionalAdjust = false;
|
|
||||||
|
|
||||||
if (price != null)
|
|
||||||
{
|
|
||||||
adjustedPrice = AdjustValueStep(0, decimal.MaxValue, symbol.PriceStep, RoundingType.Down, price.Value);
|
|
||||||
adjustedPrice = symbol.PriceSignificantFigures.HasValue ? RoundToSignificantDigits(adjustedPrice.Value, symbol.PriceSignificantFigures.Value, RoundingType.Closest) : adjustedPrice;
|
|
||||||
adjustedPrice = symbol.PriceDecimals.HasValue ? RoundDown(price.Value, symbol.PriceDecimals.Value) : adjustedPrice;
|
|
||||||
if (adjustedPrice != 0 && adjustedPrice * quantity < symbol.MinNotionalValue)
|
|
||||||
{
|
|
||||||
adjustedQuantity = symbol.MinNotionalValue.Value / adjustedPrice.Value;
|
|
||||||
minNotionalAdjust = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
adjustedQuantity = AdjustValueStep(symbol.MinTradeQuantity ?? 0, symbol.MaxTradeQuantity ?? decimal.MaxValue, symbol.QuantityStep, minNotionalAdjust ? RoundingType.Up : RoundingType.Down, adjustedQuantity);
|
|
||||||
adjustedQuantity = symbol.QuantityDecimals.HasValue ? (minNotionalAdjust ? RoundUp(adjustedQuantity, symbol.QuantityDecimals.Value) : RoundDown(adjustedQuantity, symbol.QuantityDecimals.Value)) : adjustedQuantity;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Parse a decimal value from a string
|
|
||||||
/// </summary>
|
|
||||||
public static decimal? ParseDecimal(string? value)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(value) || string.Equals("null", value, StringComparison.OrdinalIgnoreCase))
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
// Value doesn't fit decimal, default to max value
|
|
||||||
return decimal.MaxValue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,70 +0,0 @@
|
|||||||
using CryptoExchange.Net.SharedApis;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Concurrent;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Cache for symbol parsing
|
|
||||||
/// </summary>
|
|
||||||
public static class ExchangeSymbolCache
|
|
||||||
{
|
|
||||||
private static ConcurrentDictionary<string, ExchangeInfo> _symbolInfos = new ConcurrentDictionary<string, ExchangeInfo>();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Update the cached symbol data for an exchange
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="topicId">Id for the provided data</param>
|
|
||||||
/// <param name="updateData">Symbol data</param>
|
|
||||||
public static void UpdateSymbolInfo(string topicId, SharedSpotSymbol[] updateData)
|
|
||||||
{
|
|
||||||
if(!_symbolInfos.TryGetValue(topicId, out var exchangeInfo))
|
|
||||||
{
|
|
||||||
exchangeInfo = new ExchangeInfo(DateTime.UtcNow, updateData.ToDictionary(x => x.Name, x => new SharedSymbol(x.TradingMode, x.BaseAsset.ToUpperInvariant(), x.QuoteAsset.ToUpperInvariant(), (x as SharedFuturesSymbol)?.DeliveryTime) { SymbolName = x.Name }));
|
|
||||||
_symbolInfos.TryAdd(topicId, exchangeInfo);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (DateTime.UtcNow - exchangeInfo.UpdateTime < TimeSpan.FromMinutes(60))
|
|
||||||
return;
|
|
||||||
|
|
||||||
_symbolInfos[topicId] = new ExchangeInfo(DateTime.UtcNow, updateData.ToDictionary(x => x.Name, x => new SharedSymbol(x.TradingMode, x.BaseAsset.ToUpperInvariant(), x.QuoteAsset.ToUpperInvariant(), (x as SharedFuturesSymbol)?.DeliveryTime) { SymbolName = x.Name }));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Parse a symbol name to a SharedSymbol
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="topicId">Id for the provided data</param>
|
|
||||||
/// <param name="symbolName">Symbol name</param>
|
|
||||||
public static SharedSymbol? ParseSymbol(string topicId, string? symbolName)
|
|
||||||
{
|
|
||||||
if (symbolName == null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
if (!_symbolInfos.TryGetValue(topicId, out var exchangeInfo))
|
|
||||||
return null;
|
|
||||||
|
|
||||||
if (!exchangeInfo.Symbols.TryGetValue(symbolName, out var symbolInfo))
|
|
||||||
return null;
|
|
||||||
|
|
||||||
return new SharedSymbol(symbolInfo.TradingMode, symbolInfo.BaseAsset, symbolInfo.QuoteAsset, symbolName)
|
|
||||||
{
|
|
||||||
DeliverTime = symbolInfo.DeliverTime
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
class ExchangeInfo
|
|
||||||
{
|
|
||||||
public DateTime UpdateTime { get; set; }
|
|
||||||
public Dictionary<string, SharedSymbol> Symbols { get; set; }
|
|
||||||
|
|
||||||
public ExchangeInfo(DateTime updateTime, Dictionary<string, SharedSymbol> symbols)
|
|
||||||
{
|
|
||||||
UpdateTime = updateTime;
|
|
||||||
Symbols = symbols;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,18 +1,20 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
using System.IO.Compression;
|
using System.IO.Compression;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Security;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Web;
|
using System.Web;
|
||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using System.Collections;
|
||||||
using CryptoExchange.Net.SharedApis;
|
using System.Net.Http;
|
||||||
using System.Text.Json.Serialization.Metadata;
|
using System.Data.Common;
|
||||||
using System.Text.Json;
|
using Newtonsoft.Json.Linq;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net
|
namespace CryptoExchange.Net
|
||||||
{
|
{
|
||||||
@ -70,7 +72,7 @@ namespace CryptoExchange.Net
|
|||||||
{
|
{
|
||||||
if (serializationType == ArrayParametersSerialization.Array)
|
if (serializationType == ArrayParametersSerialization.Array)
|
||||||
{
|
{
|
||||||
uriString += $"{string.Join("&", ((object[])(urlEncodeValues ? Uri.EscapeDataString(arrayEntry.Value.ToString()!) : arrayEntry.Value)).Select(v => $"{arrayEntry.Key}[]={string.Format(CultureInfo.InvariantCulture, "{0}", v)}"))}&";
|
uriString += $"{string.Join("&", ((object[])(urlEncodeValues ? Uri.EscapeDataString(arrayEntry.Value.ToString()) : arrayEntry.Value)).Select(v => $"{arrayEntry.Key}[]={string.Format(CultureInfo.InvariantCulture, "{0}", v)}"))}&";
|
||||||
}
|
}
|
||||||
else if (serializationType == ArrayParametersSerialization.MultipleValues)
|
else if (serializationType == ArrayParametersSerialization.MultipleValues)
|
||||||
{
|
{
|
||||||
@ -100,9 +102,6 @@ namespace CryptoExchange.Net
|
|||||||
var formData = HttpUtility.ParseQueryString(string.Empty);
|
var formData = HttpUtility.ParseQueryString(string.Empty);
|
||||||
foreach (var kvp in parameters)
|
foreach (var kvp in parameters)
|
||||||
{
|
{
|
||||||
if (kvp.Value is null)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (kvp.Value.GetType().IsArray)
|
if (kvp.Value.GetType().IsArray)
|
||||||
{
|
{
|
||||||
var array = (Array)kvp.Value;
|
var array = (Array)kvp.Value;
|
||||||
@ -114,8 +113,93 @@ namespace CryptoExchange.Net
|
|||||||
formData.Add(kvp.Key, string.Format(CultureInfo.InvariantCulture, "{0}", kvp.Value));
|
formData.Add(kvp.Key, string.Format(CultureInfo.InvariantCulture, "{0}", kvp.Value));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return formData.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
return formData.ToString()!;
|
/// <summary>
|
||||||
|
/// Get the string the secure string is representing
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="source">The source secure string</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static string GetString(this SecureString source)
|
||||||
|
{
|
||||||
|
lock (source)
|
||||||
|
{
|
||||||
|
string result;
|
||||||
|
var length = source.Length;
|
||||||
|
var pointer = IntPtr.Zero;
|
||||||
|
var chars = new char[length];
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
pointer = Marshal.SecureStringToBSTR(source);
|
||||||
|
Marshal.Copy(pointer, chars, 0, length);
|
||||||
|
|
||||||
|
result = string.Join("", chars);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
if (pointer != IntPtr.Zero)
|
||||||
|
{
|
||||||
|
Marshal.ZeroFreeBSTR(pointer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Are 2 secure strings equal
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ss1">Source secure string</param>
|
||||||
|
/// <param name="ss2">Compare secure string</param>
|
||||||
|
/// <returns>True if equal by value</returns>
|
||||||
|
public static bool IsEqualTo(this SecureString ss1, SecureString ss2)
|
||||||
|
{
|
||||||
|
IntPtr bstr1 = IntPtr.Zero;
|
||||||
|
IntPtr bstr2 = IntPtr.Zero;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
bstr1 = Marshal.SecureStringToBSTR(ss1);
|
||||||
|
bstr2 = Marshal.SecureStringToBSTR(ss2);
|
||||||
|
int length1 = Marshal.ReadInt32(bstr1, -4);
|
||||||
|
int length2 = Marshal.ReadInt32(bstr2, -4);
|
||||||
|
if (length1 == length2)
|
||||||
|
{
|
||||||
|
for (int x = 0; x < length1; ++x)
|
||||||
|
{
|
||||||
|
byte b1 = Marshal.ReadByte(bstr1, x);
|
||||||
|
byte b2 = Marshal.ReadByte(bstr2, x);
|
||||||
|
if (b1 != b2) return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
if (bstr2 != IntPtr.Zero) Marshal.ZeroFreeBSTR(bstr2);
|
||||||
|
if (bstr1 != IntPtr.Zero) Marshal.ZeroFreeBSTR(bstr1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Create a secure string from a string
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="source"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static SecureString ToSecureString(this string source)
|
||||||
|
{
|
||||||
|
var secureString = new SecureString();
|
||||||
|
foreach (var c in source)
|
||||||
|
secureString.AppendChar(c);
|
||||||
|
secureString.MakeReadOnly();
|
||||||
|
return secureString;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -193,16 +277,6 @@ namespace CryptoExchange.Net
|
|||||||
throw new ArgumentException($"No values provided for parameter {argumentName}", argumentName);
|
throw new ArgumentException($"No values provided for parameter {argumentName}", argumentName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Format a string to RFC3339/ISO8601 string
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="dateTime"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static string ToRfc3339String(this DateTime dateTime)
|
|
||||||
{
|
|
||||||
return dateTime.ToString("yyyy-MM-dd'T'HH:mm:ss.fffzzz", DateTimeFormatInfo.InvariantInfo);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Format an exception and inner exception to a readable string
|
/// Format an exception and inner exception to a readable string
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -247,6 +321,26 @@ namespace CryptoExchange.Net
|
|||||||
return url.TrimEnd('/');
|
return url.TrimEnd('/');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Fill parameters in a path. Parameters are specified by '{}' and should be specified in occuring sequence
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="path">The total path string</param>
|
||||||
|
/// <param name="values">The values to fill</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static string FillPathParameters(this string path, params string[] values)
|
||||||
|
{
|
||||||
|
foreach (var value in values)
|
||||||
|
{
|
||||||
|
var index = path.IndexOf("{}", StringComparison.Ordinal);
|
||||||
|
if (index >= 0)
|
||||||
|
{
|
||||||
|
path = path.Remove(index, 2);
|
||||||
|
path = path.Insert(index, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Create a new uri with the provided parameters as query
|
/// Create a new uri with the provided parameters as query
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -254,7 +348,7 @@ namespace CryptoExchange.Net
|
|||||||
/// <param name="baseUri"></param>
|
/// <param name="baseUri"></param>
|
||||||
/// <param name="arraySerialization"></param>
|
/// <param name="arraySerialization"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static Uri SetParameters(this Uri baseUri, IDictionary<string, object> parameters, ArrayParametersSerialization arraySerialization)
|
public static Uri SetParameters(this Uri baseUri, SortedDictionary<string, object> parameters, ArrayParametersSerialization arraySerialization)
|
||||||
{
|
{
|
||||||
var uriBuilder = new UriBuilder();
|
var uriBuilder = new UriBuilder();
|
||||||
uriBuilder.Scheme = baseUri.Scheme;
|
uriBuilder.Scheme = baseUri.Scheme;
|
||||||
@ -290,7 +384,6 @@ namespace CryptoExchange.Net
|
|||||||
httpValueCollection.Add(parameter.Key, parameter.Value.ToString());
|
httpValueCollection.Add(parameter.Key, parameter.Value.ToString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
uriBuilder.Query = httpValueCollection.ToString();
|
uriBuilder.Query = httpValueCollection.ToString();
|
||||||
return uriBuilder.Uri;
|
return uriBuilder.Uri;
|
||||||
}
|
}
|
||||||
@ -338,7 +431,6 @@ namespace CryptoExchange.Net
|
|||||||
httpValueCollection.Add(parameter.Key, parameter.Value.ToString());
|
httpValueCollection.Add(parameter.Key, parameter.Value.ToString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
uriBuilder.Query = httpValueCollection.ToString();
|
uriBuilder.Query = httpValueCollection.ToString();
|
||||||
return uriBuilder.Uri;
|
return uriBuilder.Uri;
|
||||||
}
|
}
|
||||||
@ -350,7 +442,7 @@ namespace CryptoExchange.Net
|
|||||||
/// <param name="name"></param>
|
/// <param name="name"></param>
|
||||||
/// <param name="value"></param>
|
/// <param name="value"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static Uri AddQueryParameter(this Uri uri, string name, string value)
|
public static Uri AddQueryParmeter(this Uri uri, string name, string value)
|
||||||
{
|
{
|
||||||
var httpValueCollection = HttpUtility.ParseQueryString(uri.Query);
|
var httpValueCollection = HttpUtility.ParseQueryString(uri.Query);
|
||||||
|
|
||||||
@ -364,7 +456,7 @@ namespace CryptoExchange.Net
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Decompress using GzipStream
|
/// Decompress using Gzip
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="data"></param>
|
/// <param name="data"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
@ -372,153 +464,12 @@ namespace CryptoExchange.Net
|
|||||||
{
|
{
|
||||||
using var decompressedStream = new MemoryStream();
|
using var decompressedStream = new MemoryStream();
|
||||||
using var dataStream = MemoryMarshal.TryGetArray(data, out var arraySegment)
|
using var dataStream = MemoryMarshal.TryGetArray(data, out var arraySegment)
|
||||||
? new MemoryStream(arraySegment.Array!, arraySegment.Offset, arraySegment.Count)
|
? new MemoryStream(arraySegment.Array, arraySegment.Offset, arraySegment.Count)
|
||||||
: new MemoryStream(data.ToArray());
|
: new MemoryStream(data.ToArray());
|
||||||
using var deflateStream = new GZipStream(new MemoryStream(data.ToArray()), CompressionMode.Decompress);
|
using var deflateStream = new GZipStream(new MemoryStream(data.ToArray()), CompressionMode.Decompress);
|
||||||
deflateStream.CopyTo(decompressedStream);
|
deflateStream.CopyTo(decompressedStream);
|
||||||
return new ReadOnlyMemory<byte>(decompressedStream.GetBuffer(), 0, (int)decompressedStream.Length);
|
return new ReadOnlyMemory<byte>(decompressedStream.GetBuffer(), 0, (int)decompressedStream.Length);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Decompress using DeflateStream
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="input"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static ReadOnlyMemory<byte> Decompress(this ReadOnlyMemory<byte> input)
|
|
||||||
{
|
|
||||||
var output = new MemoryStream();
|
|
||||||
|
|
||||||
using (var compressStream = new MemoryStream(input.ToArray()))
|
|
||||||
using (var decompressor = new DeflateStream(compressStream, CompressionMode.Decompress))
|
|
||||||
decompressor.CopyTo(output);
|
|
||||||
|
|
||||||
output.Position = 0;
|
|
||||||
return new ReadOnlyMemory<byte>(output.GetBuffer(), 0, (int)output.Length);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Whether the trading mode is linear
|
|
||||||
/// </summary>
|
|
||||||
public static bool IsLinear(this TradingMode type) => type == TradingMode.PerpetualLinear || type == TradingMode.DeliveryLinear;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Whether the trading mode is inverse
|
|
||||||
/// </summary>
|
|
||||||
public static bool IsInverse(this TradingMode type) => type == TradingMode.PerpetualInverse || type == TradingMode.DeliveryInverse;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Whether the trading mode is perpetual
|
|
||||||
/// </summary>
|
|
||||||
public static bool IsPerpetual(this TradingMode type) => type == TradingMode.PerpetualInverse || type == TradingMode.PerpetualLinear;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Whether the trading mode is delivery
|
|
||||||
/// </summary>
|
|
||||||
public static bool IsDelivery(this TradingMode type) => type == TradingMode.DeliveryInverse || type == TradingMode.DeliveryLinear;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Register rest client interfaces
|
|
||||||
/// </summary>
|
|
||||||
public static IServiceCollection RegisterSharedRestInterfaces<T>(this IServiceCollection services, Func<IServiceProvider, T> client)
|
|
||||||
{
|
|
||||||
if (typeof(IAssetsRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IAssetsRestClient)client(x)!);
|
|
||||||
if (typeof(IBalanceRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IBalanceRestClient)client(x)!);
|
|
||||||
if (typeof(IDepositRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IDepositRestClient)client(x)!);
|
|
||||||
if (typeof(IKlineRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IKlineRestClient)client(x)!);
|
|
||||||
if (typeof(IListenKeyRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IListenKeyRestClient)client(x)!);
|
|
||||||
if (typeof(IOrderBookRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IOrderBookRestClient)client(x)!);
|
|
||||||
if (typeof(IRecentTradeRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IRecentTradeRestClient)client(x)!);
|
|
||||||
if (typeof(ITradeHistoryRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (ITradeHistoryRestClient)client(x)!);
|
|
||||||
if (typeof(IWithdrawalRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IWithdrawalRestClient)client(x)!);
|
|
||||||
if (typeof(IWithdrawRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IWithdrawRestClient)client(x)!);
|
|
||||||
if (typeof(IFeeRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IFeeRestClient)client(x)!);
|
|
||||||
if (typeof(IBookTickerRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IBookTickerRestClient)client(x)!);
|
|
||||||
|
|
||||||
if (typeof(ISpotOrderRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (ISpotOrderRestClient)client(x)!);
|
|
||||||
if (typeof(ISpotSymbolRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (ISpotSymbolRestClient)client(x)!);
|
|
||||||
if (typeof(ISpotTickerRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (ISpotTickerRestClient)client(x)!);
|
|
||||||
if (typeof(ISpotTriggerOrderRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (ISpotTriggerOrderRestClient)client(x)!);
|
|
||||||
if (typeof(ISpotOrderClientIdRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (ISpotOrderClientIdRestClient)client(x)!);
|
|
||||||
|
|
||||||
if (typeof(IFundingRateRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IFundingRateRestClient)client(x)!);
|
|
||||||
if (typeof(IFuturesOrderRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IFuturesOrderRestClient)client(x)!);
|
|
||||||
if (typeof(IFuturesSymbolRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IFuturesSymbolRestClient)client(x)!);
|
|
||||||
if (typeof(IFuturesTickerRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IFuturesTickerRestClient)client(x)!);
|
|
||||||
if (typeof(IIndexPriceKlineRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IIndexPriceKlineRestClient)client(x)!);
|
|
||||||
if (typeof(ILeverageRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (ILeverageRestClient)client(x)!);
|
|
||||||
if (typeof(IMarkPriceKlineRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IMarkPriceKlineRestClient)client(x)!);
|
|
||||||
if (typeof(IOpenInterestRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IOpenInterestRestClient)client(x)!);
|
|
||||||
if (typeof(IPositionHistoryRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IPositionHistoryRestClient)client(x)!);
|
|
||||||
if (typeof(IPositionModeRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IPositionModeRestClient)client(x)!);
|
|
||||||
if (typeof(IFuturesTpSlRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IFuturesTpSlRestClient)client(x)!);
|
|
||||||
if (typeof(IFuturesTriggerOrderRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IFuturesTriggerOrderRestClient)client(x)!);
|
|
||||||
if (typeof(IFuturesOrderClientIdRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IFuturesOrderClientIdRestClient)client(x)!);
|
|
||||||
|
|
||||||
return services;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Register socket client interfaces
|
|
||||||
/// </summary>
|
|
||||||
public static IServiceCollection RegisterSharedSocketInterfaces<T>(this IServiceCollection services, Func<IServiceProvider, T> client)
|
|
||||||
{
|
|
||||||
if (typeof(IBalanceSocketClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IBalanceSocketClient)client(x)!);
|
|
||||||
if (typeof(IBookTickerSocketClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IBookTickerSocketClient)client(x)!);
|
|
||||||
if (typeof(IKlineSocketClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IKlineSocketClient)client(x)!);
|
|
||||||
if (typeof(IOrderBookRestClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IOrderBookRestClient)client(x)!);
|
|
||||||
if (typeof(ITickerSocketClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (ITickerSocketClient)client(x)!);
|
|
||||||
if (typeof(ITickersSocketClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (ITickersSocketClient)client(x)!);
|
|
||||||
if (typeof(ITradeSocketClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (ITradeSocketClient)client(x)!);
|
|
||||||
if (typeof(IUserTradeSocketClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IUserTradeSocketClient)client(x)!);
|
|
||||||
|
|
||||||
if (typeof(ISpotOrderSocketClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (ISpotOrderSocketClient)client(x)!);
|
|
||||||
|
|
||||||
if (typeof(IFuturesOrderSocketClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IFuturesOrderSocketClient)client(x)!);
|
|
||||||
if (typeof(IPositionSocketClient).IsAssignableFrom(typeof(T)))
|
|
||||||
services.AddTransient(x => (IPositionSocketClient)client(x)!);
|
|
||||||
|
|
||||||
return services;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
138
CryptoExchange.Net/Interfaces/CommonClients/IBaseRestClient.cs
Normal file
138
CryptoExchange.Net/Interfaces/CommonClients/IBaseRestClient.cs
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
using CryptoExchange.Net.CommonObjects;
|
||||||
|
using CryptoExchange.Net.Objects;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Interfaces.CommonClients
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Common rest client endpoints
|
||||||
|
/// </summary>
|
||||||
|
public interface IBaseRestClient
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The name of the exchange
|
||||||
|
/// </summary>
|
||||||
|
string ExchangeName { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Should be triggered on order placing
|
||||||
|
/// </summary>
|
||||||
|
event Action<OrderId> OnOrderPlaced;
|
||||||
|
/// <summary>
|
||||||
|
/// Should be triggered on order cancelling
|
||||||
|
/// </summary>
|
||||||
|
event Action<OrderId> OnOrderCanceled;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get the symbol name based on a base and quote asset
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="baseAsset">The base asset</param>
|
||||||
|
/// <param name="quoteAsset">The quote asset</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
string GetSymbolName(string baseAsset, string quoteAsset);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get a list of symbols for the exchange
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<IEnumerable<Symbol>>> GetSymbolsAsync(CancellationToken ct = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get a ticker for the exchange
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="symbol">The symbol to get klines for</param>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<Ticker>> GetTickerAsync(string symbol, CancellationToken ct = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get a list of tickers for the exchange
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<IEnumerable<Ticker>>> GetTickersAsync(CancellationToken ct = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get a list of candles for a given symbol on the exchange
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="symbol">The symbol to retrieve the candles for</param>
|
||||||
|
/// <param name="timespan">The timespan to retrieve the candles for. The supported value are dependent on the exchange</param>
|
||||||
|
/// <param name="startTime">[Optional] Start time to retrieve klines for</param>
|
||||||
|
/// <param name="endTime">[Optional] End time to retrieve klines for</param>
|
||||||
|
/// <param name="limit">[Optional] Max number of results</param>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<IEnumerable<Kline>>> GetKlinesAsync(string symbol, TimeSpan timespan, DateTime? startTime = null, DateTime? endTime = null, int? limit = null, CancellationToken ct = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get the order book for a symbol
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="symbol">The symbol to get the book for</param>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<CommonObjects.OrderBook>> GetOrderBookAsync(string symbol, CancellationToken ct = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The recent trades for a symbol
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="symbol">The symbol to get the trades for</param>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<IEnumerable<Trade>>> GetRecentTradesAsync(string symbol, CancellationToken ct = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get balances
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="accountId">[Optional] The account id to retrieve balances for, required for some exchanges, ignored otherwise</param>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<IEnumerable<Balance>>> GetBalancesAsync(string? accountId = null, CancellationToken ct = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get an order by id
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="orderId">The id</param>
|
||||||
|
/// <param name="symbol">[Optional] The symbol the order is on, required for some exchanges, ignored otherwise</param>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<Order>> GetOrderAsync(string orderId, string? symbol = null, CancellationToken ct = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get trades for an order by id
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="orderId">The id</param>
|
||||||
|
/// <param name="symbol">[Optional] The symbol the order is on, required for some exchanges, ignored otherwise</param>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<IEnumerable<UserTrade>>> GetOrderTradesAsync(string orderId, string? symbol = null, CancellationToken ct = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get a list of open orders
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="symbol">[Optional] The symbol to get open orders for, required for some exchanges, ignored otherwise</param>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<IEnumerable<Order>>> GetOpenOrdersAsync(string? symbol = null, CancellationToken ct = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get a list of closed orders
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="symbol">[Optional] The symbol to get closed orders for, required for some exchanges, ignored otherwise</param>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<IEnumerable<Order>>> GetClosedOrdersAsync(string? symbol = null, CancellationToken ct = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Cancel an order by id
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="orderId">The id</param>
|
||||||
|
/// <param name="symbol">[Optional] The symbol the order is on, required for some exchanges, ignored otherwise</param>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<OrderId>> CancelOrderAsync(string orderId, string? symbol = null, CancellationToken ct = default);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using CryptoExchange.Net.CommonObjects;
|
||||||
|
using CryptoExchange.Net.Objects;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Interfaces.CommonClients
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Common futures endpoints
|
||||||
|
/// </summary>
|
||||||
|
public interface IFuturesClient : IBaseRestClient
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Place an order
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="symbol">The symbol the order is for</param>
|
||||||
|
/// <param name="side">The side of the order</param>
|
||||||
|
/// <param name="type">The type of the order</param>
|
||||||
|
/// <param name="quantity">The quantity of the order</param>
|
||||||
|
/// <param name="price">The price of the order, only for limit orders</param>
|
||||||
|
/// <param name="accountId">[Optional] The account id to place the order on, required for some exchanges, ignored otherwise</param>
|
||||||
|
/// <param name="leverage">[Optional] Leverage for this order. This is needed for some exchanges. For exchanges where this is not needed this parameter is ignored (and should be set before hand)</param>
|
||||||
|
/// <param name="clientOrderId">[Optional] Client specified id for this order</param>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns>The id of the resulting order</returns>
|
||||||
|
Task<WebCallResult<OrderId>> PlaceOrderAsync(string symbol, CommonOrderSide side, CommonOrderType type, decimal quantity, decimal? price = null, int? leverage = null, string? accountId = null, string? clientOrderId = null, CancellationToken ct = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get position
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<WebCallResult<IEnumerable<Position>>> GetPositionsAsync(CancellationToken ct = default);
|
||||||
|
}
|
||||||
|
}
|
||||||
27
CryptoExchange.Net/Interfaces/CommonClients/ISpotClient.cs
Normal file
27
CryptoExchange.Net/Interfaces/CommonClients/ISpotClient.cs
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
using CryptoExchange.Net.CommonObjects;
|
||||||
|
using CryptoExchange.Net.Objects;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Interfaces.CommonClients
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Common spot endpoints
|
||||||
|
/// </summary>
|
||||||
|
public interface ISpotClient: IBaseRestClient
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Place an order
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="symbol">The symbol the order is for</param>
|
||||||
|
/// <param name="side">The side of the order</param>
|
||||||
|
/// <param name="type">The type of the order</param>
|
||||||
|
/// <param name="quantity">The quantity of the order</param>
|
||||||
|
/// <param name="price">The price of the order, only for limit orders</param>
|
||||||
|
/// <param name="accountId">[Optional] The account id to place the order on, required for some exchanges, ignored otherwise</param>
|
||||||
|
/// <param name="clientOrderId">[Optional] Client specified id for this order</param>
|
||||||
|
/// <param name="ct">[Optional] Cancellation token for cancelling the request</param>
|
||||||
|
/// <returns>The id of the resulting order</returns>
|
||||||
|
Task<WebCallResult<OrderId>> PlaceOrderAsync(string symbol, CommonOrderSide side, CommonOrderType type, decimal quantity, decimal? price = null, string? accountId = null, string? clientOrderId = null, CancellationToken ct = default);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,16 +0,0 @@
|
|||||||
using System;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Interfaces
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Time provider
|
|
||||||
/// </summary>
|
|
||||||
internal interface IAuthTimeProvider
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Get current time
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
DateTime GetTime();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,8 +1,4 @@
|
|||||||
using CryptoExchange.Net.Authentication;
|
using CryptoExchange.Net.Authentication;
|
||||||
using CryptoExchange.Net.Objects;
|
|
||||||
using CryptoExchange.Net.Objects.Options;
|
|
||||||
using CryptoExchange.Net.SharedApis;
|
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Interfaces
|
namespace CryptoExchange.Net.Interfaces
|
||||||
{
|
{
|
||||||
@ -16,33 +12,11 @@ namespace CryptoExchange.Net.Interfaces
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
string BaseAddress { get; }
|
string BaseAddress { get; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Whether or not API credentials have been configured for this client. Does not check the credentials are actually valid.
|
|
||||||
/// </summary>
|
|
||||||
bool Authenticated { get; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Format a base and quote asset to an exchange accepted symbol
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="baseAsset">The base asset</param>
|
|
||||||
/// <param name="quoteAsset">The quote asset</param>
|
|
||||||
/// <param name="tradingMode">The trading mode</param>
|
|
||||||
/// <param name="deliverDate">The deliver date for a delivery futures symbol</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverDate = null);
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Set the API credentials for this API client
|
/// Set the API credentials for this API client
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="T"></typeparam>
|
/// <typeparam name="T"></typeparam>
|
||||||
/// <param name="credentials"></param>
|
/// <param name="credentials"></param>
|
||||||
void SetApiCredentials<T>(T credentials) where T : ApiCredentials;
|
void SetApiCredentials<T>(T credentials) where T : ApiCredentials;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Set new options. Note that when using a proxy this should be provided in the options even when already set before or it will be reset.
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="T">Api credentials type</typeparam>
|
|
||||||
/// <param name="options">Options to set</param>
|
|
||||||
void SetOptions<T>(UpdateOptions<T> options) where T : ApiCredentials;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,4 +1,8 @@
|
|||||||
using System;
|
using CryptoExchange.Net.Interfaces.CommonClients;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Interfaces
|
namespace CryptoExchange.Net.Interfaces
|
||||||
{
|
{
|
||||||
@ -7,6 +11,19 @@ namespace CryptoExchange.Net.Interfaces
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public interface ICryptoRestClient
|
public interface ICryptoRestClient
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Get a list of all registered common ISpotClient types
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
IEnumerable<ISpotClient> GetSpotClients();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get an ISpotClient implementation by exchange name
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="exchangeName"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
ISpotClient? SpotClient(string exchangeName);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Try get
|
/// Try get
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -14,4 +31,4 @@ namespace CryptoExchange.Net.Interfaces
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
T TryGet<T>(Func<T> createFunc);
|
T TryGet<T>(Func<T> createFunc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,8 @@
|
|||||||
using System;
|
using CryptoExchange.Net.Interfaces.CommonClients;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Interfaces
|
namespace CryptoExchange.Net.Interfaces
|
||||||
{
|
{
|
||||||
|
|||||||
@ -2,7 +2,6 @@
|
|||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
@ -14,9 +13,9 @@ namespace CryptoExchange.Net.Interfaces
|
|||||||
public interface IMessageAccessor
|
public interface IMessageAccessor
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Is this a valid message
|
/// Is this a json message
|
||||||
/// </summary>
|
/// </summary>
|
||||||
bool IsValid { get; }
|
bool IsJson { get; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Is the original data available for retrieval
|
/// Is the original data available for retrieval
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -53,27 +52,19 @@ namespace CryptoExchange.Net.Interfaces
|
|||||||
/// <typeparam name="T"></typeparam>
|
/// <typeparam name="T"></typeparam>
|
||||||
/// <param name="path"></param>
|
/// <param name="path"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
T?[]? GetValues<T>(MessagePath path);
|
List<T?>? GetValues<T>(MessagePath path);
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserialize the message into this type
|
/// Deserialize the message into this type
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="type"></param>
|
/// <param name="type"></param>
|
||||||
/// <param name="path"></param>
|
/// <param name="path"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
CallResult<object> Deserialize(Type type, MessagePath? path = null);
|
CallResult<object> Deserialize(Type type, MessagePath? path = null);
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserialize the message into this type
|
/// Deserialize the message into this type
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="path"></param>
|
/// <param name="path"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
#if NET5_0_OR_GREATER
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
|
|
||||||
#endif
|
|
||||||
CallResult<T> Deserialize<T>(MessagePath? path = null);
|
CallResult<T> Deserialize<T>(MessagePath? path = null);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -93,7 +84,7 @@ namespace CryptoExchange.Net.Interfaces
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="stream"></param>
|
/// <param name="stream"></param>
|
||||||
/// <param name="bufferStream"></param>
|
/// <param name="bufferStream"></param>
|
||||||
Task<CallResult> Read(Stream stream, bool bufferStream);
|
Task<bool> Read(Stream stream, bool bufferStream);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -105,6 +96,6 @@ namespace CryptoExchange.Net.Interfaces
|
|||||||
/// Load a data message
|
/// Load a data message
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="data"></param>
|
/// <param name="data"></param>
|
||||||
CallResult Read(ReadOnlyMemory<byte> data);
|
bool Read(ReadOnlyMemory<byte> data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,6 +17,10 @@ namespace CryptoExchange.Net.Interfaces
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public int Id { get; }
|
public int Id { get; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// Whether this listener can handle data
|
||||||
|
/// </summary>
|
||||||
|
public bool CanHandleData { get; }
|
||||||
|
/// <summary>
|
||||||
/// The identifiers for this processor
|
/// The identifiers for this processor
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public HashSet<string> ListenerIdentifiers { get; }
|
public HashSet<string> ListenerIdentifiers { get; }
|
||||||
@ -26,7 +30,7 @@ namespace CryptoExchange.Net.Interfaces
|
|||||||
/// <param name="connection"></param>
|
/// <param name="connection"></param>
|
||||||
/// <param name="message"></param>
|
/// <param name="message"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
Task<CallResult> Handle(SocketConnection connection, DataEvent<object> message);
|
CallResult Handle(SocketConnection connection, DataEvent<object> message);
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the type the message should be deserialized to
|
/// Get the type the message should be deserialized to
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -1,37 +1,15 @@
|
|||||||
using System.Diagnostics.CodeAnalysis;
|
namespace CryptoExchange.Net.Interfaces
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Interfaces
|
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Serializer interface
|
/// Serializer interface
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public interface IMessageSerializer
|
public interface IMessageSerializer
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Serialize to byte array
|
|
||||||
/// </summary>
|
|
||||||
public interface IByteMessageSerializer: IMessageSerializer
|
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Serialize an object to a string
|
/// Serialize an object to a string
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="message"></param>
|
/// <param name="message"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
byte[] Serialize<T>(T message);
|
string Serialize(object message);
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Serialize to string
|
|
||||||
/// </summary>
|
|
||||||
public interface IStringMessageSerializer: IMessageSerializer
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Serialize an object to a string
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="message"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string Serialize<T>(T message);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,35 +0,0 @@
|
|||||||
using CryptoExchange.Net.Objects.Options;
|
|
||||||
using CryptoExchange.Net.SharedApis;
|
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Interfaces
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Factory for ISymbolOrderBook instances
|
|
||||||
/// </summary>
|
|
||||||
public interface IOrderBookFactory<TOptions> where TOptions : OrderBookOptions
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Create a new order book by symbol name
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="symbol">Symbol name</param>
|
|
||||||
/// <param name="options">Options for the order book</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public ISymbolOrderBook Create(string symbol, Action<TOptions>? options = null);
|
|
||||||
/// <summary>
|
|
||||||
/// Create a new order book by base and quote asset names
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="baseAsset">Base asset name</param>
|
|
||||||
/// <param name="quoteAsset">Quote asset name</param>
|
|
||||||
/// <param name="options">Options for the order book</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public ISymbolOrderBook Create(string baseAsset, string quoteAsset, Action<TOptions>? options = null);
|
|
||||||
/// <summary>
|
|
||||||
/// Create a new order book by base and quote asset names
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="symbol">Symbol</param>
|
|
||||||
/// <param name="options">Options for the order book</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public ISymbolOrderBook Create(SharedSymbol symbol, Action<TOptions>? options = null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,6 +1,7 @@
|
|||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
|
using System.Security;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
@ -23,6 +24,6 @@ namespace CryptoExchange.Net.Interfaces
|
|||||||
/// <param name="requestWeight">The weight of the request</param>
|
/// <param name="requestWeight">The weight of the request</param>
|
||||||
/// <param name="ct">Cancellation token to cancel waiting</param>
|
/// <param name="ct">Cancellation token to cancel waiting</param>
|
||||||
/// <returns>The time in milliseconds spend waiting</returns>
|
/// <returns>The time in milliseconds spend waiting</returns>
|
||||||
Task<CallResult<int>> LimitRequestAsync(ILogger log, string endpoint, HttpMethod method, bool signed, string? apiKey, RateLimitingBehaviour limitBehaviour, int requestWeight, CancellationToken ct);
|
Task<CallResult<int>> LimitRequestAsync(ILogger log, string endpoint, HttpMethod method, bool signed, SecureString? apiKey, RateLimitingBehaviour limitBehaviour, int requestWeight, CancellationToken ct);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -54,7 +54,7 @@ namespace CryptoExchange.Net.Interfaces
|
|||||||
/// Get all headers
|
/// Get all headers
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
KeyValuePair<string, string[]>[] GetHeaders();
|
Dictionary<string, IEnumerable<string>> GetHeaders();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the response
|
/// Get the response
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user