refactor: Remove spark api server dependency on SecurityMD

This is part of a larger effort to decouple the api server from spark grpc
(protobuf) services
This commit is contained in:
John Colvin committed 2025-12-05 15:56:23 +00:00
1 parent e0e9989eda
commit 3dcde6d089
6 files changed
+30 -16

No files matched your search

@@ -0,0 +1,13 @@
#nullable enable
namespace Spark.Api.MarketData;
using bts.api;
using bts.api.core;
using System;
public interface ISecurityResolver {
IObservable<Update<(SecurityImmutable? Security, T Value), TKey>> Resolve<T, TKey>(
IObservable<Update<T, TKey>> source,
Func<T, uint> getSecurityId) where TKey : IEquatable<TKey>;
}
+2 -1
View File
@@ -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;
@@ -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<security_key, SecurityImmutable> _live_securities;
@@ -177,6 +178,10 @@ namespace Spark.Api.Reactive {
state.Values, added, changes, removed, key_extractor);
}
IObservable<Update<(SecurityImmutable?, T), TKey>> ISecurityResolver.Resolve<T, TKey>(IObservable<Update<T, TKey>> source, Func<T, uint> getSecurityId) =>
join(source, getSecurityId);
public IObservable<TOut> join<TIn, T, TKey, TOut>(
IObservable<TIn> source,
Func<T, security_key> skeyfn,
@@ -310,8 +315,8 @@ namespace Spark.Api.Reactive {
.SelectKeyValue(tup => result_selector(tup.val, tup.sec), TResult.key_fn);
public static IObservable<Update<(SecurityImmutable? sec, T val), TKey>>
join<T, TKey>(this IObservable<Update<T, TKey>> source, SecurityResolver store, Func<T, security_key> skeyfn) where TKey : IEquatable<TKey> {
return store.join(source, skeyfn);
join<T, TKey>(this IObservable<Update<T, TKey>> source, ISecurityResolver store, Func<T, security_key> skeyfn) where TKey : IEquatable<TKey> {
return store.Resolve(source, skeyfn);
}
public static IObservable<TableUpdate<(SecurityImmutable? sec, T val), TKey>>
@@ -48,6 +48,7 @@ public static class SparkApiServices {
if (configurationSection.GetValue("EnableOrders", true)) {
services.AddSparkdService<OrderService>();
services.TryAddSingleton<SecurityResolver>();
services.AddSingleton<ISecurityResolver, SecurityResolver>(sp => sp.GetRequiredService<SecurityResolver>());
services.AddSingleton<OrdersClient>();
}
if (configurationSection.GetValue("EnablePosition", true)) {
@@ -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;
/// <summary>
@@ -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<AdminService>();
@@ -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<OrderService>();
var position_service = _service_ctx.GetService<PositionService>();
@@ -210,9 +206,8 @@ namespace bts.websocket_core {
var admin_client = new AdminClient(admin_service, UserTuple.admin);
var md_relay = _service_ctx.GetService<MarketDataRelay>();
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
@@ -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<IDataStreamFactory> streamFactories,
ILogger<SparkApiWebSocketServer> 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);
}