diff --git a/CryptoExchange.Net/Converters/JsonNet/JsonNetMessageAccessor.cs b/CryptoExchange.Net/Converters/JsonNet/JsonNetMessageAccessor.cs index 240763a..e19903b 100644 --- a/CryptoExchange.Net/Converters/JsonNet/JsonNetMessageAccessor.cs +++ b/CryptoExchange.Net/Converters/JsonNet/JsonNetMessageAccessor.cs @@ -243,8 +243,9 @@ namespace CryptoExchange.Net.Converters.JsonNet // We don't need to buffer the stream, so don't bother keeping the reference } - var length = stream.CanSeek ? stream.Length : 4096; - using var reader = new StreamReader(stream, Encoding.UTF8, false, (int)Math.Max(2, length), true); + 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 diff --git a/CryptoExchange.Net/Converters/SystemTextJson/EnumConverter.cs b/CryptoExchange.Net/Converters/SystemTextJson/EnumConverter.cs index d5a14f6..29126ca 100644 --- a/CryptoExchange.Net/Converters/SystemTextJson/EnumConverter.cs +++ b/CryptoExchange.Net/Converters/SystemTextJson/EnumConverter.cs @@ -92,6 +92,8 @@ namespace CryptoExchange.Net.Converters.SystemTextJson { JsonTokenType.String => reader.GetString(), JsonTokenType.Number => reader.GetInt16().ToString(), + JsonTokenType.True => "true", + JsonTokenType.False => "false", _ => null }; diff --git a/CryptoExchange.Net/Converters/SystemTextJson/SystemTextJsonMessageAccessor.cs b/CryptoExchange.Net/Converters/SystemTextJson/SystemTextJsonMessageAccessor.cs index 3910896..7a26c5c 100644 --- a/CryptoExchange.Net/Converters/SystemTextJson/SystemTextJsonMessageAccessor.cs +++ b/CryptoExchange.Net/Converters/SystemTextJson/SystemTextJsonMessageAccessor.cs @@ -219,7 +219,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson try { - _document = await JsonDocument.ParseAsync(stream).ConfigureAwait(false); + _document = await JsonDocument.ParseAsync(_stream ?? stream).ConfigureAwait(false); IsJson = true; } catch (Exception)