Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ba5fff0168 |
No files matched your search
@@ -8,6 +8,7 @@ using bts.api.core;
|
|||||||
using bts.api.orderman;
|
using bts.api.orderman;
|
||||||
using bts.api.position;
|
using bts.api.position;
|
||||||
using bts.co2;
|
using bts.co2;
|
||||||
|
using bts.metrics;
|
||||||
using bts.md;
|
using bts.md;
|
||||||
|
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
@@ -86,6 +87,7 @@ public static class SparkApiServices {
|
|||||||
services.AddSparkdService<OrderService>();
|
services.AddSparkdService<OrderService>();
|
||||||
services.AddSingleton<IOrdersClient, OrdersClient>();
|
services.AddSingleton<IOrdersClient, OrdersClient>();
|
||||||
}
|
}
|
||||||
|
services.AddSparkdService<ShellLatencyService>();
|
||||||
if (configurationSection.GetValue("EnablePosition", true)) {
|
if (configurationSection.GetValue("EnablePosition", true)) {
|
||||||
services.TryAddSingleton<ISecurityResolver>(ActivatorUtilities.GetServiceOrCreateInstance<PassiveSecurityResolver>);
|
services.TryAddSingleton<ISecurityResolver>(ActivatorUtilities.GetServiceOrCreateInstance<PassiveSecurityResolver>);
|
||||||
services.AddSparkdService<PositionService>()
|
services.AddSparkdService<PositionService>()
|
||||||
@@ -176,6 +178,7 @@ public static class SparkApiServices {
|
|||||||
services.AddSparkdService<OrderService>();
|
services.AddSparkdService<OrderService>();
|
||||||
services.AddSingleton<IOrdersClient, OrdersClient>();
|
services.AddSingleton<IOrdersClient, OrdersClient>();
|
||||||
}
|
}
|
||||||
|
services.AddSparkdService<ShellLatencyService>();
|
||||||
if (isPositionsEnabled) {
|
if (isPositionsEnabled) {
|
||||||
services.AddSparkdService<PositionService>();
|
services.AddSparkdService<PositionService>();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ namespace Bts.Spark.Sdk;
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.api.core;
|
using bts.api.core;
|
||||||
using bts.api.orderman;
|
using bts.api.orderman;
|
||||||
|
using bts.metrics;
|
||||||
|
|
||||||
using global::Spark.Api.Admin;
|
using global::Spark.Api.Admin;
|
||||||
using global::Spark.Api.MarketData;
|
using global::Spark.Api.MarketData;
|
||||||
@@ -28,6 +29,7 @@ public class AuthenticatedSimpleSparkClient : ISimpleSparkClient, IHostedService
|
|||||||
readonly IOrdersClient ordersClient;
|
readonly IOrdersClient ordersClient;
|
||||||
readonly IAdminClient adminClient;
|
readonly IAdminClient adminClient;
|
||||||
readonly ISecurityResolver securityResolver;
|
readonly ISecurityResolver securityResolver;
|
||||||
|
readonly ShellLatencyService shellLatencyService;
|
||||||
readonly ISparkLoginService loginService;
|
readonly ISparkLoginService loginService;
|
||||||
readonly SimpleSparkClientConfig config;
|
readonly SimpleSparkClientConfig config;
|
||||||
readonly ILogger<AuthenticatedSimpleSparkClient> logger;
|
readonly ILogger<AuthenticatedSimpleSparkClient> logger;
|
||||||
@@ -39,6 +41,7 @@ public class AuthenticatedSimpleSparkClient : ISimpleSparkClient, IHostedService
|
|||||||
IOrdersClient ordersClient,
|
IOrdersClient ordersClient,
|
||||||
IAdminClient adminClient,
|
IAdminClient adminClient,
|
||||||
ISecurityResolver securityResolver,
|
ISecurityResolver securityResolver,
|
||||||
|
ShellLatencyService shellLatencyService,
|
||||||
ISparkLoginService loginService,
|
ISparkLoginService loginService,
|
||||||
IOptions<SimpleSparkClientConfig> config,
|
IOptions<SimpleSparkClientConfig> config,
|
||||||
ILogger<AuthenticatedSimpleSparkClient> logger) {
|
ILogger<AuthenticatedSimpleSparkClient> logger) {
|
||||||
@@ -46,6 +49,7 @@ public class AuthenticatedSimpleSparkClient : ISimpleSparkClient, IHostedService
|
|||||||
this.ordersClient = ordersClient;
|
this.ordersClient = ordersClient;
|
||||||
this.adminClient = adminClient;
|
this.adminClient = adminClient;
|
||||||
this.securityResolver = securityResolver;
|
this.securityResolver = securityResolver;
|
||||||
|
this.shellLatencyService = shellLatencyService;
|
||||||
this.loginService = loginService;
|
this.loginService = loginService;
|
||||||
this.config = config.Value;
|
this.config = config.Value;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
@@ -61,7 +65,7 @@ public class AuthenticatedSimpleSparkClient : ISimpleSparkClient, IHostedService
|
|||||||
}
|
}
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
var user = loginRes.user.Value;
|
var user = loginRes.user.Value;
|
||||||
simpleClient = new(user.name, user.id, mdClient, ordersClient, adminClient, securityResolver, config.OrderPoolCapacity, config.OrderPoolReplenishInterval);
|
simpleClient = new(user.name, user.id, mdClient, ordersClient, shellLatencyService, adminClient, securityResolver, config.OrderPoolCapacity, config.OrderPoolReplenishInterval);
|
||||||
simpleClientSubject.OnNext(simpleClient);
|
simpleClientSubject.OnNext(simpleClient);
|
||||||
logger.LogInformation("SimpleSparkClient started");
|
logger.LogInformation("SimpleSparkClient started");
|
||||||
}
|
}
|
||||||
@@ -97,6 +101,9 @@ public class AuthenticatedSimpleSparkClient : ISimpleSparkClient, IHostedService
|
|||||||
public IObservable<TableUpdate<PriceTicker, uint>> PriceTicker(SecurityCriteria? securityCriteria) =>
|
public IObservable<TableUpdate<PriceTicker, uint>> PriceTicker(SecurityCriteria? securityCriteria) =>
|
||||||
simpleClient?.PriceTicker(securityCriteria) ?? simpleClientSubject.Take(1).Select(c => c.PriceTicker(securityCriteria)).FlattenSeries();
|
simpleClient?.PriceTicker(securityCriteria) ?? simpleClientSubject.Take(1).Select(c => c.PriceTicker(securityCriteria)).FlattenSeries();
|
||||||
|
|
||||||
|
public Task<bool> PingAsync() =>
|
||||||
|
simpleClient?.PingAsync() ?? pingBeforeStartAsync();
|
||||||
|
|
||||||
public Task<Response> CreateOrder(OrderDefinition orderDef, double quantity, double price) =>
|
public Task<Response> CreateOrder(OrderDefinition orderDef, double quantity, double price) =>
|
||||||
orderOp(cli => cli.CreateOrder(orderDef, quantity, price));
|
orderOp(cli => cli.CreateOrder(orderDef, quantity, price));
|
||||||
|
|
||||||
@@ -134,4 +141,15 @@ public class AuthenticatedSimpleSparkClient : ISimpleSparkClient, IHostedService
|
|||||||
async Task<T> LateImpl() =>
|
async Task<T> LateImpl() =>
|
||||||
await op(await simpleClientSubject.FirstAsync());
|
await op(await simpleClientSubject.FirstAsync());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async Task<bool> pingBeforeStartAsync() {
|
||||||
|
var request = new BufferMessage() {
|
||||||
|
Sequence = (ulong)DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
|
||||||
|
Data = "spark-sdk-ping"
|
||||||
|
};
|
||||||
|
var result = await shellLatencyService.ping_async(request);
|
||||||
|
return result.success &&
|
||||||
|
result.value.Sequence == request.Sequence &&
|
||||||
|
result.value.Data == request.Data;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -48,6 +48,9 @@ public class ExecutionFacadeSimpleSparkClient : ISimpleSparkClient {
|
|||||||
public IObservable<TableUpdate<PriceTicker, uint>> PriceTicker(SecurityCriteria? securityCriteria) =>
|
public IObservable<TableUpdate<PriceTicker, uint>> PriceTicker(SecurityCriteria? securityCriteria) =>
|
||||||
sparkClient.PriceTicker(securityCriteria);
|
sparkClient.PriceTicker(securityCriteria);
|
||||||
|
|
||||||
|
public Task<bool> PingAsync() =>
|
||||||
|
sparkClient.PingAsync();
|
||||||
|
|
||||||
public Task<Response> CreateOrder(OrderDefinition orderDef, double quantity, double price) {
|
public Task<Response> CreateOrder(OrderDefinition orderDef, double quantity, double price) {
|
||||||
logger.LogInformation("CreateOrder {account} {tag} {securityId} {side} {quantity} @ {price}", orderDef.Account, orderDef.Tag, orderDef.SecurityKey, orderDef.Side, quantity, price);
|
logger.LogInformation("CreateOrder {account} {tag} {securityId} {side} {quantity} @ {price}", orderDef.Account, orderDef.Tag, orderDef.SecurityKey, orderDef.Side, quantity, price);
|
||||||
return Task.FromResult(facadeResponse());
|
return Task.FromResult(facadeResponse());
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ using mbts.spark;
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
public interface ISimpleSparkClient {
|
public interface ISimpleSparkClient {
|
||||||
|
Task<bool> PingAsync();
|
||||||
|
|
||||||
// Market Data
|
// Market Data
|
||||||
IObservable<TableUpdate<SecurityImmutable, uint>> Securities(SecurityCriteria? securityCriteria);
|
IObservable<TableUpdate<SecurityImmutable, uint>> Securities(SecurityCriteria? securityCriteria);
|
||||||
IObservable<TableUpdate<BookRecord, uint>> Books(SecurityCriteria? securityCriteria);
|
IObservable<TableUpdate<BookRecord, uint>> Books(SecurityCriteria? securityCriteria);
|
||||||
|
|||||||
@@ -16,12 +16,14 @@ using global::Spark.Core.Disposables;
|
|||||||
using global::Spark.Core.Reactive;
|
using global::Spark.Core.Reactive;
|
||||||
|
|
||||||
using mbts.spark;
|
using mbts.spark;
|
||||||
|
using bts.metrics;
|
||||||
|
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
|
|
||||||
public class SimpleSparkClient : ISimpleSparkClient, IDisposable {
|
public class SimpleSparkClient : ISimpleSparkClient, IDisposable {
|
||||||
readonly IMarketDataClient mdClient;
|
readonly IMarketDataClient mdClient;
|
||||||
readonly IOrdersClient ordersClient;
|
readonly IOrdersClient ordersClient;
|
||||||
|
readonly ShellLatencyService shellLatencyService;
|
||||||
readonly OrderPool limitOrderPool;
|
readonly OrderPool limitOrderPool;
|
||||||
readonly OrderPool marketOrderPool;
|
readonly OrderPool marketOrderPool;
|
||||||
readonly TableUpdateDemuxer<OrderRecordTupleWithRoot, uint, uint> orderSecurityDmx;
|
readonly TableUpdateDemuxer<OrderRecordTupleWithRoot, uint, uint> orderSecurityDmx;
|
||||||
@@ -46,6 +48,7 @@ public class SimpleSparkClient : ISimpleSparkClient, IDisposable {
|
|||||||
uint userId,
|
uint userId,
|
||||||
IMarketDataClient mdClient,
|
IMarketDataClient mdClient,
|
||||||
IOrdersClient ordersClient,
|
IOrdersClient ordersClient,
|
||||||
|
ShellLatencyService shellLatencyService,
|
||||||
IAdminClient adminClient,
|
IAdminClient adminClient,
|
||||||
ISecurityResolver securityResolver,
|
ISecurityResolver securityResolver,
|
||||||
int orderPoolCapacity,
|
int orderPoolCapacity,
|
||||||
@@ -53,6 +56,7 @@ public class SimpleSparkClient : ISimpleSparkClient, IDisposable {
|
|||||||
) {
|
) {
|
||||||
this.mdClient = mdClient;
|
this.mdClient = mdClient;
|
||||||
this.ordersClient = ordersClient;
|
this.ordersClient = ordersClient;
|
||||||
|
this.shellLatencyService = shellLatencyService;
|
||||||
limitOrderPool = new(orderPoolCapacity, () => new() { User = userName, UserId = userId, TimeInForce = TimeInForce.Gtc, CustomDef = new() { Limit = new() } });
|
limitOrderPool = new(orderPoolCapacity, () => new() { User = userName, UserId = userId, TimeInForce = TimeInForce.Gtc, CustomDef = new() { Limit = new() } });
|
||||||
marketOrderPool = new(orderPoolCapacity, () => new() { User = userName, UserId = userId, TimeInForce = TimeInForce.Gtc, CustomDef = new() { Market = new() } });
|
marketOrderPool = new(orderPoolCapacity, () => new() { User = userName, UserId = userId, TimeInForce = TimeInForce.Gtc, CustomDef = new() { Market = new() } });
|
||||||
orderSecurityDmx = new TableUpdateDemuxer<OrderRecordTupleWithRoot, uint, uint>(o => o.order.order.Key, o => o.security_id);
|
orderSecurityDmx = new TableUpdateDemuxer<OrderRecordTupleWithRoot, uint, uint>(o => o.order.order.Key, o => o.security_id);
|
||||||
@@ -140,6 +144,17 @@ public class SimpleSparkClient : ISimpleSparkClient, IDisposable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<bool> PingAsync() {
|
||||||
|
var request = new BufferMessage() {
|
||||||
|
Sequence = (ulong)DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
|
||||||
|
Data = "spark-sdk-ping"
|
||||||
|
};
|
||||||
|
var result = await shellLatencyService.ping_async(request);
|
||||||
|
return result.success &&
|
||||||
|
result.value.Sequence == request.Sequence &&
|
||||||
|
result.value.Data == request.Data;
|
||||||
|
}
|
||||||
|
|
||||||
public IObservable<TableUpdate<BookRecord, uint>> Books(SecurityCriteria? securityCriteria) {
|
public IObservable<TableUpdate<BookRecord, uint>> Books(SecurityCriteria? securityCriteria) {
|
||||||
var booksSource = this.booksSource;
|
var booksSource = this.booksSource;
|
||||||
var secFilter = securityCriteria?.ToPredicate();
|
var secFilter = securityCriteria?.ToPredicate();
|
||||||
|
|||||||
Reference in new issue
Block a user