basic order(lim/mark/ib) entry/deletion working
This commit is contained in:
1 parent
62c20c96b4
commit
fdbc64dfc5
7 files changed
+300
-31
No files matched your search
@@ -15,6 +15,7 @@ namespace Spark.Api.Orders {
|
||||
using System;
|
||||
using System.Reactive.Concurrency;
|
||||
using System.Reactive.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
public class OrdersClient : IDisposable {
|
||||
readonly IObservable<TableUpdate<OrderRecordTuple, uint>> _orders;
|
||||
@@ -22,6 +23,7 @@ namespace Spark.Api.Orders {
|
||||
readonly IObservable<TableUpdate<FillTuple, string>> _fills;
|
||||
readonly IObservable<TableUpdate<ManualFillTuple, int>> _manual_fills;
|
||||
IDisposable? _dispose;
|
||||
readonly OrderService _order_service;
|
||||
|
||||
public OrdersClient(
|
||||
OrderService order_service,
|
||||
@@ -30,6 +32,7 @@ namespace Spark.Api.Orders {
|
||||
SecurityResolver sec_resolver,
|
||||
TimeSpan? interval = null
|
||||
) {
|
||||
_order_service = order_service;
|
||||
var scheduler = ThreadPoolScheduler.Instance;
|
||||
interval ??= TimeSpan.FromSeconds(0.1);
|
||||
var bootstraps = new DisposableBuilder();
|
||||
@@ -109,7 +112,38 @@ namespace Spark.Api.Orders {
|
||||
|
||||
_dispose = bootstraps;
|
||||
}
|
||||
public async Task<Response> TryEnterOrderAsync(
|
||||
OrderDefinition Order,
|
||||
double price, double quantity
|
||||
) {
|
||||
try {
|
||||
Result<Response> r = await _order_service.create_order_async(new Create {
|
||||
Quantity = (uint)Math.Floor(quantity),
|
||||
FractionalQuantity = new FractionalQuantity { Fraction = quantity - Math.Floor(quantity) },
|
||||
Price = price,
|
||||
NewOrder = Order
|
||||
|
||||
});
|
||||
return r.value;
|
||||
} catch {
|
||||
var r = new Response();
|
||||
r.ErrorCode = OrderError.Undefined;
|
||||
return r;
|
||||
}
|
||||
}
|
||||
public async Task<Response> TryDeleteOrderAsync(uint order_id
|
||||
) {
|
||||
try {
|
||||
var r = await _order_service.cancel_order_async(new Cancel {
|
||||
OrderKey = order_id
|
||||
});
|
||||
return r.value;
|
||||
} catch {
|
||||
var r = new Response();
|
||||
r.ErrorCode = OrderError.Undefined;
|
||||
return r;
|
||||
}
|
||||
}
|
||||
public IObservable<TableUpdate<OrderRecordTuple, uint>> orders(
|
||||
OrdersSubscriptionFilter? filter = null) =>
|
||||
filter is null ? _orders : _orders.Filter(filter.includes);
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace bts.websocket_core {
|
||||
public UniqueID() {
|
||||
Id = Guid.NewGuid();
|
||||
}
|
||||
public UniqueID(uint id) {
|
||||
public UniqueID(ulong id) {
|
||||
Id = id;
|
||||
}
|
||||
public UniqueID(string id) {
|
||||
|
||||
@@ -238,8 +238,12 @@ namespace bts.websocket_core {
|
||||
handle_unsubscribe_all(req.client_id);
|
||||
break;
|
||||
}
|
||||
case WebsocketRequest.REQUEST_TYPES.POST: {
|
||||
handle_post(req);
|
||||
case WebsocketRequest.REQUEST_TYPES.ENTER_ORDER: {
|
||||
handle_enter_order(req);
|
||||
break;
|
||||
}
|
||||
case WebsocketRequest.REQUEST_TYPES.DELETE_ORDER: {
|
||||
handle_delete_order(req);
|
||||
break;
|
||||
}
|
||||
case WebsocketRequest.REQUEST_TYPES.UNKOWN: {
|
||||
@@ -256,21 +260,27 @@ namespace bts.websocket_core {
|
||||
System.Console.WriteLine("error for req", client_id, ex.ToString());
|
||||
}
|
||||
}
|
||||
public void handle_post(WebsocketRequest req) {
|
||||
WebsocketSubscriptionHandler? hdlr;
|
||||
string status;
|
||||
if (!WebsocketSubscriptionHandler.TryCreate(
|
||||
req,
|
||||
Md_Client,
|
||||
Orders_Client,
|
||||
obj => send_message(obj, req.client_id),
|
||||
out hdlr,
|
||||
out status)) {
|
||||
public async void handle_delete_order(WebsocketRequest req) {
|
||||
(bool suc, string status) = await WebsocketRestHandler.DeleteOrderAsync(req, Orders_Client);
|
||||
if (!suc) {
|
||||
handle_incorrect_request(req, status);
|
||||
return;
|
||||
}
|
||||
handle_correct_request(req, status);
|
||||
hdlr.subscribe();
|
||||
// handle_correct_request(req, status);
|
||||
handle_correct_request((ulong)req.id.Id, status, null, req.client_id);
|
||||
// hdlr.subscribe();
|
||||
// Clients[req.client_id] = Clients[req.client_id].Add(req.id, hdlr);
|
||||
}
|
||||
public async void handle_enter_order(WebsocketRequest req) {
|
||||
(bool suc, uint? id, string status) = await WebsocketRestHandler.EnterOrderAsync(req, Orders_Client);
|
||||
if (!suc) {
|
||||
handle_incorrect_request(req, status);
|
||||
return;
|
||||
}
|
||||
// handle_correct_request(req, status);
|
||||
handle_correct_request((ulong)req.id.Id, status, new { order_key = id }, req.client_id);
|
||||
// hdlr.subscribe();
|
||||
// Clients[req.client_id] = Clients[req.client_id].Add(req.id, hdlr);
|
||||
}
|
||||
public void handle_subscription(WebsocketRequest req) {
|
||||
WebsocketSubscriptionHandler? hdlr;
|
||||
@@ -285,16 +295,40 @@ namespace bts.websocket_core {
|
||||
handle_incorrect_request(req, status);
|
||||
return;
|
||||
}
|
||||
handle_correct_request(req, status);
|
||||
handle_correct_request((ulong)req.id.Id, status, new { hdlr.ID }, req.client_id);
|
||||
hdlr.subscribe();
|
||||
Clients[req.client_id] = Clients[req.client_id].Add(req.id, hdlr);
|
||||
}
|
||||
public void handle_incorrect_request(WebsocketRequest req, string message = "") => handle_incorrect_request(req.id, req.client_id, message);
|
||||
public void handle_incorrect_request(WebsocketRequestID? rid, WebsocketClientID cid, string message = "") {
|
||||
System.Console.WriteLine($"request {rid} from {cid} failed, message: {message}");
|
||||
var ms = new {
|
||||
jsonrpc = 2.0,
|
||||
id = rid,
|
||||
error = message
|
||||
};
|
||||
send_message(ms, cid);
|
||||
}
|
||||
public void handle_correct_request(WebsocketRequest req, string message = "") {
|
||||
public void handle_correct_request(WebsocketRequest req, Object message) {
|
||||
System.Console.WriteLine($"request {req.id} from {req.client_id} suceeded, message: {message}");
|
||||
var ms = new {
|
||||
jsonrpc = 2.0,
|
||||
id = req.id,
|
||||
status = message
|
||||
};
|
||||
send_message(ms, req.client_id);
|
||||
// Gateway.send_to_clients(
|
||||
// new List<WebsocketOutgoingMessage>() { new WebsocketOutgoingMessage(receiver_client_id: req.sender_client_id, message.message_body + " RECIEVED") });
|
||||
}
|
||||
public void handle_correct_request(ulong message_id, string status, Object? data, WebsocketClientID cid) {
|
||||
System.Console.WriteLine($"request {message_id} from {cid} suceeded, message: {status}");
|
||||
var ms = new {
|
||||
jsonrpc = 2.0,
|
||||
id = message_id,
|
||||
status = status,
|
||||
result = data
|
||||
};
|
||||
send_message(ms, cid);
|
||||
// Gateway.send_to_clients(
|
||||
// new List<WebsocketOutgoingMessage>() { new WebsocketOutgoingMessage(receiver_client_id: req.sender_client_id, message.message_body + " RECIEVED") });
|
||||
}
|
||||
|
||||
@@ -57,6 +57,13 @@ namespace bts.websocket_core {
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct StringWrapper {
|
||||
public string Val { get; }
|
||||
public StringWrapper(string v) {
|
||||
Val = v;
|
||||
}
|
||||
|
||||
}
|
||||
public static bool TryParse<T>(JObject filter, string key, out T[]? list, out string error) where T : struct {
|
||||
T[] values = new T[] { };
|
||||
list = null;
|
||||
@@ -93,10 +100,18 @@ namespace bts.websocket_core {
|
||||
obj = (T)(object)uin;
|
||||
return true;
|
||||
}
|
||||
if (typeof(T) == typeof(ulong) && ulong.TryParse(value, out var uin64)) {
|
||||
obj = (T)(object)uin64;
|
||||
return true;
|
||||
}
|
||||
if (typeof(T) == typeof(string)) {
|
||||
obj = (T)(object)value;
|
||||
return true;
|
||||
}
|
||||
if (typeof(T) == typeof(StringWrapper)) {
|
||||
obj = (T)(object)new StringWrapper(value);
|
||||
return true;
|
||||
}
|
||||
if (typeof(T) == typeof(ListWrapper) && ListWrapper.TryParse(value, out var l)) {
|
||||
obj = (T)(object)l;
|
||||
return true;
|
||||
|
||||
@@ -10,7 +10,8 @@ namespace bts.websocket_core {
|
||||
SUBSCRIBE = 1,
|
||||
UNSUBSCRIBE_ALL,
|
||||
UNSUBSCRIBE,
|
||||
POST,
|
||||
ENTER_ORDER,
|
||||
DELETE_ORDER,
|
||||
DELETE,
|
||||
PATCH,
|
||||
UNKOWN = 0
|
||||
@@ -20,28 +21,23 @@ namespace bts.websocket_core {
|
||||
public readonly WebsocketClientID client_id;
|
||||
public readonly JObject parameters;
|
||||
public readonly REQUEST_TYPES type;
|
||||
public static bool TryParse<T>(JObject filter, string key, out T? obj, [NotNullWhen(false)] out string error) where T : struct {
|
||||
obj = null;
|
||||
var value = filter.GetValueOrDefault(key)?.ToString();
|
||||
if (value == null) {
|
||||
error = $"{key} not present";
|
||||
return true;
|
||||
}
|
||||
return WebsocketJsonParsers.TryParse<T>(value, key, out obj, out error);
|
||||
|
||||
}
|
||||
private static bool TryParseJson(string json, out REQUEST_TYPES type, [NotNullWhen(true)] out JObject? para, [NotNullWhen(false)] out string message) {
|
||||
private static bool TryParseJson(string json, [NotNullWhen(true)] out ulong? _message_id, out REQUEST_TYPES type, [NotNullWhen(true)] out JObject? para, [NotNullWhen(false)] out string message) {
|
||||
para = null;
|
||||
type = REQUEST_TYPES.UNKOWN;
|
||||
JObject request;
|
||||
_message_id = null;
|
||||
try {
|
||||
request = JObject.Parse(json);
|
||||
} catch (Newtonsoft.Json.JsonReaderException ex) {
|
||||
message = $"Incorrect Json: {ex.Path}";
|
||||
return false;
|
||||
}
|
||||
if (!WebsocketJsonParsers.TryParse<ulong>(request, "id", out _message_id, out message) || _message_id == null) {
|
||||
return false;
|
||||
}
|
||||
REQUEST_TYPES? rt;
|
||||
if (!TryParse<REQUEST_TYPES>(request, "method", out rt, out message)) {
|
||||
if (!WebsocketJsonParsers.TryParse<REQUEST_TYPES>(request, "method", out rt, out message)) {
|
||||
return false;
|
||||
}
|
||||
type = rt ?? REQUEST_TYPES.UNKOWN;
|
||||
@@ -51,8 +47,8 @@ namespace bts.websocket_core {
|
||||
public static bool TryGetWebSocketRequest(WebsocketClientID cid, string json, [NotNullWhen(true)] out WebsocketRequest? wr, out string message) {
|
||||
JObject? jobj;
|
||||
REQUEST_TYPES rt;
|
||||
if (TryParseJson(json, out rt, out jobj, out message)) {
|
||||
wr = new WebsocketRequest(cid, new WebsocketRequestID(), jobj, rt);
|
||||
if (TryParseJson(json, out ulong? _message_id, out rt, out jobj, out message)) {
|
||||
wr = new WebsocketRequest(cid, new WebsocketRequestID((ulong)_message_id), jobj, rt);
|
||||
return true;
|
||||
}
|
||||
wr = null;
|
||||
|
||||
@@ -5,5 +5,11 @@ using System.Reflection;
|
||||
namespace bts.websocket_core {
|
||||
// Represents a unique client, a little redundant
|
||||
public class WebsocketRequestID : UniqueID {
|
||||
|
||||
public WebsocketRequestID(ulong id) : base(id) {
|
||||
|
||||
}
|
||||
public WebsocketRequestID(string id) : base(id) {
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,184 @@
|
||||
namespace bts.websocket_core {
|
||||
using bts.api;
|
||||
using bts.api.admin;
|
||||
using bts.api.orderman;
|
||||
using bts.md;
|
||||
|
||||
using mbts.spark;
|
||||
|
||||
using Newtonsoft.Json.Linq;
|
||||
|
||||
using Spark.Api.MarketData;
|
||||
using Spark.Api.Orders;
|
||||
|
||||
using System;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
|
||||
public class WebsocketRestHandler {
|
||||
// readonly static Lazy<AdminService> _admin = new Lazy<AdminService>(() => Locator.locate<AdminService>(), true);
|
||||
|
||||
private static bool TryGetOrderDef(WebsocketRequest req, [NotNullWhen(true)] out OrderDefinition? def, out string message) {
|
||||
def = null;
|
||||
if (req.parameters == null) {
|
||||
message = "parameters not present";
|
||||
return false;
|
||||
}
|
||||
WebsocketJsonParsers.StringWrapper? account;
|
||||
if (!WebsocketJsonParsers.TryParse<WebsocketJsonParsers.StringWrapper>(req.parameters, "account", out account, out message) || account == null || (account?.Val == "")) {
|
||||
return false;
|
||||
}
|
||||
uint? key;
|
||||
if (!WebsocketJsonParsers.TryParse<uint>(req.parameters, "security_key", out key, out message) || key == null) {
|
||||
return false;
|
||||
}
|
||||
uint? account_id;
|
||||
if (!WebsocketJsonParsers.TryParse<uint>(req.parameters, "account_id", out account_id, out message) || account_id == null) {
|
||||
return false;
|
||||
}
|
||||
Side? side;
|
||||
if (!WebsocketJsonParsers.TryParse<Side>(req.parameters, "side", out side, out message) || side == null) {
|
||||
return false;
|
||||
}
|
||||
CustomOrderDefinition.CustomOneofCase? order_type;
|
||||
if (!WebsocketJsonParsers.TryParse<CustomOrderDefinition.CustomOneofCase>(req.parameters, "order_type", out order_type, out message) || order_type == null) {
|
||||
return false;
|
||||
}
|
||||
JObject? custom = req.parameters["custom"] as JObject;
|
||||
CustomOrderDefinition customdef;
|
||||
switch (order_type) {
|
||||
case CustomOrderDefinition.CustomOneofCase.Limit: {
|
||||
customdef = new CustomOrderDefinition() {
|
||||
Limit = new LimitOrderDefinition()
|
||||
};
|
||||
break;
|
||||
}
|
||||
case CustomOrderDefinition.CustomOneofCase.Iceberg: {
|
||||
if (custom == null) {
|
||||
message = "custom not present";
|
||||
return false;
|
||||
}
|
||||
double? sq;
|
||||
if (!WebsocketJsonParsers.TryParse<double>(custom, "show_quantity", out sq, out message) || sq == null) {
|
||||
return false;
|
||||
}
|
||||
customdef = new CustomOrderDefinition() {
|
||||
Iceberg = new IcebergOrderDefinition() {
|
||||
ShowQuantity = (double)sq,
|
||||
Child = new CustomOrderDefinition() {
|
||||
Limit = new LimitOrderDefinition()
|
||||
}
|
||||
}
|
||||
};
|
||||
break;
|
||||
}
|
||||
// case CustomOrderDefinition.CustomOneofCase.Cover: {
|
||||
// if (custom == null) {
|
||||
// message = "custom not present";
|
||||
// return false;
|
||||
// }
|
||||
// double? sq;
|
||||
// if (!WebsocketJsonParsers.TryParse<double>(custom, "show_quantity", out sq, out message) || sq == null) {
|
||||
// return false;
|
||||
// }
|
||||
// customdef = new CustomOrderDefinition() {
|
||||
// Iceberg = new CoverOrderDefinition() {
|
||||
// ShowQuantity = (double)sq,
|
||||
// Child = new CustomOrderDefinition() {
|
||||
// Limit = new LimitOrderDefinition()
|
||||
// }
|
||||
// }
|
||||
// };
|
||||
// break;
|
||||
// }
|
||||
case CustomOrderDefinition.CustomOneofCase.Market: {
|
||||
customdef = new CustomOrderDefinition() {
|
||||
Market = new MarketOrderDefinition()
|
||||
};
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
message = "order_type not correct";
|
||||
return false;
|
||||
}
|
||||
};
|
||||
WebsocketJsonParsers.StringWrapper? exchange_securty_name;
|
||||
if (!WebsocketJsonParsers.TryParse<WebsocketJsonParsers.StringWrapper>(req.parameters, "exchange_securty_name", out exchange_securty_name, out message) || exchange_securty_name == null) {
|
||||
return false;
|
||||
}
|
||||
Venue? exchanges;
|
||||
if (!WebsocketJsonParsers.TryParse<Venue>(req.parameters, "venue", out exchanges, out message) || exchanges == null) {
|
||||
return false;
|
||||
}
|
||||
// uint32 security_key = 1;
|
||||
// api.Side side = 2;
|
||||
// string user = 5;
|
||||
// uint32 user_id = 13;
|
||||
// string account = 6;
|
||||
// uint32 account_id = 14;
|
||||
// TimeInForce time_in_force = 7;
|
||||
// ManualOrderIndicator manual_order_indicator = 8;
|
||||
// CTICode cti_code = 9;
|
||||
// CustomerOrFirm customer_or_firm = 10;
|
||||
// OrderSubType sub_type = 12;
|
||||
// uint32 attach_target_order_key = 16;
|
||||
// CustomSOrderDefinition custom_def = 11
|
||||
// var admin = _admin.Value.get_admin_data(new VoidMessage());
|
||||
// BTSUser user = admin.Users.FirstOrDefault(x => username != null ? x.Name.ToLowerInvariant() == username.ToLowerInvariant() : true);
|
||||
def = new OrderDefinition {
|
||||
TimeInForce = TimeInForce.Gtc,
|
||||
SecurityKey = (uint)key,
|
||||
Side = (Side)side,
|
||||
UserId = 1,
|
||||
User = "bts",
|
||||
AccountId = (uint)account_id,
|
||||
Account = account?.Val,
|
||||
CustomDef = customdef
|
||||
};
|
||||
return true;
|
||||
}
|
||||
public static async Task<(bool success, string status)> DeleteOrderAsync(WebsocketRequest req, OrdersClient oc) {
|
||||
if (req.parameters == null) {
|
||||
return (false, "parameters not present");
|
||||
}
|
||||
if (!WebsocketJsonParsers.TryParse<uint>(req.parameters, "order_id", out uint? key, out string status) || key == null) {
|
||||
return (false, status);
|
||||
}
|
||||
Response res = await oc.TryDeleteOrderAsync((uint)key);
|
||||
status = res.ErrorCode.ToString();
|
||||
return (res.ErrorCode != OrderError.Ok, status);
|
||||
}
|
||||
public static async Task<(bool success, uint? orderId, string status)> EnterOrderAsync(
|
||||
WebsocketRequest request, OrdersClient ordersClient) {
|
||||
double? quantity = null;
|
||||
double? price = null;
|
||||
OrderDefinition? orderDefinition = null;
|
||||
uint? orderId = null;
|
||||
string status = string.Empty;
|
||||
|
||||
if (!WebsocketJsonParsers.TryParse(request.parameters, "quantity", out quantity, out status) || quantity == null) {
|
||||
return (false, null, status);
|
||||
}
|
||||
|
||||
if (!WebsocketJsonParsers.TryParse(request.parameters, "price", out price, out status) || price == null) {
|
||||
return (false, null, status);
|
||||
}
|
||||
|
||||
if (!TryGetOrderDef(request, out orderDefinition, out status)) {
|
||||
return (false, null, status);
|
||||
}
|
||||
|
||||
var result = await ordersClient.TryEnterOrderAsync(orderDefinition, (uint)price, (double)quantity);
|
||||
|
||||
if (result.ErrorCode != OrderError.Ok) {
|
||||
return (false, null, result.ErrorCode.ToString());
|
||||
}
|
||||
|
||||
orderId = result.OrderKey;
|
||||
status = result.ErrorCode.ToString();
|
||||
|
||||
return (true, orderId, status);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user