wip

JKorf · Mar 6, 2024 · 0ddfedd · 0ddfedd
1 parent 135627c
commit 0ddfedd
Show file tree

Hide file tree

Showing 9 changed files with 455 additions and 17 deletions.
diff --git a/BingX.Net.UnitTests/TestImplementations/JsonToObjectComparer.cs b/BingX.Net.UnitTests/TestImplementations/JsonToObjectComparer.cs
@@ -1,4 +1,5 @@
 using CryptoExchange.Net.Converters;
+using CryptoExchange.Net.Converters.JsonNet;
 using CryptoExchange.Net.Objects;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

diff --git a/BingX.Net/BingX.Net.xml b/BingX.Net/BingX.Net.xml
diff --git a/BingX.Net/Clients/FuturesApi/BingXSocketClientFuturesApi.cs b/BingX.Net/Clients/FuturesApi/BingXSocketClientFuturesApi.cs
@@ -44,12 +44,12 @@ internal BingXSocketClientFuturesApi(ILogger logger, BingXSocketOptions options)
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
             => new BingXAuthenticationProvider(credentials);
 
-        /// <inheritdoc />
-        public async Task<CallResult<UpdateSubscription>> SubscribeToBingXUpdatesAsync(Action<DataEvent<object>> onMessage, CancellationToken ct = default)
-        {
-            var subscription = new BingXSubscription<object>(_logger, "TOOD", "", onMessage, false);
-            return await SubscribeAsync(subscription, ct).ConfigureAwait(false);
-        }
+        ///// <inheritdoc />
+        //public async Task<CallResult<UpdateSubscription>> SubscribeToBingXUpdatesAsync(Action<DataEvent<object>> onMessage, CancellationToken ct = default)
+        //{
+        //    var subscription = new BingXSubscription<object>(_logger, "TOOD", "", onMessage, false);
+        //    return await SubscribeAsync(subscription, ct).ConfigureAwait(false);
+        //}
 
         /// <inheritdoc />
         public override string? GetListenerIdentifier(IMessageAccessor message)

diff --git a/BingX.Net/Clients/SpotApi/BingXRestClientSpotApiExchangeData.cs b/BingX.Net/Clients/SpotApi/BingXRestClientSpotApiExchangeData.cs
@@ -1,19 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using CryptoExchange.Net;
-using CryptoExchange.Net.Converters;
 using CryptoExchange.Net.Objects;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
+using BingX.Net.Enums;
 using BingX.Net.Interfaces.Clients.SpotApi;
 using BingX.Net.Objects.Models;
 using BingX.Net.Objects.Internal;
+using CryptoExchange.Net.Converters.SystemTextJson;
 
 namespace BingX.Net.Clients.SpotApi
 {
@@ -56,12 +52,47 @@ public async Task<WebCallResult<IEnumerable<BingXSymbol>>> GetSymbolsAsync(strin
         /// <inheritdoc />
         public async Task<WebCallResult<IEnumerable<BingXTrade>>> GetRecentTradesAsync(string symbol, int? limit = null, CancellationToken ct = default)
         {
-            var parameters = new ParameterCollection();
-            parameters.AddOptional("symbol", symbol);
+            var parameters = new ParameterCollection
+            {
+                { "symbol", symbol }
+            };
             parameters.AddOptional("limit", limit);
             return await _baseClient.SendRequestInternal<IEnumerable<BingXTrade>>(_baseClient.GetUri("/openApi/spot/v1/market/trades"), HttpMethod.Get, ct, parameters).ConfigureAwait(false);
         }
 
         #endregion
+
+        #region Get Order Book
+
+        /// <inheritdoc />
+        public async Task<WebCallResult<BingXOrderBook>> GetOrderBookAsync(string symbol, int? limit = null, CancellationToken ct = default)
+        {
+            var parameters = new ParameterCollection
+            {
+                { "symbol", symbol }
+            };
+            parameters.AddOptional("limit", limit);
+            return await _baseClient.SendRequestInternal<BingXOrderBook>(_baseClient.GetUri("/openApi/spot/v1/market/depth"), HttpMethod.Get, ct, parameters).ConfigureAwait(false);
+        }
+
+        #endregion
+
+        #region Get Klines
+
+        /// <inheritdoc />
+        public async Task<WebCallResult<IEnumerable<BingXKline>>> GetKlinesAsync(string symbol, KlineInterval interval, DateTime? startTime = null, DateTime? endTime = null, int? limit = null, CancellationToken ct = default)
+        {
+            var parameters = new ParameterCollection
+            {
+                { "symbol", symbol },
+                { "interval", EnumConverter.GetString(interval) }
+            };
+            parameters.AddOptionalMilliseconds("startTime", startTime);
+            parameters.AddOptionalMilliseconds("endTime", endTime);
+            parameters.AddOptional("limit", limit);
+            return await _baseClient.SendRequestInternal<IEnumerable<BingXKline>>(_baseClient.GetUri("/openApi/spot/v1/market/kline"), HttpMethod.Get, ct, parameters).ConfigureAwait(false);
+        }
+
+        #endregion
     }
 }