diff --git a/src/client/spark_api/MarketData/ISecurityResolver.cs b/src/client/spark_api/MarketData/ISecurityResolver.cs new file mode 100644 index 000000000..718a7cc8e --- /dev/null +++ b/src/client/spark_api/MarketData/ISecurityResolver.cs @@ -0,0 +1,13 @@ +#nullable enable +namespace Spark.Api.MarketData; + +using bts.api; +using bts.api.core; + +using System; + +public interface ISecurityResolver { + IObservable> Resolve( + IObservable> source, + Func getSecurityId) where TKey : IEquatable; +} diff --git a/src/client/spark_api/Orders/OrdersClient.cs b/src/client/spark_api/Orders/OrdersClient.cs index c56768469..10508440a 100644 --- a/src/client/spark_api/Orders/OrdersClient.cs +++ b/src/client/spark_api/Orders/OrdersClient.cs @@ -11,6 +11,7 @@ namespace Spark.Api.Orders { using mbts.spark; using Spark.Api.Admin; + using Spark.Api.MarketData; using Spark.Api.Reactive; using Spark.Core.Disposables; using Spark.Core.Reactive; @@ -34,7 +35,7 @@ namespace Spark.Api.Orders { OrderService order_service, PositionService position_service, AdminClient admin_client, - SecurityResolver sec_resolver, + ISecurityResolver sec_resolver, TimeSpan? interval = null ) { _order_service = order_service; diff --git a/src/client/spark_api/Reactive/SecurityResolver.cs b/src/client/spark_api/Reactive/SecurityResolver.cs index 1ce441a3d..bbb18e07f 100644 --- a/src/client/spark_api/Reactive/SecurityResolver.cs +++ b/src/client/spark_api/Reactive/SecurityResolver.cs @@ -7,6 +7,7 @@ using bts.md; using mbts; +using Spark.Api.MarketData; using Spark.Core.Disposables; using System; @@ -21,7 +22,7 @@ using System.Threading.Tasks; using security_key = System.UInt32; namespace Spark.Api.Reactive { - public class SecurityResolver : IDisposable { + public class SecurityResolver : ISecurityResolver, IDisposable { readonly MarketDataRelay _md; IDisposable _dispose; IReadOnlyDictionary _live_securities; @@ -177,6 +178,10 @@ namespace Spark.Api.Reactive { state.Values, added, changes, removed, key_extractor); } + + IObservable> ISecurityResolver.Resolve(IObservable> source, Func getSecurityId) => + join(source, getSecurityId); + public IObservable join( IObservable source, Func skeyfn, @@ -310,8 +315,8 @@ namespace Spark.Api.Reactive { .SelectKeyValue(tup => result_selector(tup.val, tup.sec), TResult.key_fn); public static IObservable> - join(this IObservable> source, SecurityResolver store, Func skeyfn) where TKey : IEquatable { - return store.join(source, skeyfn); + join(this IObservable> source, ISecurityResolver store, Func skeyfn) where TKey : IEquatable { + return store.Resolve(source, skeyfn); } public static IObservable> diff --git a/src/client/spark_api/Services/SparkApiServices.cs b/src/client/spark_api/Services/SparkApiServices.cs index af4684e76..f528d7a7a 100644 --- a/src/client/spark_api/Services/SparkApiServices.cs +++ b/src/client/spark_api/Services/SparkApiServices.cs @@ -48,6 +48,7 @@ public static class SparkApiServices { if (configurationSection.GetValue("EnableOrders", true)) { services.AddSparkdService(); services.TryAddSingleton(); + services.AddSingleton(sp => sp.GetRequiredService()); services.AddSingleton(); } if (configurationSection.GetValue("EnablePosition", true)) { diff --git a/src/client/spark_websocket/Core/WebsocketDataSync.cs b/src/client/spark_websocket/Core/WebsocketDataSync.cs index 8b35ec32b..4cdee61d6 100644 --- a/src/client/spark_websocket/Core/WebsocketDataSync.cs +++ b/src/client/spark_websocket/Core/WebsocketDataSync.cs @@ -14,9 +14,6 @@ namespace bts.websocket_core { using bts.api.synthetic; using Bts.DataStreamCore; using System.Diagnostics.CodeAnalysis; - using Spark.Api.Reactive; - using Spark.Api.Services; - using System.Reactive.Linq; /// @@ -26,12 +23,12 @@ namespace bts.websocket_core { public class WebsocketDataSync : IWebsocketDataSync { readonly AdminService adminService; readonly Spark.Api.IServiceProvider _service_ctx; - readonly IUserDataPermissions userDataPermissions; + readonly ISecurityResolver securityResolver; readonly IDataStreamFactory streamFactory; - public WebsocketDataSync(Spark.Api.IServiceProvider service_ctx, IMarketDataClient mdClient, IUserDataPermissions userDataPermissions, IDataStreamFactory streamFactory) { + public WebsocketDataSync(Spark.Api.IServiceProvider service_ctx, IMarketDataClient mdClient, ISecurityResolver securityResolver, IDataStreamFactory streamFactory) { _service_ctx = service_ctx; - this.userDataPermissions = userDataPermissions; + this.securityResolver = securityResolver; this.mdClient = mdClient; this.streamFactory = streamFactory; adminService = service_ctx.GetService(); @@ -201,7 +198,6 @@ namespace bts.websocket_core { public async Task initAsync(WebsocketConnectionGateway gtwy) { Gateway = gtwy; clients = new ClientsStore(); - MD_Source = new MDSource(userDataPermissions); _securities_sub = Md_Client.Securities().Subscribe(secTable => _securities = secTable.state); var order_service = _service_ctx.GetService(); var position_service = _service_ctx.GetService(); @@ -210,9 +206,8 @@ namespace bts.websocket_core { var admin_client = new AdminClient(admin_service, UserTuple.admin); var md_relay = _service_ctx.GetService(); var sec_table_src = mdClient.Securities(); - var sec_resolver = new SecurityResolver(md_relay, sec_table_src.Select(t => t.state)); Orders_Client = new OrdersClient( - order_service, position_service, admin_client, sec_resolver, TimeSpan.FromSeconds(0.1)); + order_service, position_service, admin_client, securityResolver, TimeSpan.FromSeconds(0.1)); var r = await Orders_Client.GetRegisteredDynamicOrderTypesAsync(); Dynamic_Descriptors = r .DynamicOrderDesc diff --git a/src/client/spark_websocket/Services/SparkApiWebSocketServer.cs b/src/client/spark_websocket/Services/SparkApiWebSocketServer.cs index b6032cd05..e5a50a329 100644 --- a/src/client/spark_websocket/Services/SparkApiWebSocketServer.cs +++ b/src/client/spark_websocket/Services/SparkApiWebSocketServer.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Spark.Api.MarketData; -using Spark.Api.Services; using System.Threading; using System.Threading.Tasks; @@ -22,12 +21,12 @@ public class SparkApiWebSocketServer : BackgroundService, ISparkApiWebSocketServ public SparkApiWebSocketServer( Api.IServiceProvider serviceProvider, IMarketDataClient mdClient, - IUserDataPermissions userDataPermissions, + ISecurityResolver securityResolver, IEnumerable streamFactories, ILogger logger ) { this.logger = logger; - dataSync = new(serviceProvider, mdClient, userDataPermissions, DataStreamFactory.Create(streamFactories)); + dataSync = new(serviceProvider, mdClient, securityResolver, DataStreamFactory.Create(streamFactories)); gateway = new(); gateway.init(dataSync); }