From d6c1285ada2b0d86abd6858df25d8bfc9d29285a Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 29 Nov 2018 14:55:09 -0500 Subject: [PATCH 01/45] SPARK-1901 Rename UserService->AuthService --- src/client/spark/Daemons/ShellServices.cs | 2 +- .../spark/core/Settings/UserPersistFactory.cs | 4 ++-- .../spark/view/Shell/Login/LoginModel.cs | 8 +++---- .../Shell/Workspaces/SettingsManagerTool.cs | 2 +- src/client/spark_api/api/ServiceContext.cs | 23 ++++++++++++++++--- src/client/spark_api/md/Authenticator.cs | 2 +- .../extensions/OrderService_Excel.cs | 2 +- src/client/spark_sdk/samples/OrderSample.cs | 2 +- src/client/sparkcmd/Cmd/ServiceTestCommand.cs | 2 +- src/lib/CMakeDeps.cmake | 2 +- .../{UserService.proto => AuthService.proto} | 2 +- src/lib/utils/AuthToken.cpp | 1 + src/lib/utils/AuthToken.h | 2 +- src/server/sparkd/cmds/Run.cpp | 4 ++-- src/server/sparkd/cmds/Web.cpp | 4 ++-- src/server/sparkd/http/ApiGateway.cpp | 6 ++--- .../sparkd/position/MarginServiceCore.cpp | 2 +- .../sparkd/position/tests/PositionTests.cpp | 3 +-- ...erviceServer.cpp => AuthServiceServer.cpp} | 14 +++++------ ...serServiceServer.h => AuthServiceServer.h} | 10 ++++---- 20 files changed, 57 insertions(+), 40 deletions(-) rename src/lib/api/services/{UserService.proto => AuthService.proto} (98%) rename src/server/sparkd/user/{UserServiceServer.cpp => AuthServiceServer.cpp} (86%) rename src/server/sparkd/user/{UserServiceServer.h => AuthServiceServer.h} (70%) diff --git a/src/client/spark/Daemons/ShellServices.cs b/src/client/spark/Daemons/ShellServices.cs index a57ac2547..23ab2c1ca 100644 --- a/src/client/spark/Daemons/ShellServices.cs +++ b/src/client/spark/Daemons/ShellServices.cs @@ -16,7 +16,7 @@ namespace Spark { public static ServiceContext context { get; } = new ServiceContext(); [Export] - public UserService user_service => context.locate(); + public AuthService user_service => context.locate(); [Export("settings")] public PersistenceService settings_service => context.locate("settings"); diff --git a/src/client/spark/core/Settings/UserPersistFactory.cs b/src/client/spark/core/Settings/UserPersistFactory.cs index 3c1b8db02..e6a211e95 100644 --- a/src/client/spark/core/Settings/UserPersistFactory.cs +++ b/src/client/spark/core/Settings/UserPersistFactory.cs @@ -22,12 +22,12 @@ namespace mbts.ui.settings readonly PersistenceService _persist; [ImportingConstructor] - public UISettingsFactory(UserService login, [Import("settings")] PersistenceService persist) { + public UISettingsFactory(AuthService login, [Import("settings")] PersistenceService persist) { _persist = persist; _users = get_users(login); } - async Task get_users(UserService login) { + async Task get_users(AuthService login) { var users = await login.get_users_async(null); if (users.success) return users.value.Users.ToArray(); else return new User[0]; diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 1845850f0..21c29733e 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -25,7 +25,7 @@ namespace mbts.ui.shell internal class LoginContainer { [ImportingConstructor] - public LoginContainer(UserService user, [Import("settings")] PersistenceService persist) { + public LoginContainer(AuthService user, [Import("settings")] PersistenceService persist) { var model = LoginModel.instance; model.provide_services(user, persist); // await_login pumps the dispatcher but doesn't allow control to return to MEF until the username and workspace are available @@ -70,7 +70,7 @@ namespace mbts.ui.shell private string _workspace; private PreloginWorkspaceEnumerator _enum_workspace; - UserService _logon; + AuthService _logon; DispatcherFrame _frame = new DispatcherFrame(); private LoginModel() { @@ -168,10 +168,10 @@ namespace mbts.ui.shell #region provide hub - public void provide_services(UserService u, PersistenceService p) { + public void provide_services(AuthService u, PersistenceService p) { _hub_src.TrySetResult((u,p)); } - private TaskCompletionSource<(UserService, PersistenceService)> _hub_src = new TaskCompletionSource<(UserService, PersistenceService)>(); + private TaskCompletionSource<(AuthService, PersistenceService)> _hub_src = new TaskCompletionSource<(AuthService, PersistenceService)>(); #endregion #region Dispose diff --git a/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs b/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs index cddfa7c5e..d25162176 100644 --- a/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs +++ b/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs @@ -11,7 +11,7 @@ namespace bts.settings { public class SettingsManagerTool { public static void run() { var sc = new ServiceContext(); - var users = sc.locate(); + var users = sc.locate(); var persist = sc.locate("settings"); var user_list = users.get_users(new GetUsersRequest()); var user_names = user_list.Users.Select(u => u.Login); diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index 9fb48cccd..3226e6189 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -4,12 +4,13 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Reflection; +using bts.api.user; -namespace bts.api.core -{ +namespace bts.api.core { public class ServiceContext : IDisposable { IntPtr _qbus; + public ServiceContext() { _qbus = ApiNativeMethods.api_create_quickbus(null, 0); } @@ -22,7 +23,6 @@ namespace bts.api.core Type[] arg_types = new[] { typeof(ClientChannel) }; ConstructorInfo ctor = typeof(T).GetConstructors(BindingFlags.NonPublic | BindingFlags.Instance).First(ci => ci.GetParameters().SingleOrDefault()?.ParameterType == typeof(ClientChannel)); return (T)ctor.Invoke(new object[] { channel }); - //return (T)Activator.CreateInstance(typeof(T), channel); } internal ServerChannel publish(T service, string service_type, string qualifier) where T : IApiServer { @@ -31,6 +31,23 @@ namespace bts.api.core return ch; } + public AuthToken token { get; private set; } + + public async Task login(string username, string password) { + var auth_service = locate(); + var result = await auth_service.authenticate_login_async(new AuthenticateLoginRequest() { + Login = username, + Password = password + }); + if (result.success) { + token = result.value.Token; + // todo + // ApiNativeMethods.set_token(...) + return true; + } + return false; + } + #region IDisposable Support protected virtual void Dispose(bool disposing) { diff --git a/src/client/spark_api/md/Authenticator.cs b/src/client/spark_api/md/Authenticator.cs index 34aca3bfc..26798e94c 100644 --- a/src/client/spark_api/md/Authenticator.cs +++ b/src/client/spark_api/md/Authenticator.cs @@ -7,7 +7,7 @@ namespace bts.api { public class Authenticator { - readonly static Lazy _auth = new Lazy(() => Locator.locate(), true); + readonly static Lazy _auth = new Lazy(() => Locator.locate(), true); user.AuthToken _token = null; public Authenticator() { } diff --git a/src/client/spark_excel/extensions/OrderService_Excel.cs b/src/client/spark_excel/extensions/OrderService_Excel.cs index e081916aa..853d3227d 100644 --- a/src/client/spark_excel/extensions/OrderService_Excel.cs +++ b/src/client/spark_excel/extensions/OrderService_Excel.cs @@ -17,7 +17,7 @@ namespace bts.api.orderman { public partial class OrderService_Excel { - readonly static Lazy _users = new Lazy(() => Locator.locate(), true); + readonly static Lazy _users = new Lazy(() => Locator.locate(), true); readonly static Lazy _admin = new Lazy(() => Locator.locate(), true); [ExcelFunction(Category = "BTS", Description = "Get All Accessible Accounts")] diff --git a/src/client/spark_sdk/samples/OrderSample.cs b/src/client/spark_sdk/samples/OrderSample.cs index 251b9a192..186041c1a 100644 --- a/src/client/spark_sdk/samples/OrderSample.cs +++ b/src/client/spark_sdk/samples/OrderSample.cs @@ -27,7 +27,7 @@ namespace bts.sdk } readonly static Lazy _orders = new Lazy(() => Locator.locate(), true); - readonly static Lazy _users = new Lazy(() => Locator.locate(), true); + readonly static Lazy _users = new Lazy(() => Locator.locate(), true); readonly static Lazy _admin = new Lazy(() => Locator.locate(), true); void print_update(T update) diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs index dfad6cc5d..3e9ff00c5 100644 --- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs +++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs @@ -82,7 +82,7 @@ namespace bts { private static void user_test() { var ctx = new ServiceContext(); - var s = ctx.locate(); + var s = ctx.locate(); var r = new api.user.GetUsersRequest(); var resp = s.get_users(r); Console.WriteLine("{0}", resp); diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 1552418c6..d022f9964 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/UserService.proto b/src/lib/api/services/AuthService.proto similarity index 98% rename from src/lib/api/services/UserService.proto rename to src/lib/api/services/AuthService.proto index f6a59ecb4..2b5c38e36 100644 --- a/src/lib/api/services/UserService.proto +++ b/src/lib/api/services/AuthService.proto @@ -52,7 +52,7 @@ message AuthenticateLoginResponse { message AuthenticateTokenRequest {AuthToken token = 1;} message AuthenticateTokenResponse {bool is_valid = 1; string reason = 2; User user = 3;} -service UserService { +service AuthService { option (bts.api.service_description) = "Provides a management interface to the system user list"; rpc authenticate_login(AuthenticateLoginRequest) returns (AuthenticateLoginResponse) diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 5a10fa63c..671e604de 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -8,6 +8,7 @@ namespace api { namespace auth { #ifndef _WIN32 + user::AuthToken generate_token(const admin::BTSUser& user) { api::user::TokenPayload payload; payload.set_date(datetime::ll_now()); diff --git a/src/lib/utils/AuthToken.h b/src/lib/utils/AuthToken.h index fb4966120..fe0569073 100644 --- a/src/lib/utils/AuthToken.h +++ b/src/lib/utils/AuthToken.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/api/services/UserService.pb.h" +#include "lib/api/services/AuthService.pb.h" #include "lib/api/services/AdminService.client.pb.h" #include diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 516980043..b7fbb47eb 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -25,7 +25,7 @@ #include "server/sparkd/support/ShellLatencyServer.h" #include "server/sparkd/user/AdminServiceServer.h" #include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" -#include "server/sparkd/user/UserServiceServer.h" +#include "server/sparkd/user/AuthServiceServer.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/plugin/SparkServices.h" #include "lib/plugin/plugin.h" @@ -54,7 +54,7 @@ int Run::execute(std::vector const &) { http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); persistence::PersistenceServiceServer settings_saver(sc, "settings"); - user::UserServiceServer login_server(sc); + user::AuthServiceServer login_server(sc); md::run_market_datapublishers(); std::shared_ptr synthetic_service = std::make_shared(sc); diff --git a/src/server/sparkd/cmds/Web.cpp b/src/server/sparkd/cmds/Web.cpp index 09bda5c6e..aac651dc0 100644 --- a/src/server/sparkd/cmds/Web.cpp +++ b/src/server/sparkd/cmds/Web.cpp @@ -12,7 +12,7 @@ #include "lib/md/relay/QueryServer.h" #include "lib/md/SyntheticSecurityService.h" #include "server/sparkd/user/AdminServiceServer.h" -#include "server/sparkd/user/UserServiceServer.h" +#include "server/sparkd/user/AuthServiceServer.h" #include "server/sparkd/md/run_md.h" #include "lib/orderman/orderman_utils/PerfTraceLog.h" @@ -34,7 +34,7 @@ int Web::execute(const std::vector& args) { PerfTraceLog perf_log; http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); - user::UserServiceServer login_server(sc); + user::AuthServiceServer login_server(sc); if (std::find(args.begin(), args.end(), "-md") != args.end()) { md::run_market_datapublishers(); } diff --git a/src/server/sparkd/http/ApiGateway.cpp b/src/server/sparkd/http/ApiGateway.cpp index ec889dc80..a08d0dc8c 100644 --- a/src/server/sparkd/http/ApiGateway.cpp +++ b/src/server/sparkd/http/ApiGateway.cpp @@ -3,7 +3,7 @@ #include "lib/logging/logging.h" #include "lib/api/public/ApiUtils.h" #include "lib/api/core/ApiClientInterop.h" -#include "lib/api/services/UserService.client.pb.h" +#include "lib/api/services/AuthService.client.pb.h" #include "lib/api/services/AdminService.client.pb.h" #include "lib/utils/bts_assert.h" #include @@ -19,7 +19,7 @@ namespace http { struct ApiGatewayImpl { std::mutex _m; const api::ServiceContext& _sc; - api::user::UserService _logon; + api::user::AuthService _logon; std::unordered_map _apiclient; std::vector _subscriptions; @@ -28,7 +28,7 @@ struct ApiGatewayImpl { ApiGatewayImpl(const api::ServiceContext& ctx) : _m(), _sc(ctx), - _logon(ctx.locate()), + _logon(ctx.locate()), _apiclient(), _subscriptions() { } diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index 9b4868f16..3bc45e612 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -6,7 +6,7 @@ #include "IMarginObserver.h" #include "lib/config/config.h" -#include "lib/api/services/UserService.pb.h" +#include "lib/api/services/AuthService.pb.h" #include "lib/utils/bts_assert.h" #include "lib/utils/Uuid.h" #include "lib/utils/bts_chrono.h" diff --git a/src/server/sparkd/position/tests/PositionTests.cpp b/src/server/sparkd/position/tests/PositionTests.cpp index b24dbe509..62c93aec6 100644 --- a/src/server/sparkd/position/tests/PositionTests.cpp +++ b/src/server/sparkd/position/tests/PositionTests.cpp @@ -7,11 +7,10 @@ #include "../IMarginObserver.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "server/sparkd/user/UserServiceServer.h" #include "lib/config/config.h" #include "lib/api/public/ServiceContext.h" -#include "lib/api/services/UserService.client.pb.h" +#include "lib/api/services/AuthService.client.pb.h" #include "lib/domain_model/Security.pb.h" #include "lib/utils/helper_macros.h" diff --git a/src/server/sparkd/user/UserServiceServer.cpp b/src/server/sparkd/user/AuthServiceServer.cpp similarity index 86% rename from src/server/sparkd/user/UserServiceServer.cpp rename to src/server/sparkd/user/AuthServiceServer.cpp index e1ffb1857..a481852c3 100644 --- a/src/server/sparkd/user/UserServiceServer.cpp +++ b/src/server/sparkd/user/AuthServiceServer.cpp @@ -1,8 +1,8 @@ -#include "UserServiceServer.h" +#include "AuthServiceServer.h" #include "lib/persistence/SqliteStore.h" #include "lib/logging/logging.h" -#include "lib/api/services/UserService.pb.h" +#include "lib/api/services/AuthService.pb.h" #include "lib/api/services/AdminService.client.pb.h" #include "lib/utils/PBUtils.h" #include "lib/utils/AuthToken.h" @@ -19,7 +19,7 @@ namespace user { const api::VoidMessage vod; -struct UserServiceServer::PImpl +struct AuthServiceServer::PImpl { api::admin::AdminService admin; @@ -27,13 +27,13 @@ struct UserServiceServer::PImpl admin(context.locate()) { } }; -UserServiceServer::UserServiceServer (bts::api::ServiceContext& context) : UserServiceBase(context), me (new PImpl(context)) { +AuthServiceServer::AuthServiceServer (bts::api::ServiceContext& context) : AuthServiceBase(context), me (new PImpl(context)) { LOG(User,Warn,"Starting user service"); } -UserServiceServer::~UserServiceServer () {} +AuthServiceServer::~AuthServiceServer () {} -void UserServiceServer::get_users(const api::user::GetUsersRequest& , +void AuthServiceServer::get_users(const api::user::GetUsersRequest& , const std::function& respond) { me->admin.get_admin_data(vod, [respond](const api::Result& admin_data) { @@ -54,7 +54,7 @@ void UserServiceServer::get_users(const api::user::GetUsersRequest& , }); } -void UserServiceServer::authenticate_login(const api::user::AuthenticateLoginRequest& req, +void AuthServiceServer::authenticate_login(const api::user::AuthenticateLoginRequest& req, const std::function& respond) { me->admin.get_admin_data(vod, [=](const api::Result& admin_data) { diff --git a/src/server/sparkd/user/UserServiceServer.h b/src/server/sparkd/user/AuthServiceServer.h similarity index 70% rename from src/server/sparkd/user/UserServiceServer.h rename to src/server/sparkd/user/AuthServiceServer.h index 431f6bf27..91df48a8e 100644 --- a/src/server/sparkd/user/UserServiceServer.h +++ b/src/server/sparkd/user/AuthServiceServer.h @@ -1,7 +1,7 @@ #pragma once #include -#include "lib/api/services/UserService.server.pb.h" +#include "lib/api/services/AuthService.server.pb.h" #include "lib/api/services/AdminService.pb.h" #include "lib/utils/bts_no_copy.h" @@ -9,12 +9,12 @@ namespace bts { namespace user { -class UserServiceServer : public api::user::UserServiceBase +class AuthServiceServer : public api::user::AuthServiceBase { public: - BTS_NO_COPY(UserServiceServer); - UserServiceServer (bts::api::ServiceContext& context); - ~UserServiceServer(); + BTS_NO_COPY(AuthServiceServer); + AuthServiceServer (bts::api::ServiceContext& context); + ~AuthServiceServer(); void get_users(const api::user::GetUsersRequest& , const std::function& ) override; void authenticate_login(const api::user::AuthenticateLoginRequest& , From fc5e4039b2e6a9209098906a16ca098cd9105c09 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 29 Nov 2018 14:59:43 -0500 Subject: [PATCH 02/45] SPARK-1907 .value() on failed result should be null instead of an exception that nobody will remember to catch --- src/client/spark_api/api/Result.cs | 7 ++++++- src/lib/api/public/Result.h | 7 +------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/client/spark_api/api/Result.cs b/src/client/spark_api/api/Result.cs index 5a473c0e0..52084ac4c 100644 --- a/src/client/spark_api/api/Result.cs +++ b/src/client/spark_api/api/Result.cs @@ -37,7 +37,12 @@ namespace bts.api.core public T value { get { if (success) return _result; - else throw new ApiException(error_message); + else { + if (typeof(T).IsValueType) { throw new ApiException(error_message); } + else { + return default(T);// always null + } + } } } public bool success { get { return _code == ApiError.Success; } } diff --git a/src/lib/api/public/Result.h b/src/lib/api/public/Result.h index de3625775..c63401f89 100644 --- a/src/lib/api/public/Result.h +++ b/src/lib/api/public/Result.h @@ -57,7 +57,7 @@ public: std::shared_ptr result() const { if (success()) return _t; - else throw ApiException(std::string(error_message())); + else return nullptr; } bool success() const { return _code == ApiError::SUCCESS; } @@ -66,13 +66,8 @@ public: const char* error_message() const { return error_string(_code); } ~Result() {} - - // Is not a type?? - // typedef std::function)> OnResponse; }; -//template -//using OnResponse = std::function)>; }}//namespace From c6b494db16be16eac57460e4ed84cbb7c6135576 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 29 Nov 2018 16:34:33 -0500 Subject: [PATCH 03/45] Move AuthToken type to apicore --- src/client/spark/view/Shell/Login/LoginModel.cs | 1 + src/client/spark_api/md/Authenticator.cs | 6 +++--- src/client/spark_api/md/MarketDataClient.cs | 8 ++++---- src/lib/api/apicore.proto | 5 +++++ src/lib/api/services/AuthService.proto | 13 +++++-------- src/lib/utils/AuthToken.cpp | 17 ++++++++++------- src/lib/utils/AuthToken.h | 4 ++-- 7 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 21c29733e..3df06a379 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -13,6 +13,7 @@ using mbts.config; using mbts.ui.native; using mbts.utils; using bts.co2; +using bts.api; using bts.api.user; using bts.api.persistence; using bts; diff --git a/src/client/spark_api/md/Authenticator.cs b/src/client/spark_api/md/Authenticator.cs index 26798e94c..001defa86 100644 --- a/src/client/spark_api/md/Authenticator.cs +++ b/src/client/spark_api/md/Authenticator.cs @@ -8,11 +8,11 @@ namespace bts.api public class Authenticator { readonly static Lazy _auth = new Lazy(() => Locator.locate(), true); - user.AuthToken _token = null; + AuthToken _token = null; public Authenticator() { } - public user.AuthToken last_token => _token; - public async Task login(string login, string password) + public AuthToken last_token => _token; + public async Task login(string login, string password) { var res = await _auth.Value.authenticate_login_async(new user.AuthenticateLoginRequest { Login = login, Password = password }); if (res.success) diff --git a/src/client/spark_api/md/MarketDataClient.cs b/src/client/spark_api/md/MarketDataClient.cs index 9f06f6aeb..2512c2b72 100644 --- a/src/client/spark_api/md/MarketDataClient.cs +++ b/src/client/spark_api/md/MarketDataClient.cs @@ -45,7 +45,7 @@ namespace bts.api.md } public static IEnumerable cached_exchanges => _venue_cache.Keys; - public static bool create_or_get(api.Venue exchange, out MarketDataClient md, user.AuthToken token = null) + public static bool create_or_get(api.Venue exchange, out MarketDataClient md, AuthToken token = null) { if (!_venue_cache.TryGetValue(exchange, out md)) { @@ -55,18 +55,18 @@ namespace bts.api.md return false; } - public MarketDataClient(bts.api.Venue exchange = Venue.Unset, user.AuthToken token = null) + public MarketDataClient(bts.api.Venue exchange = Venue.Unset, AuthToken token = null) { _venue = exchange; _subscription = load_request(exchange, token); } - public void set_auth_token(user.AuthToken toke) + public void set_auth_token(AuthToken toke) { _subscription.Token = toke?.Token ?? string.Empty; } - MDRequest load_request(bts.api.Venue exchange, user.AuthToken token) + MDRequest load_request(bts.api.Venue exchange, AuthToken token) { var req = new MDRequest() { Token = token?.Token ?? string.Empty } ; var prods = _all_products.Where(x=>x.Exchange == exchange || exchange == bts.api.Venue.Unset); diff --git a/src/lib/api/apicore.proto b/src/lib/api/apicore.proto index 8c156ab18..b694f0f10 100644 --- a/src/lib/api/apicore.proto +++ b/src/lib/api/apicore.proto @@ -12,9 +12,14 @@ message PingPong { // RequestHeader // T Request +message AuthToken { + string token = 1; +} + message RequestHeader { int32 request_id = 1; int32 method = 2; + AuthToken token = 3; } enum ApiError { diff --git a/src/lib/api/services/AuthService.proto b/src/lib/api/services/AuthService.proto index 2b5c38e36..174ef7dff 100644 --- a/src/lib/api/services/AuthService.proto +++ b/src/lib/api/services/AuthService.proto @@ -1,6 +1,7 @@ syntax="proto3"; package bts.api.user; option csharp_namespace="bts.api.user"; +import "lib/api/apicore.proto"; import "lib/api/apioptions.proto"; message OperatorID { string tag50 = 10; } @@ -25,10 +26,6 @@ message User { repeated Entitlement entitlements = 200; } -message AuthToken { - string token = 1; -} - message TokenPayload { uint32 date = 1; uint32 id = 2; @@ -37,19 +34,19 @@ message TokenPayload { message GetUsersRequest {} message GetUsersResponse { repeated User users = 1; string error = 2; } -message AddOrUpdateUserRequest {AuthToken token = 1; User user = 2;} -message RemoveUserRequest {AuthToken token = 1; string login = 2;} +message AddOrUpdateUserRequest { api.AuthToken token = 1; User user = 2;} +message RemoveUserRequest {api.AuthToken token = 1; string login = 2;} message UserOperationResponse { bool is_valid = 1; string reason = 2;} message AuthenticateLoginRequest {string login = 1; string password = 2;} message AuthenticateLoginResponse { bool is_valid = 1; string reason = 2; - AuthToken token = 3; + api.AuthToken token = 3; uint32 user_id = 4; bool can_create = 5; } -message AuthenticateTokenRequest {AuthToken token = 1;} +message AuthenticateTokenRequest {api.AuthToken token = 1;} message AuthenticateTokenResponse {bool is_valid = 1; string reason = 2; User user = 3;} service AuthService { diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 671e604de..69537bfca 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -1,5 +1,6 @@ #include "AuthToken.h" #include "lib/utils/base64.hpp" +#include "lib/utils/bts_assert.h" #include "datetime.h" #include "base64.hpp" @@ -9,30 +10,32 @@ namespace auth { #ifndef _WIN32 -user::AuthToken generate_token(const admin::BTSUser& user) { +AuthToken generate_token(const admin::BTSUser& user) { api::user::TokenPayload payload; payload.set_date(datetime::ll_now()); payload.set_id(user.id()); - if(user.name() == "bts") + if(user.name() == "bts") { payload.set_wheel(true); + } auto token = websocketpp::base64_encode(payload.SerializeAsString()); - user::AuthToken result; + bts_assert_d(token.size() < 255-8); + AuthToken result; result.set_token(token); return result; } -user::AuthToken generate_wheel_token() { +AuthToken generate_wheel_token() { api::user::TokenPayload payload; payload.set_date(datetime::ll_now()); payload.set_id(99999); payload.set_wheel(true); auto token = websocketpp::base64_encode(payload.SerializeAsString()); - user::AuthToken result; + AuthToken result; result.set_token(token); return result; } #else -user::AuthToken generate_wheel_token() { - return user::AuthToken(); +AuthToken generate_wheel_token() { + return AuthToken(); } #endif diff --git a/src/lib/utils/AuthToken.h b/src/lib/utils/AuthToken.h index fe0569073..d9043939a 100644 --- a/src/lib/utils/AuthToken.h +++ b/src/lib/utils/AuthToken.h @@ -7,8 +7,8 @@ namespace bts { namespace api { namespace auth { -user::AuthToken generate_token(const admin::BTSUser&); -user::AuthToken generate_wheel_token(); +AuthToken generate_token(const admin::BTSUser&); +AuthToken generate_wheel_token(); bool decode_token(const std::string& token, user::TokenPayload* payload); }}} From 3bbef9f3281fa359ff4fa5ffa6768c22980bd4b7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 11:22:31 -0500 Subject: [PATCH 04/45] SPARK-1905 Attach token to api header C# --- src/client/spark_api/api/Channels/QuickBusClientChannel.cs | 1 + src/client/spark_api/api/ClientChannel.cs | 2 +- src/client/spark_api/api/ServiceContext.cs | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 6cf3ecb6b..cc94e35f6 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -35,6 +35,7 @@ namespace bts.api.core { var header = new RequestHeader() { Method = method_id, RequestId = id, + Token = _context.token }; var buffer = header.serialize(request); var tcs = new TaskCompletionSource>(); diff --git a/src/client/spark_api/api/ClientChannel.cs b/src/client/spark_api/api/ClientChannel.cs index bd91eab03..324e3c366 100644 --- a/src/client/spark_api/api/ClientChannel.cs +++ b/src/client/spark_api/api/ClientChannel.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; namespace bts.api.core { internal abstract class ClientChannel : IDisposable { - readonly ServiceContext _context; + protected readonly ServiceContext _context; public ClientChannel(ServiceContext context) { _context = context; diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index 3226e6189..3f2ce048e 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -32,6 +32,7 @@ namespace bts.api.core { } public AuthToken token { get; private set; } + public string user { get; private set; } public async Task login(string username, string password) { var auth_service = locate(); @@ -41,8 +42,7 @@ namespace bts.api.core { }); if (result.success) { token = result.value.Token; - // todo - // ApiNativeMethods.set_token(...) + user = username; return true; } return false; From f4ee9434cc01316101e65268d0df92f7804a97a6 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 11:24:03 -0500 Subject: [PATCH 05/45] Rename Result.result to Result.value() to match c# --- src/lib/api/public/Result.h | 2 +- src/lib/api/test/HelloServiceServer.cpp | 2 +- src/lib/md/relay/RelayClient.cpp | 4 +- .../tests/PersistenceServiceTests.cpp | 46 +++++++++---------- src/server/sparkd/cmds/AdminReport.cpp | 2 +- src/server/sparkd/http/ApiGateway.cpp | 10 ++-- .../md/MarketDataAuxiliaryServiceServer.cpp | 4 +- src/server/sparkd/user/AuthServiceServer.cpp | 4 +- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/lib/api/public/Result.h b/src/lib/api/public/Result.h index c63401f89..22b868434 100644 --- a/src/lib/api/public/Result.h +++ b/src/lib/api/public/Result.h @@ -55,7 +55,7 @@ public: {} #endif - std::shared_ptr result() const { + std::shared_ptr value() const { if (success()) return _t; else return nullptr; } diff --git a/src/lib/api/test/HelloServiceServer.cpp b/src/lib/api/test/HelloServiceServer.cpp index dab250104..539fdd1cb 100644 --- a/src/lib/api/test/HelloServiceServer.cpp +++ b/src/lib/api/test/HelloServiceServer.cpp @@ -44,7 +44,7 @@ void HelloServiceServer::yell_hello(const HelloRequest & request, const std::fun _shouter.upper(sr, [=](Result response) { if (response.success()) { HelloResponse hr; - hr.set_message(response.result()->msg()); + hr.set_message(response.value()->msg()); int rmid = _id; publish(hr.message(), &rmid); reply(hr); diff --git a/src/lib/md/relay/RelayClient.cpp b/src/lib/md/relay/RelayClient.cpp index d63356f3e..cd3b696a4 100644 --- a/src/lib/md/relay/RelayClient.cpp +++ b/src/lib/md/relay/RelayClient.cpp @@ -259,7 +259,7 @@ public: if (result.success()) { // Write data to shared mem bool has_new_security = false; - _writer.write(*result.result(), &has_new_security); + _writer.write(*result.value(), &has_new_security); // If the reply included and we have a consumer have it scan them if (has_new_security && _pconsumer) { scan_securities_thread().post([=]() { @@ -269,7 +269,7 @@ public: } // Update reply timetamps for (auto& req : *_request.mutable_channels()) { - for (auto& reply : result.result()->channels()) { + for (auto& reply : result.value()->channels()) { if (req.type() == reply.channel().type() && req.exchange() == reply.channel().exchange() && req.symbol() == reply.channel().symbol()) { diff --git a/src/lib/persistence/tests/PersistenceServiceTests.cpp b/src/lib/persistence/tests/PersistenceServiceTests.cpp index 384769a7d..bec842d3a 100644 --- a/src/lib/persistence/tests/PersistenceServiceTests.cpp +++ b/src/lib/persistence/tests/PersistenceServiceTests.cpp @@ -95,7 +95,7 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") req.set_ns("my_ns"); auto resp = cli.retrieve_all(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == RetrieveResponse::NO_SUCH_NS); + REQUIRE(resp.value()->result() == RetrieveResponse::NO_SUCH_NS); } SECTION("store_works") @@ -113,16 +113,16 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp = cli.store(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == StoreResponse::OK); + REQUIRE(resp.value()->result() == StoreResponse::OK); RetrieveAllRequest req2; req2.set_ns("my_ns1"); auto resp2 = cli.retrieve_all(req2,5000); REQUIRE(resp2.success()); - REQUIRE(resp2.result()->result() == RetrieveResponse::OK); - REQUIRE(resp2.result()->record_size() == 2); - REQUIRE(resp2.result()->record(0).key() == "1"); - REQUIRE(resp2.result()->record(0).value() == "a"); + REQUIRE(resp2.value()->result() == RetrieveResponse::OK); + REQUIRE(resp2.value()->record_size() == 2); + REQUIRE(resp2.value()->record(0).key() == "1"); + REQUIRE(resp2.value()->record(0).value() == "a"); } SECTION("retrieve_works") @@ -144,7 +144,7 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp = cli.store(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == StoreResponse::OK); + REQUIRE(resp.value()->result() == StoreResponse::OK); RetrieveRequest req2; req2.set_ns("my_ns1"); @@ -152,10 +152,10 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp2 = cli.retrieve(req2,5000); REQUIRE(resp2.success()); - REQUIRE(resp2.result()->result() == RetrieveResponse::OK); - REQUIRE(resp2.result()->record_size() == 1); - REQUIRE(resp2.result()->record(0).key() == "2"); - REQUIRE(resp2.result()->record(0).value() == "b"); + REQUIRE(resp2.value()->result() == RetrieveResponse::OK); + REQUIRE(resp2.value()->record_size() == 1); + REQUIRE(resp2.value()->record(0).key() == "2"); + REQUIRE(resp2.value()->record(0).value() == "b"); } SECTION("remove_works") @@ -173,7 +173,7 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp = cli.store(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == StoreResponse::OK); + REQUIRE(resp.value()->result() == StoreResponse::OK); RemoveRequest req2; req2.set_ns("my_ns1"); @@ -181,16 +181,16 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp2 = cli.remove(req2,5000); REQUIRE(resp2.success()); - REQUIRE(resp2.result()->result() == RemoveResponse::OK); + REQUIRE(resp2.value()->result() == RemoveResponse::OK); RetrieveAllRequest req3; req3.set_ns("my_ns1"); auto resp3 = cli.retrieve_all(req3,5000); REQUIRE(resp3.success()); - REQUIRE(resp3.result()->result() == RetrieveResponse::OK); - REQUIRE(resp3.result()->record_size() == 1); - REQUIRE(resp3.result()->record(0).key() == "1"); - REQUIRE(resp3.result()->record(0).value() == "a"); + REQUIRE(resp3.value()->result() == RetrieveResponse::OK); + REQUIRE(resp3.value()->record_size() == 1); + REQUIRE(resp3.value()->record(0).key() == "1"); + REQUIRE(resp3.value()->record(0).value() == "a"); } SECTION("remove_all_works") @@ -203,7 +203,7 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp = cli.store(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == StoreResponse::OK); + REQUIRE(resp.value()->result() == StoreResponse::OK); req.set_ns("my_ns2"); rec = req.add_record(); @@ -212,21 +212,21 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") resp = cli.store(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == StoreResponse::OK); + REQUIRE(resp.value()->result() == StoreResponse::OK); RemoveAllRequest req2; req2.set_ns("my_ns1"); auto resp2 = cli.remove_all(req2,5000); REQUIRE(resp2.success()); - REQUIRE(resp2.result()->result() == RemoveResponse::OK); + REQUIRE(resp2.value()->result() == RemoveResponse::OK); RetrieveAllRequest req3; req3.set_ns("my_ns1"); auto resp3 = cli.retrieve_all(req3,5000); REQUIRE(resp3.success()); - REQUIRE(resp3.result()->result() == RetrieveResponse::OK); - REQUIRE(resp3.result()->record_size() == 0); + REQUIRE(resp3.value()->result() == RetrieveResponse::OK); + REQUIRE(resp3.value()->record_size() == 0); } SECTION("streaming_works") @@ -239,7 +239,7 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp = cli.store(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == StoreResponse::OK); + REQUIRE(resp.value()->result() == StoreResponse::OK); std::promise p; auto f = p.get_future(); diff --git a/src/server/sparkd/cmds/AdminReport.cpp b/src/server/sparkd/cmds/AdminReport.cpp index 59866b223..92312f83a 100644 --- a/src/server/sparkd/cmds/AdminReport.cpp +++ b/src/server/sparkd/cmds/AdminReport.cpp @@ -52,7 +52,7 @@ int AdminReport::md_report() auto res = admin.get_admin_data(api::VoidMessage()); if(res.success()) { - const api::admin::AdminData& data = *res.result(); + const api::admin::AdminData& data = *res.value(); std::cout << "User,Fullname,Company,Exchange,MIC,Display,Pro/NonPro" << std::endl; for(const auto& u : data.users()) { diff --git a/src/server/sparkd/http/ApiGateway.cpp b/src/server/sparkd/http/ApiGateway.cpp index a08d0dc8c..a1ebf346f 100644 --- a/src/server/sparkd/http/ApiGateway.cpp +++ b/src/server/sparkd/http/ApiGateway.cpp @@ -43,13 +43,13 @@ struct ApiGatewayImpl { GatewayResponse resp; resp.mutable_logon()->set_is_valid(false); if (logon_response) { - if (logon_response.result()->is_valid()) { + if (logon_response.value()->is_valid()) { resp.mutable_logon()->set_is_valid(true); - resp.mutable_logon()->set_token(logon_response.result()->token().token()); - resp.mutable_logon()->set_can_create(logon_response.result()->can_create()); + resp.mutable_logon()->set_token(logon_response.value()->token().token()); + resp.mutable_logon()->set_can_create(logon_response.value()->can_create()); } else { - resp.mutable_logon()->set_reason(logon_response.result()->reason()); + resp.mutable_logon()->set_reason(logon_response.value()->reason()); } } else { @@ -153,7 +153,7 @@ std::string get_server_info(const api::ServiceContext& ctx) { if (response.success()) { ss << " \"users\": [" << endl; bool first = true; - for (const auto& user : response.result()->users()) { + for (const auto& user : response.value()->users()) { if (user.is_present()) { ss << " "; if (first) { first = false; } diff --git a/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp b/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp index 17886e386..611dbb259 100644 --- a/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp +++ b/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp @@ -56,8 +56,8 @@ void MarketDataAuxiliaryServiceServer::_poll_md(){ me->relay_service.requestmd(me->state.md_req(), [this](const bts::api::Result& md_reply) { - if(md_reply.result()!=nullptr) - _scan_trades(*md_reply.result()); + if(md_reply) + _scan_trades(*md_reply.value()); me->context.post([this](){_poll_md();},me->poll_period_ms); }); } diff --git a/src/server/sparkd/user/AuthServiceServer.cpp b/src/server/sparkd/user/AuthServiceServer.cpp index a481852c3..8be24cf67 100644 --- a/src/server/sparkd/user/AuthServiceServer.cpp +++ b/src/server/sparkd/user/AuthServiceServer.cpp @@ -39,7 +39,7 @@ void AuthServiceServer::get_users(const api::user::GetUsersRequest& , me->admin.get_admin_data(vod, [respond](const api::Result& admin_data) { api::user::GetUsersResponse resp; if (admin_data.success()) { - for (const auto& inuser : admin_data.result()->users()) { + for (const auto& inuser : admin_data.value()->users()) { if (inuser.is_present()) { api::user::User& outuser = *resp.add_users(); outuser.set_login(inuser.name()); @@ -61,7 +61,7 @@ void AuthServiceServer::authenticate_login(const api::user::AuthenticateLoginReq api::user::AuthenticateLoginResponse resp; resp.set_is_valid(false); if (admin_data.success()) { - for (const auto& user : admin_data.result()->users()) { + for (const auto& user : admin_data.value()->users()) { if (user.name() == req.login() && user.password() == req.password() && user.is_present()) { resp.set_is_valid(user.is_active()); if(!resp.is_valid()) From e1568c1e6760bee0ddcb2ec0f1235256167d254f Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 11:24:58 -0500 Subject: [PATCH 06/45] SPARK-1905 Attach token to api request header (c++) --- src/lib/api/public/ClientChannel.cpp | 2 +- src/lib/api/public/ClientChannel.h | 7 +-- src/lib/api/public/QuickbusClientChannel.cpp | 3 +- src/lib/api/public/QuickbusClientChannel.h | 3 +- src/lib/api/public/ServiceContext.cpp | 51 +++++++++++++++---- src/lib/api/public/ServiceContext.h | 15 ++++-- .../templates/cpp/server.pb.cc | 1 + src/lib/orderman/actors/ServiceBridge.cpp | 1 + 8 files changed, 62 insertions(+), 21 deletions(-) diff --git a/src/lib/api/public/ClientChannel.cpp b/src/lib/api/public/ClientChannel.cpp index 3d6f581c2..f89d33d8a 100644 --- a/src/lib/api/public/ClientChannel.cpp +++ b/src/lib/api/public/ClientChannel.cpp @@ -3,7 +3,7 @@ namespace bts { namespace api { -ClientChannel::ClientChannel() : _id(1) +ClientChannel::ClientChannel(const ServiceContext& ctx) : _id(1), _context(ctx) { } diff --git a/src/lib/api/public/ClientChannel.h b/src/lib/api/public/ClientChannel.h index a29e54a18..17782f46d 100644 --- a/src/lib/api/public/ClientChannel.h +++ b/src/lib/api/public/ClientChannel.h @@ -4,7 +4,7 @@ #include "Result.h" #include "ApiException.h" #include "RawUpdate.h" -//#include "Update.h" +#include "ServiceContext.h" #include #include #include @@ -12,12 +12,12 @@ namespace bts { namespace api { - class ClientChannel { int _id; + ServiceContext _context; public: - ClientChannel(); + ClientChannel(const ServiceContext&); virtual ~ClientChannel(); template @@ -25,6 +25,7 @@ public: RequestHeader header; header.set_method(method_id); header.set_request_id(++_id); + header.mutable_token()->set_token(_context.token().token()); int header_size = header.ByteSize()+1; assert(header_size < 128); diff --git a/src/lib/api/public/QuickbusClientChannel.cpp b/src/lib/api/public/QuickbusClientChannel.cpp index d6d970138..3713bcbf1 100644 --- a/src/lib/api/public/QuickbusClientChannel.cpp +++ b/src/lib/api/public/QuickbusClientChannel.cpp @@ -4,7 +4,8 @@ namespace bts { namespace api { -QuickbusClientChannel::QuickbusClientChannel(Quickbus& bus, const char* type_name, const char* service_qualifier) : +QuickbusClientChannel::QuickbusClientChannel(Quickbus& bus, const ServiceContext& context, const char* type_name, const char* service_qualifier) : + ClientChannel(context), _pclient(api_client_create(&bus, type_name, service_qualifier)) { } diff --git a/src/lib/api/public/QuickbusClientChannel.h b/src/lib/api/public/QuickbusClientChannel.h index 41f221a51..ab973a9ee 100644 --- a/src/lib/api/public/QuickbusClientChannel.h +++ b/src/lib/api/public/QuickbusClientChannel.h @@ -6,12 +6,13 @@ namespace bts { namespace api { +class ServiceContext; class QuickbusClientChannel : public ClientChannel { ApiClient* _pclient; public: - QuickbusClientChannel(Quickbus&, const char* type_name, const char* service_qualifier); + QuickbusClientChannel(Quickbus&, const ServiceContext&, const char* type_name, const char* service_qualifier); ~QuickbusClientChannel(); private: diff --git a/src/lib/api/public/ServiceContext.cpp b/src/lib/api/public/ServiceContext.cpp index 3422640b7..3fafa77f0 100644 --- a/src/lib/api/public/ServiceContext.cpp +++ b/src/lib/api/public/ServiceContext.cpp @@ -3,34 +3,65 @@ #include "QuickbusClientChannel.h" #include "ApiServer.h" #include "lib/logging/logging.h" +#include "lib/api/services/AuthService.client.pb.h" namespace bts { namespace api { +struct ServiceContextImpl { + ServiceContextImpl(Quickbus* maybe_bus): + _qbus(maybe_bus ? *maybe_bus : *api_create_quickbus(nullptr, 0)), + _owns_qb(maybe_bus == nullptr), + _token(), + _user() + {} + ~ServiceContextImpl() { + if (_owns_qb) { + api_destroy_quickbus(&_qbus); + } + } + Quickbus& _qbus; + bool _owns_qb; + AuthToken _token; + std::string _user; +}; + ServiceContext::ServiceContext(Quickbus* maybe_bus) : - _qbus(maybe_bus ? *maybe_bus : *api_create_quickbus(nullptr, 0)), - _owns_qb(maybe_bus == nullptr) + _self(std::make_shared(maybe_bus)) { } -ServiceContext::~ServiceContext() { - if (_owns_qb) { - api_destroy_quickbus(&_qbus); - } -} +ServiceContext::~ServiceContext() {} std::unique_ptr ServiceContext::create_channel(const char * type_name, const char * service_qualifier) const { LOG(Api,Info,"Locate Service: {}{}",std::string(type_name) ,std::string(service_qualifier)); - return std::unique_ptr(new QuickbusClientChannel(_qbus, type_name, service_qualifier)); + return std::unique_ptr(new QuickbusClientChannel(_self->_qbus, *this, type_name, service_qualifier)); } ServerChannel ServiceContext::publish(ApiServer& service, const std::string& service_type, const std::string& qualifier) const { - return ServerChannel(_qbus, service_type, qualifier, service); + return ServerChannel(_self->_qbus, service_type, qualifier, service); +} + +bool ServiceContext::login(const std::string& username, const std::string& password) { + auto auth = locate(); + user::AuthenticateLoginRequest request; + request.set_login(username); + request.set_password(password); + auto result = auth.authenticate_login(request); + if (result.success()) { + _self->_token = result.value()->token(); //.CopyFrom(result.value()->token()); + _self->_user = username; + } + return false; } void ServiceContext::post(const Action& action, uint64_t delay) { - api_post(_qbus, action, delay); + api_post(_self->_qbus, action, delay); } +Quickbus& ServiceContext::bus() const { return _self->_qbus; } +const AuthToken ServiceContext::token() const { return _self->_token; } +const std::string& ServiceContext::user() const { return _self->_user; } + }}//namespace #endif diff --git a/src/lib/api/public/ServiceContext.h b/src/lib/api/public/ServiceContext.h index c42515ab8..e434affe1 100644 --- a/src/lib/api/public/ServiceContext.h +++ b/src/lib/api/public/ServiceContext.h @@ -5,7 +5,6 @@ // client #include "../core/ApiClientInterop.h" #include "../core/ApiServerInterop.h" -#include "ClientChannel.h" // server #include "ServerChannel.h" @@ -16,13 +15,16 @@ namespace bts { namespace api { +class ClientChannel; +struct ServiceContextImpl; + class BTS_EXPORT ServiceContext { - Quickbus& _qbus; - bool _owns_qb; + std::shared_ptr _self; public: ServiceContext(Quickbus* maybe_bus=nullptr); + // ServiceContext(ServiceContext& other) = default; ~ServiceContext(); template @@ -30,11 +32,14 @@ public: return T(create_channel(T::name(), qualifier)); } + Quickbus& bus() const; + const AuthToken token() const; + const std::string& user() const; + bool login(const std::string& username, const std::string& password); + typedef std::function Action; void post(const Action&, uint64_t delayms=0); - Quickbus& bus() const { return _qbus; } - private: friend class ApiServer; std::unique_ptr create_channel(const char*, const char*) const; diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib/api/service_compiler/templates/cpp/server.pb.cc index 133d58bec..24bf9ed70 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.cc @@ -4,6 +4,7 @@ #include "lib/api/public/ApiUtils.h" #include "lib/api/core/ApiServerInterop.h" #include +#include {{ns-open package}} {{#each service}} diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index f8d0cd3a7..9c9501f16 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -19,6 +19,7 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/orders/Order.h" +#include namespace bts { namespace orderman { From 860132469f20c2f5b19ac83b4c55035edb7ab2c9 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 13:37:37 -0500 Subject: [PATCH 07/45] Add AuthenticatedServiceBase base class to opt in to service authentication --- .../templates/cpp/server.pb.cc | 22 ++++++------- .../templates/cpp/server.pb.h | 32 ++++++++++++++++--- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib/api/service_compiler/templates/cpp/server.pb.cc index 24bf9ed70..50b1e464a 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.cc @@ -20,13 +20,13 @@ const {{key_type.cpptype}}& {{name}}_key(const {{output_type_cpp}}& row) { {{/if}} {{/if}}{{/each}} -{{name}}Base::{{name}}Base(bts::api::ServiceContext& context, const std::string& qualifier) : +Authenticated{{name}}Base::Authenticated{{name}}Base(bts::api::ServiceContext& context, const std::string& qualifier) : bts::api::ApiServer(context, "{{name}}", qualifier) {} -const char* {{name}}Base::name() const { return "{{name}}"; }; +const char* Authenticated{{name}}Base::name() const { return "{{name}}"; }; -void {{name}}Base::dispatch(const bts::api::RequestHeader& header, google::protobuf::io::ZeroCopyInputStream& stream, OnResponse on_response) { +void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, google::protobuf::io::ZeroCopyInputStream& stream, OnResponse on_response) { switch((ServiceMethods)header.method()) { case SYS_PING: { bts::api::PingPong pp; @@ -39,7 +39,7 @@ void {{name}}Base::dispatch(const bts::api::RequestHeader& header, google::proto {{input_type_cpp}} msg; if (msg.ParsePartialFromZeroCopyStream(&stream)) { auto id = header.request_id(); - {{name}}(msg, [this,id,on_response](const {{output_type_cpp}}& result) { + {{name}}(header.has_token() ? &header.token() : nullptr, msg, [this,id,on_response](const {{output_type_cpp}}& result) { respond(id, result, on_response); }); } @@ -59,19 +59,19 @@ void {{name}}Base::dispatch(const bts::api::RequestHeader& header, google::proto {{#each method}}{{#if server_streaming}} -{{../name}}Base::{{cap name}}Publisher {{../name}}Base::make_{{name}}_publisher(std::string const&qualifier) const { +{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(std::string const&qualifier) const { bts::api::TableHandle handle = _channel.create_table(std::string("{{name}}/") + qualifier); return make_{{name}}_publisher(handle); } -{{../name}}Base::{{cap name}}Publisher {{../name}}Base::make_{{name}}_publisher(const {{input_type_cpp}}& qualifier) const { +{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(const {{input_type_cpp}}& qualifier) const { bts::api::TableHandle handle = _channel.create_table(format_qualifier("{{name}}", qualifier)); return make_{{name}}_publisher(handle); } -{{../name}}Base::{{cap name}}Publisher {{../name}}Base::make_{{name}}_publisher() const { +{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher() const { bts::api::TableHandle handle = _channel.create_table("{{name}}"); return make_{{name}}_publisher(handle); } -{{../name}}Base::{{cap name}}Publisher {{../name}}Base::make_{{name}}_publisher(bts::api::TableHandle handle) const { +{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(bts::api::TableHandle handle) const { {{#unless key_type.natural_key}} std::unordered_map<{{key_type.cpptype}}, int> _map; int _next_id; @@ -166,14 +166,14 @@ void {{name}}Base::dispatch(const bts::api::RequestHeader& header, google::proto }; } -{{../name}}Base::{{cap name}}StatefulPublisher {{../name}}Base::make_{{name}}_stateful_publisher() const { +{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher() const { return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(), {{name}}_key); } -{{../name}}Base::{{cap name}}StatefulPublisher {{../name}}Base::make_{{name}}_stateful_publisher(const std::string& qualifier) const { +{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher(const std::string& qualifier) const { return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); } -{{../name}}Base::{{cap name}}StatefulPublisher {{../name}}Base::make_{{name}}_stateful_publisher(const {{input_type_cpp}}& qualifier) const { +{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher(const {{input_type_cpp}}& qualifier) const { return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); } diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.h b/src/lib/api/service_compiler/templates/cpp/server.pb.h index e01679f19..6c6c45c43 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.h @@ -10,6 +10,7 @@ namespace bts { namespace api { class ServiceContext; + class AuthToken; }} {{ns-open package}} @@ -20,7 +21,7 @@ class {{name}};{{/each}} {{#each service}} // {{comment}} -class {{name}}Base : public bts::api::ApiServer { +class Authenticated{{name}}Base : public bts::api::ApiServer { public: {{#each method}} {{#if server_streaming}} @@ -30,7 +31,7 @@ public: {{/each}} protected: - {{name}}Base(bts::api::ServiceContext& context, const std::string& qualifier=""); + Authenticated{{name}}Base(bts::api::ServiceContext& context, const std::string& qualifier=""); const char* name() const override; @@ -46,6 +47,7 @@ protected: {{else}} // {{comment}} virtual void {{name}}( + const api::AuthToken* token, const {{input_type_cpp}}& request, const api::Response<{{output_type_cpp}}>& reply) = 0; {{/if}} @@ -58,11 +60,33 @@ protected: {{/each}} }; -private: - void dispatch(const bts::api::RequestHeader&, google::protobuf::io::ZeroCopyInputStream&, OnResponse) override; {{#each method}}{{#if server_streaming}} {{cap name}}Publisher make_{{name}}_publisher(bts::api::TableHandle) const; {{/if}}{{/each}} + +private: + void dispatch(const bts::api::RequestHeader&, google::protobuf::io::ZeroCopyInputStream&, OnResponse) override; +}; + +// {{comment}} +class {{name}}Base : public Authenticated{{name}}Base { +protected: + {{name}}Base(bts::api::ServiceContext& context, const std::string& qualifier="") : Authenticated{{name}}Base(context, qualifier) {} +public: + {{#each method}} + {{#unless server_streaming}} + void {{name}}( + const api::AuthToken*, + const {{input_type_cpp}}& request, + const api::Response<{{output_type_cpp}}>& reply) override { + {{name}}(request, reply); + } + // {{comment}} + virtual void {{name}}( + const {{input_type_cpp}}& request, + const api::Response<{{output_type_cpp}}>& reply) = 0; + {{/unless}} + {{/each}} }; {{/each}} From 895bf3be6a8c5d93afb1c9576052eb2dcb1eb15f Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 14:08:44 -0500 Subject: [PATCH 08/45] Add AuthenticatedServiceBase class C# --- .../templates/c#/server.pb.cs | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/lib/api/service_compiler/templates/c#/server.pb.cs b/src/lib/api/service_compiler/templates/c#/server.pb.cs index 0cb348228..7668b9390 100644 --- a/src/lib/api/service_compiler/templates/c#/server.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/server.pb.cs @@ -14,9 +14,9 @@ namespace {{package}} {{#each service}} // {{comment}} -internal abstract class {{name}}Base : ApiServer, IDisposable { +internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { readonly ServerChannel _channel; - public {{name}}Base(ServiceContext context, string qualifier="") { + public Authenticated{{name}}Base(ServiceContext context, string qualifier="") { _channel = context.publish(this, "{{name}}", qualifier); } @@ -131,7 +131,7 @@ internal abstract class {{name}}Base : ApiServer, IDisposable { } {{else}} //{{comment}} - public abstract Task<{{output_type_full}}> {{name}}({{input_type_full}} request); + public abstract Task<{{output_type_full}}> {{name}}(bts.api.AuthToken token, {{input_type_full}} request); {{/if}} {{/each}} @@ -153,7 +153,7 @@ internal abstract class {{name}}Base : ApiServer, IDisposable { {{#unless server_streaming}} case ServiceMethods.{{upper name}}: { var msg = {{input_type_full}}.Parser.ParseFrom(request_stream); - var result = {{name}}(msg); + var result = {{name}}(header.Token, msg); var id = header.RequestId; result.ContinueWith(t => respond(id, t, on_response)); break; @@ -170,6 +170,20 @@ internal abstract class {{name}}Base : ApiServer, IDisposable { } } +// {{comment}} +internal abstract class {{name}}Base : Authenticated{{name}}Base , IDisposable { + public {{name}}Base(ServiceContext context, string qualifier="") : base(context, qualifier) { } + {{#each method}} + {{#unless server_streaming}} + public override Task<{{output_type_full}}> {{name}}(bts.api.AuthToken token, {{input_type_full}} request) { + return {{name}}(request); + } + // {{comment}} + public abstract Task<{{output_type_full}}> {{name}}({{input_type_full}} request); + {{/unless}} + {{/each}} +} + {{/each}} } #endregion From d68156f214fe27db748942f43dd9b44745693b30 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 15:56:49 -0500 Subject: [PATCH 09/45] Remove api stream "structured qualifiers". Nobody uses this feature and it is very fragile --- .../spark/core/ShellInterface/UISettings.cs | 2 +- src/client/spark_api/api/ApiServer.cs | 9 ------- src/client/spark_test/api/ApiTests.cs | 27 ------------------- .../templates/c#/client.pb.cs | 8 +++--- .../templates/c#/server.pb.cs | 4 +-- .../templates/cpp/client.pb.cc | 5 ---- .../templates/cpp/client.pb.h | 2 +- 7 files changed, 8 insertions(+), 49 deletions(-) diff --git a/src/client/spark/core/ShellInterface/UISettings.cs b/src/client/spark/core/ShellInterface/UISettings.cs index 58e0cd849..2b454f848 100644 --- a/src/client/spark/core/ShellInterface/UISettings.cs +++ b/src/client/spark/core/ShellInterface/UISettings.cs @@ -120,7 +120,7 @@ namespace mbts.persist public IObservable>> subscribe(string ns, string pattern) { var re = new Regex(pattern); return _persist - .subscribe_ns(new NamespaceSubArgs() { Ns = uns(ns) }) + .subscribe_ns(uns(ns)) .Select(update => update.added .Where(item => re.IsMatch(item.Key)) diff --git a/src/client/spark_api/api/ApiServer.cs b/src/client/spark_api/api/ApiServer.cs index fa431657e..6e7f08c95 100644 --- a/src/client/spark_api/api/ApiServer.cs +++ b/src/client/spark_api/api/ApiServer.cs @@ -17,15 +17,6 @@ namespace bts.api.core internal abstract class ApiServer : IApiServer { - static JsonFormatter _formatter = new JsonFormatter(new JsonFormatter.Settings(true)); - static Regex _fmt_cleanup = new Regex(@"[\s_+]", RegexOptions.Compiled | RegexOptions.Multiline); - public static string format_qualifier(string method, T arg) where T : IMessage { - if (arg != null) { - string arg_fmt = _fmt_cleanup.Replace(_formatter.Format(arg), ""); - return method + arg_fmt; - } - return method; - } public abstract void dispatch(RequestHeader header, Stream request, Action on_response); protected void respond(int request_id, Task task, Action on_response) where T : IMessage, IImmutableMessage { diff --git a/src/client/spark_test/api/ApiTests.cs b/src/client/spark_test/api/ApiTests.cs index d1682bdb7..7f346c1da 100644 --- a/src/client/spark_test/api/ApiTests.cs +++ b/src/client/spark_test/api/ApiTests.cs @@ -34,25 +34,6 @@ namespace mbts.api.Test { Disposable.dispose(ref _context); } - [Test,Ignore("Timeout")] - public void test_format_qualifier() { - var simple = new QualifierArgument() { Simple = new SimpleQualifier() { Symbol = "ES" } }; - var s1 = _mtest.format_qualifier(simple); - var s2 = _ntest.format_qualifier(simple); - Assert.AreEqual(s1.Str, s2.Str); - - var complex = new ComplexQualifier() { - Name = "name", - }; - complex.Probability.AddRange(new[] { 1.0, 2.0 }); - complex.Symbols.Add(simple.Simple); - complex.Symbols.Add(new SimpleQualifier() { Symbol = "$50\"+" }); - var carg = new QualifierArgument() { Complex = complex }; - var c1 = _mtest.format_qualifier(carg); - var c2 = _ntest.format_qualifier(carg); - Assert.AreEqual(c1.Str, c2.Str); - - } [Test, Ignore("Times out")] public void test_empty_reply_is_not_null() { foreach (var svc in test_services()) { @@ -129,14 +110,6 @@ namespace mbts.api.Test { public override Task format_qualifier(QualifierArgument request) { UnitTestResult result = new UnitTestResult(); - switch (request.QualifierCase) { - case QualifierArgument.QualifierOneofCase.Simple: - result.Str = format_qualifier("format_qualifier", request.Simple); - break; - case QualifierArgument.QualifierOneofCase.Complex: - result.Str = format_qualifier("format_qualifier", request.Complex); - break; - } return Task.FromResult(result); } diff --git a/src/lib/api/service_compiler/templates/c#/client.pb.cs b/src/lib/api/service_compiler/templates/c#/client.pb.cs index cb683b463..5e96dd8a4 100644 --- a/src/lib/api/service_compiler/templates/c#/client.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/client.pb.cs @@ -19,11 +19,11 @@ public sealed class {{name}} : IApiClient, IDisposable { {{#each method}} {{#if server_streaming}} // {{comment}} - public IObservable> subscribe_{{name}}({{input_type_full}} qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>(ApiServer.format_qualifier("{{name}}",qualifier), {{output_type_full}}.Parser, a=>a).reconstitute(key); + public IObservable> subscribe_{{name}}(string qualifier=null) { + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>(qualifier, {{output_type_full}}.Parser, a=>a).reconstitute(key); } - public IObservable> subscribei_{{name}}({{input_type_full}} qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>(ApiServer.format_qualifier("{{name}}",qualifier), {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); + public IObservable> subscribei_{{name}}(string qualifier=null) { + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>(qualifier, {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); } private static {{key_type.cstype}} key({{output_type_full}} row) { return row.{{camel key_field}}; diff --git a/src/lib/api/service_compiler/templates/c#/server.pb.cs b/src/lib/api/service_compiler/templates/c#/server.pb.cs index 7668b9390..86f853fb3 100644 --- a/src/lib/api/service_compiler/templates/c#/server.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/server.pb.cs @@ -122,8 +122,8 @@ internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { } //{{comment}} - protected {{cap name}}Publisher make_{{name}}_publisher({{input_type_full}} qualifier=null) { - IntPtr table = _channel.create_table(format_qualifier("{{name}}", qualifier)); + protected {{cap name}}Publisher make_{{name}}_publisher(string qualifier=null) { + IntPtr table = _channel.create_table(qualifier); return new {{cap name}}Publisher(table); } protected static {{key_type.cstype}} {{name}}_key({{output_type_full}} row) { diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.cc b/src/lib/api/service_compiler/templates/cpp/client.pb.cc index eb882a1ee..1bdc3dc9e 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/client.pb.cc @@ -16,11 +16,6 @@ using namespace rxcpp::operators; {{#each method}} {{#if server_streaming}} - rxcpp::observable<{{cap name}}Update> {{../name}}::subscribe_{{name}}(const {{input_type_cpp}}& qualifier) { - return - _pchannel->subscribe<{{output_type_cpp}}>(format_qualifier("{{name}}", qualifier)) - | (bts::api::reconstitute,const {{key_type.cpptype}}, {{../name}}>()); - } rxcpp::observable<{{cap name}}Update> {{../name}}::subscribe_{{name}}(std::string const&qualifier) { return _pchannel->subscribe<{{output_type_cpp}}>(std::string("{{name}}/") + qualifier) diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.h b/src/lib/api/service_compiler/templates/cpp/client.pb.h index 27dbbf615..836e8db84 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/client.pb.h @@ -47,7 +47,7 @@ class BTS_EXPORT {{name}} { {{#each method}} {{#if server_streaming}} // {{comment}} - rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(const {{input_type_cpp}}& qualifier); + // rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(const {{input_type_cpp}}& qualifier); // {{comment}} rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(std::string const&); // {{comment}} From 86199755f50194bf33f488b5f46f1e0141409069 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 17:05:37 -0500 Subject: [PATCH 10/45] SPARK-1906 Stream Auth : C# Client --- .../api/Channels/QuickBusClientChannel.cs | 114 ++++++++++-------- src/client/spark_api/api/ClientChannel.cs | 2 +- src/client/sparkcmd/Cmd/ServiceTestCommand.cs | 10 +- src/lib/api/apicore.proto | 6 + .../templates/c#/client.pb.cs | 34 +++--- 5 files changed, 94 insertions(+), 72 deletions(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index cc94e35f6..d0d03a36e 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -57,60 +57,70 @@ namespace bts.api.core { return tcs.Task; } - public unsafe override IObservable> subscribe(string method_and_qualifier, MessageParser parser, Func converter) { - var result = Observable.Create>(observer => { - bool first_update = true; - // Memory optimization. There is only one update per subscription. - RawUpdate the_update = new RawUpdate(); - ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { - the_update.Clear(); - try { - if (event_type == ApiNativeMethods.EventType.TABLE_UPDATED) { - foreach (var change in changes) { - switch (change.type) { - case ApiNativeMethods.ChangeType.REMOVE: - the_update.removed_keys.Add(change.key); - break; - case ApiNativeMethods.ChangeType.REPLACE: - the_update.changed_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); - the_update.changed_keys.Add(change.key); - break; - case ApiNativeMethods.ChangeType.CREATE: - the_update.added_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); - the_update.added_keys.Add(change.key); - break; - } - } - observer.OnNext(the_update); - } - else if (event_type == ApiNativeMethods.EventType.TABLE_CREATED) { - if (!first_update) { - observer.OnNext(the_update.MarkAsReset()); - } - first_update = false; - } - } - catch (Exception e) { - ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method_and_qualifier}' \n--\n '{e}'"); - // Sleep to let the log message get asyncronously written to disk - Thread.Sleep(100); - Environment.Exit(-1); - } - }; - var subscription = ApiNativeMethods.api_client_subscribe(_client, method_and_qualifier, cb, IntPtr.Zero); - return FinalizeableAnonymousDisposable.Create((disposing) => { - ApiNativeMethods.api_client_unsubscribe(_client, subscription); - subscription = IntPtr.Zero; - GC.KeepAlive(cb); - cb = null; - // Cannot (ever) call logging from the finalizer thread - // if (!disposing) { - // ApiNativeMethods.api_client_log_error($"Subscription has been terminated because the returned IDisposable has been finalized. Subscription: {method_and_qualifier}"); - // } - }); + public override IObservable> subscribe(int method_id, string method_and_qualifier, MessageParser parser, Func converter) { + var result = Observable.Create>(async observer => { + var response = await send(method_id, new StreamRequest() { Token = _context.token }); + if (!response.success) { + observer.OnError(new ApiException(response.error_message)); + return Disposable.Empty; + } + else if (!response.value.Authorized) { + observer.OnError(new UnauthorizedAccessException()); + return Disposable.Empty; + } + return SubscribeNative(method_and_qualifier, parser, converter, observer); }); return result; - } + } + + private unsafe IDisposable SubscribeNative(string method_and_qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { + bool first_update = true; + // Memory optimization. There is only one update per subscription. + RawUpdate the_update = new RawUpdate(); + ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + the_update.Clear(); + try { + if (event_type == ApiNativeMethods.EventType.TABLE_UPDATED) { + foreach (var change in changes) { + switch (change.type) { + case ApiNativeMethods.ChangeType.REMOVE: + the_update.removed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.REPLACE: + the_update.changed_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.changed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.CREATE: + the_update.added_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.added_keys.Add(change.key); + break; + } + } + observer.OnNext(the_update); + } + else if (event_type == ApiNativeMethods.EventType.TABLE_CREATED) { + if (!first_update) { + observer.OnNext(the_update.MarkAsReset()); + } + first_update = false; + } + } + catch (Exception e) { + ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method_and_qualifier}' \n--\n '{e}'"); + // Sleep to let the log message get asyncronously written to disk + Thread.Sleep(100); + Environment.Exit(-1); + } + }; + var subscription = ApiNativeMethods.api_client_subscribe(_client, method_and_qualifier, cb, IntPtr.Zero); + return FinalizeableAnonymousDisposable.Create((disposing) => { + ApiNativeMethods.api_client_unsubscribe(_client, subscription); + subscription = IntPtr.Zero; + GC.KeepAlive(cb); + cb = null; + }); + } + private class FinalizeableAnonymousDisposable : IDisposable { private Action _action; public FinalizeableAnonymousDisposable(Action dispose) { diff --git a/src/client/spark_api/api/ClientChannel.cs b/src/client/spark_api/api/ClientChannel.cs index 324e3c366..8ca3a7bbc 100644 --- a/src/client/spark_api/api/ClientChannel.cs +++ b/src/client/spark_api/api/ClientChannel.cs @@ -13,7 +13,7 @@ namespace bts.api.core { public abstract void Dispose(); public abstract Task> send(int method_id, Request request) where Request: IImmutableMessage where Response : class,IMessage,new(); - public abstract IObservable> subscribe(string method_and_qualifier, MessageParser parser, Func converter=null) + public abstract IObservable> subscribe(int method_id, string method_and_qualifier, MessageParser parser, Func converter=null) where TParse : IMessage; public abstract bool is_sync_call_ok(); diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs index 3e9ff00c5..8682986b4 100644 --- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs +++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs @@ -3,6 +3,7 @@ using bts.api.core; using bts.api.synthetic; using ManyConsole; using System; +using System.Threading; namespace bts { public class ServiceTest : ConsoleCommand { @@ -92,8 +93,13 @@ namespace bts { var ctx = new ServiceContext(); var s = ctx.locate(); - var resp = s.get_admin_data(new VoidMessage()); - Console.WriteLine("{0}", resp); + var d = s.subscribei_admin_data().Subscribe(Console.WriteLine); + //var resp = s.get_admin_data(new VoidMessage()); + //Console.WriteLine("{0}", resp); + + while (true) { + Thread.Sleep(100); + } } } } diff --git a/src/lib/api/apicore.proto b/src/lib/api/apicore.proto index b694f0f10..7573e0d99 100644 --- a/src/lib/api/apicore.proto +++ b/src/lib/api/apicore.proto @@ -37,6 +37,12 @@ message ResponseHeader { ApiError code = 2; } +message StreamRequest { + AuthToken token = 1; +} +message StreamResponse { + bool authorized = 1; +} // Some Useful buffers for use as arguments/returns diff --git a/src/lib/api/service_compiler/templates/c#/client.pb.cs b/src/lib/api/service_compiler/templates/c#/client.pb.cs index 5e96dd8a4..1e050b244 100644 --- a/src/lib/api/service_compiler/templates/c#/client.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/client.pb.cs @@ -18,24 +18,24 @@ public sealed class {{name}} : IApiClient, IDisposable { {{#each method}} {{#if server_streaming}} - // {{comment}} - public IObservable> subscribe_{{name}}(string qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>(qualifier, {{output_type_full}}.Parser, a=>a).reconstitute(key); - } - public IObservable> subscribei_{{name}}(string qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>(qualifier, {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); - } - private static {{key_type.cstype}} key({{output_type_full}} row) { - return row.{{camel key_field}}; - } - {{#if key_type.ismessage}} - private static {{key_type.cstype}} key({{output_type_full}}Immutable row) { - return row.{{camel key_field}}.CloneToMutable(); - } - {{else}} - private static {{key_type.cstype}} key({{output_type_full}}Immutable row) { - return row.{{camel key_field}}; + // {{comment}} + public IObservable> subscribe_{{name}}(string qualifier=null) { + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>({{@index}}, qualifier, {{output_type_full}}.Parser, a=>a).reconstitute(key); } + public IObservable> subscribei_{{name}}(string qualifier=null) { + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>({{@index}}, qualifier, {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); + } + private static {{key_type.cstype}} key({{output_type_full}} row) { + return row.{{camel key_field}}; + } + {{#if key_type.ismessage}} + private static {{key_type.cstype}} key({{output_type_full}}Immutable row) { + return row.{{camel key_field}}.CloneToMutable(); + } + {{else}} + private static {{key_type.cstype}} key({{output_type_full}}Immutable row) { + return row.{{camel key_field}}; + } {{/if}} {{else}} // {{comment}} From d652646e9341be06bf942db03c96e4b50f2287c4 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 17:22:42 -0500 Subject: [PATCH 11/45] SPARK-1906 Stream Auth : C# Server --- .../api/Channels/QuickBusClientChannel.cs | 104 +++++++++--------- src/lib/api/apicore.proto | 5 +- .../templates/c#/server.pb.cs | 14 ++- 3 files changed, 64 insertions(+), 59 deletions(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index d0d03a36e..658f4a965 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -59,7 +59,7 @@ namespace bts.api.core { public override IObservable> subscribe(int method_id, string method_and_qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { - var response = await send(method_id, new StreamRequest() { Token = _context.token }); + var response = await send(method_id, null); if (!response.success) { observer.OnError(new ApiException(response.error_message)); return Disposable.Empty; @@ -67,60 +67,60 @@ namespace bts.api.core { else if (!response.value.Authorized) { observer.OnError(new UnauthorizedAccessException()); return Disposable.Empty; - } + } return SubscribeNative(method_and_qualifier, parser, converter, observer); }); return result; - } - - private unsafe IDisposable SubscribeNative(string method_and_qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { - bool first_update = true; - // Memory optimization. There is only one update per subscription. - RawUpdate the_update = new RawUpdate(); - ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { - the_update.Clear(); - try { - if (event_type == ApiNativeMethods.EventType.TABLE_UPDATED) { - foreach (var change in changes) { - switch (change.type) { - case ApiNativeMethods.ChangeType.REMOVE: - the_update.removed_keys.Add(change.key); - break; - case ApiNativeMethods.ChangeType.REPLACE: - the_update.changed_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); - the_update.changed_keys.Add(change.key); - break; - case ApiNativeMethods.ChangeType.CREATE: - the_update.added_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); - the_update.added_keys.Add(change.key); - break; - } - } - observer.OnNext(the_update); - } - else if (event_type == ApiNativeMethods.EventType.TABLE_CREATED) { - if (!first_update) { - observer.OnNext(the_update.MarkAsReset()); - } - first_update = false; - } - } - catch (Exception e) { - ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method_and_qualifier}' \n--\n '{e}'"); - // Sleep to let the log message get asyncronously written to disk - Thread.Sleep(100); - Environment.Exit(-1); - } - }; - var subscription = ApiNativeMethods.api_client_subscribe(_client, method_and_qualifier, cb, IntPtr.Zero); - return FinalizeableAnonymousDisposable.Create((disposing) => { - ApiNativeMethods.api_client_unsubscribe(_client, subscription); - subscription = IntPtr.Zero; - GC.KeepAlive(cb); - cb = null; - }); - } - + } + + private unsafe IDisposable SubscribeNative(string method_and_qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { + bool first_update = true; + // Memory optimization. There is only one update per subscription. + RawUpdate the_update = new RawUpdate(); + ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + the_update.Clear(); + try { + if (event_type == ApiNativeMethods.EventType.TABLE_UPDATED) { + foreach (var change in changes) { + switch (change.type) { + case ApiNativeMethods.ChangeType.REMOVE: + the_update.removed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.REPLACE: + the_update.changed_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.changed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.CREATE: + the_update.added_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.added_keys.Add(change.key); + break; + } + } + observer.OnNext(the_update); + } + else if (event_type == ApiNativeMethods.EventType.TABLE_CREATED) { + if (!first_update) { + observer.OnNext(the_update.MarkAsReset()); + } + first_update = false; + } + } + catch (Exception e) { + ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method_and_qualifier}' \n--\n '{e}'"); + // Sleep to let the log message get asyncronously written to disk + Thread.Sleep(100); + Environment.Exit(-1); + } + }; + var subscription = ApiNativeMethods.api_client_subscribe(_client, method_and_qualifier, cb, IntPtr.Zero); + return FinalizeableAnonymousDisposable.Create((disposing) => { + ApiNativeMethods.api_client_unsubscribe(_client, subscription); + subscription = IntPtr.Zero; + GC.KeepAlive(cb); + cb = null; + }); + } + private class FinalizeableAnonymousDisposable : IDisposable { private Action _action; public FinalizeableAnonymousDisposable(Action dispose) { diff --git a/src/lib/api/apicore.proto b/src/lib/api/apicore.proto index 7573e0d99..8166a63a6 100644 --- a/src/lib/api/apicore.proto +++ b/src/lib/api/apicore.proto @@ -37,10 +37,7 @@ message ResponseHeader { ApiError code = 2; } -message StreamRequest { - AuthToken token = 1; -} -message StreamResponse { +message StreamAccessResponse { bool authorized = 1; } diff --git a/src/lib/api/service_compiler/templates/c#/server.pb.cs b/src/lib/api/service_compiler/templates/c#/server.pb.cs index 86f853fb3..a82e337eb 100644 --- a/src/lib/api/service_compiler/templates/c#/server.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/server.pb.cs @@ -129,6 +129,12 @@ internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { protected static {{key_type.cstype}} {{name}}_key({{output_type_full}} row) { return row.{{camel key_field}}; } + + public virtual Task allow_{{name}}(bts.api.AuthToken token) { + var r = new StreamAccessResponse() { Authorized = true }; + return Task.FromResult(r); + } + {{else}} //{{comment}} public abstract Task<{{output_type_full}}> {{name}}(bts.api.AuthToken token, {{input_type_full}} request); @@ -150,15 +156,17 @@ internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { break; } {{#each method}} - {{#unless server_streaming}} case ServiceMethods.{{upper name}}: { + {{#if server_streaming}} + var result = allow_{{name}}(header.Token); + {{else}} var msg = {{input_type_full}}.Parser.ParseFrom(request_stream); var result = {{name}}(header.Token, msg); + {{/if}} var id = header.RequestId; result.ContinueWith(t => respond(id, t, on_response)); break; - } - {{/unless}} + } {{/each}} default: var buffer = new ResponseHeader(){ From 955b9d1fecdc95119e4b146ad67d5f60cd6f20f0 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 17:32:54 -0500 Subject: [PATCH 12/45] SPARK-1901 Additional expunging of structured qualifier --- src/client/spark_test/api/ApiTests.cs | 5 ----- src/lib/api/public/ApiUtils.h | 17 ----------------- src/lib/api/services/ApiUnitTestService.proto | 1 - src/lib/api/test/ApiTests.cpp | 19 ------------------- 4 files changed, 42 deletions(-) diff --git a/src/client/spark_test/api/ApiTests.cs b/src/client/spark_test/api/ApiTests.cs index 7f346c1da..69b63f8f0 100644 --- a/src/client/spark_test/api/ApiTests.cs +++ b/src/client/spark_test/api/ApiTests.cs @@ -108,11 +108,6 @@ namespace mbts.api.Test { public ApiTestServiceServer(ServiceContext context) : base(context, "c#") { _context = context; } - public override Task format_qualifier(QualifierArgument request) { - UnitTestResult result = new UnitTestResult(); - return Task.FromResult(result); - } - public override Task run_hello_service(EmptyRequest request) { stop_hello_service(null); _hello = new HelloServiceServer(_context); diff --git a/src/lib/api/public/ApiUtils.h b/src/lib/api/public/ApiUtils.h index 4634b102c..18cc96fd6 100644 --- a/src/lib/api/public/ApiUtils.h +++ b/src/lib/api/public/ApiUtils.h @@ -18,22 +18,5 @@ namespace api { else return ""; } - template - const std::string format_qualifier(const char* type_name, const T& t) { - google::protobuf::util::JsonPrintOptions options; - options.add_whitespace = false; - options.always_print_primitive_fields = true; - std::string result; - auto status = google::protobuf::util::MessageToJsonString(t, &result, options); - assert(status.ok()); - result.erase( std::remove_if(result.begin(), result.end(), [](char c) { - return - c == '+' || - c == '_'; - }), result.end()); - return type_name + result; - } - - }}//namespace diff --git a/src/lib/api/services/ApiUnitTestService.proto b/src/lib/api/services/ApiUnitTestService.proto index a5e56e044..6b8f3b63b 100644 --- a/src/lib/api/services/ApiUnitTestService.proto +++ b/src/lib/api/services/ApiUnitTestService.proto @@ -31,7 +31,6 @@ message QualifierArgument { } service ApiTestService { - rpc format_qualifier(QualifierArgument) returns (UnitTestResult); rpc test_empty_reply(EmptyRequest) returns (UnitTestResult); diff --git a/src/lib/api/test/ApiTests.cpp b/src/lib/api/test/ApiTests.cpp index b17fecfc1..8779490ab 100644 --- a/src/lib/api/test/ApiTests.cpp +++ b/src/lib/api/test/ApiTests.cpp @@ -25,25 +25,6 @@ namespace test { _hello(), _shout() {} - // Inherited via ApiTestServiceBase - virtual void format_qualifier(const QualifierArgument & request, const std::function& reply) override { - UnitTestResult result; - switch (request.qualifier_case()) { - case QualifierArgument::kSimple: - result.set_str( - bts::api::format_qualifier("format_qualifier", request.simple())); - break; - case QualifierArgument::kComplex: - result.set_str( - bts::api::format_qualifier("format_qualifier", request.complex())); - break; - default: - result.set_str("Unknown qualifier test case"); - break; - } - reply(result); - } - // Inherited via ApiTestServiceBase virtual void test_empty_reply(const EmptyRequest&, const std::function& reply) override { UnitTestResult result; From 112a5703e0b37d75cb52a65d5d25d5096950ff51 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 3 Dec 2018 17:35:01 -0500 Subject: [PATCH 13/45] SPARK-1906 Stream Auth : C++ Server --- .../templates/cpp/server.pb.cc | 24 ++++++++++++------- .../templates/cpp/server.pb.h | 6 +++-- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib/api/service_compiler/templates/cpp/server.pb.cc index 50b1e464a..96a73b400 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.cc @@ -34,8 +34,14 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, respond(header.request_id(), pp, on_response); } } break; - {{#each method}} {{#unless server_streaming}} + {{#each method}} case {{upper name}}: { + {{#if server_streaming}} + auto id = header.request_id(); + allow_{{name}}(header.has_token() ? &header.token() : nullptr, [this,id,on_response](const bts::api::StreamAccessResponse& result) { + respond(id,result,on_response); + }); + {{else}} {{input_type_cpp}} msg; if (msg.ParsePartialFromZeroCopyStream(&stream)) { auto id = header.request_id(); @@ -43,8 +49,9 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, respond(id, result, on_response); }); } + {{/if}} } break; - {{/unless}}{{/each}} + {{/each}} default: { bts::api::ResponseHeader response; response.set_request_id(header.request_id()); @@ -63,10 +70,6 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, bts::api::TableHandle handle = _channel.create_table(std::string("{{name}}/") + qualifier); return make_{{name}}_publisher(handle); } -{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(const {{input_type_cpp}}& qualifier) const { - bts::api::TableHandle handle = _channel.create_table(format_qualifier("{{name}}", qualifier)); - return make_{{name}}_publisher(handle); -} {{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher() const { bts::api::TableHandle handle = _channel.create_table("{{name}}"); return make_{{name}}_publisher(handle); @@ -173,10 +176,13 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, {{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher(const std::string& qualifier) const { return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); } -{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher(const {{input_type_cpp}}& qualifier) const { - return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); -} +void Authenticated{{../name}}Base::allow_{{name}}(const bts::api::AuthToken* token, const api::Response& reply) { + (void)token; + bts::api::StreamAccessResponse r; + r.set_authorized(true); + reply(r); +} {{/if}} {{/each}} diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.h b/src/lib/api/service_compiler/templates/cpp/server.pb.h index 6c6c45c43..df5750064 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.h @@ -39,12 +39,14 @@ protected: {{#if server_streaming}} {{cap name}}Publisher make_{{name}}_publisher() const; {{cap name}}Publisher make_{{name}}_publisher(const std::string &) const; - {{cap name}}Publisher make_{{name}}_publisher(const {{input_type_cpp}}& qualifier) const; {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher() const; {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher(const std::string& qualifier) const; - {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher(const {{input_type_cpp}}& qualifier) const; + + virtual void allow_{{name}}(const bts::api::AuthToken*, const api::Response& reply); + {{else}} + // {{comment}} virtual void {{name}}( const api::AuthToken* token, From 93abf315a3d76ea4d721082d851b073cfc8dd70a Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 4 Dec 2018 20:01:25 +0000 Subject: [PATCH 14/45] Added dev process doc. --- doc/dev/dev_process.md | 71 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 doc/dev/dev_process.md diff --git a/doc/dev/dev_process.md b/doc/dev/dev_process.md new file mode 100644 index 000000000..20e02e94d --- /dev/null +++ b/doc/dev/dev_process.md @@ -0,0 +1,71 @@ +# The BTS Development Process # + +## The Big Picture ## + +Our development work is organized in projects. A project is an effort +to specifiy, develop and validate a related set of additions to our +Spark platform. A project can be assigned to one more developers and a +developer might concurrently be assigned to multiple +projects. Projects typically start out with specification work, +proceed to implementation and finish with validation efforts. At any +given time there will be multiple projects being worked on +concurrently. A project is concluded when the features it implements +are merged into the product and deployed to customers. + +## The Details ## +Typically project ideas come from sales interactions, opposition +research and customer feedback, alltough on occasion development or +operational requirements will also suggest potentially valuable +ideas. Whatever the source of a project idea the final decision of +which projects to pursue is always done by management. Once a project +idea has been selected for implementation the corresponding project +will go through several phases: inception, specification, development +and merge. We detail each of these phases below. + +* Inception. In this phase we create the infrastructure for the +project. Typically this means selecting a team, creating a project +case in Jira (that is a case assigned to the team@bluetradesys.com +Jira user) and possibly creating a new branch for the project. This +phase is mostly mechanical and the responsibility of Pedro. + +* Specification. The specification phase turns a usually vague and +ill-considered idea project idea into a concrete, implementable +specification that attempts to maximize the value/cost ratio of the +project. It is hard to exaggerate the impact of a this phase on the +rest of the project. *Nothing* has more impact on our ability to +quickly deliver value to customers than good specification +work. Specification typically take the form of shared google docs, +using a mix of text and UI mockups to capture both user requirements +and suggested implementation strategies. Taha is responsible for this +phase. + +* Development. Once a specification is complete, a team of developers +will use a project specific branch to implement the +specification. Periodically, typically once a week, progress on the +project is assessed by Pedro, possibly with the help of others. This +assessment takes the form of code reviews, demos, or just one-on-one +conversations. To ensure development does not go off on sub-optimal +tangents, developers are expected to continuously merge master into +the project branch as well as encouraged to create Pull Requests (PRs) +early in the project implementation, so that their work is kept +visible and integrated with that of the rest of the group. During the +implementation phase developers should reach out to Pedro for UI +reviews, architecture and design concerns as well as specification +trade off concerns. + +* Merge. Once a project is considered complete by developers, a PR +that includes Pedro should be created (unless, as mentioned above, an +early PR was already created in the development phase). Whether the PR +already existed or not, its description should be changed to start +with the "Ready To Merge" statement. This marks the project as ready +to be merged into master. Once a week, typically on Mondays, Pedro +will go through every PR marked as "Ready To Merge", build it, check +it out and if everything looks good merge it to master. At the end of +the day the resulting master will be tagged with a new version +number. This version will be go through some additional testing by +Brian and will then be deployed by Karl and Pete to customers +throughout the rest of the week. + +## Tools ## + * Pre-Merge checklist + * Code Review tutorial From b5c24880a130da993e6171d2022e316af6004e4b Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 10:51:37 -0500 Subject: [PATCH 15/45] SPARK-1901 - Send qualifier to stream access check --- src/client/spark_api/api/ApiServer.cs | 3 + src/client/spark_api/api/ApiUtils.cs | 126 +++++++++--------- .../api/Channels/QuickBusClientChannel.cs | 3 +- src/client/sparkcmd/Cmd/ServiceTestCommand.cs | 2 +- src/lib/api/apicore.proto | 3 + .../templates/c#/client.pb.cs | 4 +- .../templates/c#/server.pb.cs | 11 +- .../templates/cpp/server.pb.cc | 15 ++- .../templates/cpp/server.pb.h | 2 +- 9 files changed, 93 insertions(+), 76 deletions(-) diff --git a/src/client/spark_api/api/ApiServer.cs b/src/client/spark_api/api/ApiServer.cs index 6e7f08c95..6bf47ca34 100644 --- a/src/client/spark_api/api/ApiServer.cs +++ b/src/client/spark_api/api/ApiServer.cs @@ -19,6 +19,9 @@ namespace bts.api.core { public abstract void dispatch(RequestHeader header, Stream request, Action on_response); + // Indirection to allow ApiServer in different assembly + protected string format_qualifier(string method, string qualifier) => ApiUtils.format_qualifier(method, qualifier); + protected void respond(int request_id, Task task, Action on_response) where T : IMessage, IImmutableMessage { var header = new ResponseHeader() { RequestId = request_id }; if (task.IsCanceled || task.IsFaulted) { diff --git a/src/client/spark_api/api/ApiUtils.cs b/src/client/spark_api/api/ApiUtils.cs index 56a51d27a..75fca66ed 100644 --- a/src/client/spark_api/api/ApiUtils.cs +++ b/src/client/spark_api/api/ApiUtils.cs @@ -1,68 +1,72 @@ -using Google.Protobuf; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace bts.api { - internal static class ApiUtils { - - - public static byte[] serialize(this RequestHeader header, T body) where T : IImmutableMessage { - int body_size = body?.CalculateSize() ?? 0; - int header_size = header.CalculateSize() + 1; // 1 byte header length - var buffer = new byte[header_size+body_size]; +using bts.api.core; +using Google.Protobuf; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace bts.api { + public static class ApiUtils { + + internal static byte[] serialize(this RequestHeader header, T body) where T : IImmutableMessage { + int body_size = body?.CalculateSize() ?? 0; + int header_size = header.CalculateSize() + 1; // 1 byte header length + var buffer = new byte[header_size + body_size]; using (var stream = new MemoryStream(buffer)) { checked { stream.WriteByte((byte)header_size); } header.WriteTo(stream); if (body != null) body.WriteTo(stream); - } - - return buffer; - } - - public struct DeserializeResult { - public THeader header; - public TBody body; - } - - private static DeserializeResult mkresult(THeader header, TBody body) { - return new DeserializeResult() { header = header, body = body }; } - - public static unsafe DeserializeResult deserialize(byte* buffer, long buffer_length) where THeader : IMessage,new() where TBody : class,IMessage,new() { - var header_size = buffer[0]; - Debug.Assert(header_size <= buffer_length); - THeader header = new THeader(); - header.MergeFrom(new UnmanagedMemoryStream(buffer+1, header_size - 1)); - TBody body = new TBody(); - if (buffer_length > header_size) { - body.MergeFrom(new UnmanagedMemoryStream(buffer + header_size, buffer_length - header_size)); - } - return mkresult(header, body); - } - - public static byte[] serialize(this ResponseHeader header, T body) where T : IImmutableMessage { - int header_size = 1 + header.CalculateSize(); - int body_size = body == null ? 0 : body.CalculateSize(); + } + + return buffer; + } + public static string format_qualifier(string method, string qualifier) { + if (string.IsNullOrEmpty(qualifier)) return method; + return $"{method}/{qualifier}"; + } + + internal struct DeserializeResult { + public THeader header; + public TBody body; + } + + private static DeserializeResult mkresult(THeader header, TBody body) { + return new DeserializeResult() { header = header, body = body }; } + + internal static unsafe DeserializeResult deserialize(byte* buffer, long buffer_length) where THeader : IMessage, new() where TBody : class, IMessage, new() { + var header_size = buffer[0]; + Debug.Assert(header_size <= buffer_length); + THeader header = new THeader(); + header.MergeFrom(new UnmanagedMemoryStream(buffer + 1, header_size - 1)); + TBody body = new TBody(); + if (buffer_length > header_size) { + body.MergeFrom(new UnmanagedMemoryStream(buffer + header_size, buffer_length - header_size)); + } + return mkresult(header, body); + } + + internal static byte[] serialize(this ResponseHeader header, T body) where T : IImmutableMessage { + int header_size = 1 + header.CalculateSize(); + int body_size = body == null ? 0 : body.CalculateSize(); var buffer = new byte[header_size + body_size]; - using (var stream = new MemoryStream(buffer)) { - checked { stream.WriteByte((byte)header_size); } - header.WriteTo(stream); - if (body != null) body.WriteTo(stream); + using (var stream = new MemoryStream(buffer)) { + checked { stream.WriteByte((byte)header_size); } + header.WriteTo(stream); + if (body != null) body.WriteTo(stream); } return buffer; - } - public static byte[] serialize(this ResponseHeader header) { - int header_size = 1 + header.CalculateSize(); - var buffer = new byte[header_size]; - using (var stream = new MemoryStream(buffer)) { - checked { stream.WriteByte((byte)header_size); } - header.WriteTo(stream); - } - return buffer; - } - } -} + } + internal static byte[] serialize(this ResponseHeader header) { + int header_size = 1 + header.CalculateSize(); + var buffer = new byte[header_size]; + using (var stream = new MemoryStream(buffer)) { + checked { stream.WriteByte((byte)header_size); } + header.WriteTo(stream); + } + return buffer; + } + } +} diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 658f4a965..54aceebc1 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -59,7 +59,8 @@ namespace bts.api.core { public override IObservable> subscribe(int method_id, string method_and_qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { - var response = await send(method_id, null); + var request = new StreamAccessRequest() { Qualifier = method_and_qualifier }; + var response = await send(method_id, request); if (!response.success) { observer.OnError(new ApiException(response.error_message)); return Disposable.Empty; diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs index 8682986b4..291adfe00 100644 --- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs +++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs @@ -93,7 +93,7 @@ namespace bts { var ctx = new ServiceContext(); var s = ctx.locate(); - var d = s.subscribei_admin_data().Subscribe(Console.WriteLine); + var d = s.subscribei_admin_data("quack").Subscribe(Console.WriteLine); //var resp = s.get_admin_data(new VoidMessage()); //Console.WriteLine("{0}", resp); diff --git a/src/lib/api/apicore.proto b/src/lib/api/apicore.proto index 8166a63a6..c22e023cf 100644 --- a/src/lib/api/apicore.proto +++ b/src/lib/api/apicore.proto @@ -37,6 +37,9 @@ message ResponseHeader { ApiError code = 2; } +message StreamAccessRequest { + string qualifier = 1; +} message StreamAccessResponse { bool authorized = 1; } diff --git a/src/lib/api/service_compiler/templates/c#/client.pb.cs b/src/lib/api/service_compiler/templates/c#/client.pb.cs index 1e050b244..c5591de30 100644 --- a/src/lib/api/service_compiler/templates/c#/client.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/client.pb.cs @@ -20,10 +20,10 @@ public sealed class {{name}} : IApiClient, IDisposable { {{#if server_streaming}} // {{comment}} public IObservable> subscribe_{{name}}(string qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>({{@index}}, qualifier, {{output_type_full}}.Parser, a=>a).reconstitute(key); + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>({{@index}}, bts.api.ApiUtils.format_qualifier("{{name}}",qualifier), {{output_type_full}}.Parser, a=>a).reconstitute(key); } public IObservable> subscribei_{{name}}(string qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>({{@index}}, qualifier, {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>({{@index}}, bts.api.ApiUtils.format_qualifier("{{name}}",qualifier), {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); } private static {{key_type.cstype}} key({{output_type_full}} row) { return row.{{camel key_field}}; diff --git a/src/lib/api/service_compiler/templates/c#/server.pb.cs b/src/lib/api/service_compiler/templates/c#/server.pb.cs index a82e337eb..59a03518b 100644 --- a/src/lib/api/service_compiler/templates/c#/server.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/server.pb.cs @@ -123,21 +123,21 @@ internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { //{{comment}} protected {{cap name}}Publisher make_{{name}}_publisher(string qualifier=null) { - IntPtr table = _channel.create_table(qualifier); + IntPtr table = _channel.create_table(format_qualifier("{{name}}",qualifier)); return new {{cap name}}Publisher(table); } protected static {{key_type.cstype}} {{name}}_key({{output_type_full}} row) { return row.{{camel key_field}}; } - public virtual Task allow_{{name}}(bts.api.AuthToken token) { + public virtual Task allow_{{name}}(bts.api.AuthTokenImmutable? token, string qualifier) { var r = new StreamAccessResponse() { Authorized = true }; return Task.FromResult(r); } {{else}} //{{comment}} - public abstract Task<{{output_type_full}}> {{name}}(bts.api.AuthToken token, {{input_type_full}} request); + public abstract Task<{{output_type_full}}> {{name}}(bts.api.AuthTokenImmutable? token, {{input_type_full}} request); {{/if}} {{/each}} @@ -158,7 +158,8 @@ internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { {{#each method}} case ServiceMethods.{{upper name}}: { {{#if server_streaming}} - var result = allow_{{name}}(header.Token); + var msg = bts.api.StreamAccessRequest.Parser.ParseFrom(request_stream); + var result = allow_{{name}}(header.Token, msg.Qualifier); {{else}} var msg = {{input_type_full}}.Parser.ParseFrom(request_stream); var result = {{name}}(header.Token, msg); @@ -183,7 +184,7 @@ internal abstract class {{name}}Base : Authenticated{{name}}Base , IDisposable { public {{name}}Base(ServiceContext context, string qualifier="") : base(context, qualifier) { } {{#each method}} {{#unless server_streaming}} - public override Task<{{output_type_full}}> {{name}}(bts.api.AuthToken token, {{input_type_full}} request) { + public override Task<{{output_type_full}}> {{name}}(bts.api.AuthTokenImmutable? token, {{input_type_full}} request) { return {{name}}(request); } // {{comment}} diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib/api/service_compiler/templates/cpp/server.pb.cc index 96a73b400..77b1592fa 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.cc @@ -38,9 +38,15 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, case {{upper name}}: { {{#if server_streaming}} auto id = header.request_id(); - allow_{{name}}(header.has_token() ? &header.token() : nullptr, [this,id,on_response](const bts::api::StreamAccessResponse& result) { - respond(id,result,on_response); - }); + bts::api::StreamAccessRequest msg; + if (msg.ParsePartialFromZeroCopyStream(&stream)) { + allow_{{name}}( + header.has_token() ? &header.token() : nullptr, + msg.qualifier(), + [this,id,on_response](const bts::api::StreamAccessResponse& result) { + respond(id,result,on_response); + }); + } {{else}} {{input_type_cpp}} msg; if (msg.ParsePartialFromZeroCopyStream(&stream)) { @@ -177,8 +183,7 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); } -void Authenticated{{../name}}Base::allow_{{name}}(const bts::api::AuthToken* token, const api::Response& reply) { - (void)token; +void Authenticated{{../name}}Base::allow_{{name}}(const bts::api::AuthToken*, const std::string&, const api::Response& reply) { bts::api::StreamAccessResponse r; r.set_authorized(true); reply(r); diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.h b/src/lib/api/service_compiler/templates/cpp/server.pb.h index df5750064..ac6cc21fc 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.h @@ -43,7 +43,7 @@ protected: {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher() const; {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher(const std::string& qualifier) const; - virtual void allow_{{name}}(const bts::api::AuthToken*, const api::Response& reply); + virtual void allow_{{name}}(const bts::api::AuthToken* token, const std::string& qualifier, const api::Response& reply); {{else}} From a0c572ef2e2fa9aa5598e106e40623c0554f5fb5 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 11:08:25 -0500 Subject: [PATCH 16/45] Remove generated call to format_qualifier --- src/client/spark_api/api/ApiUtils.cs | 12 ++++++------ .../spark_api/api/Channels/QuickBusClientChannel.cs | 6 +++--- src/client/spark_api/api/ClientChannel.cs | 2 +- .../api/service_compiler/templates/c#/client.pb.cs | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/client/spark_api/api/ApiUtils.cs b/src/client/spark_api/api/ApiUtils.cs index 75fca66ed..ef1cd61ba 100644 --- a/src/client/spark_api/api/ApiUtils.cs +++ b/src/client/spark_api/api/ApiUtils.cs @@ -9,9 +9,9 @@ using System.Text; using System.Threading.Tasks; namespace bts.api { - public static class ApiUtils { + internal static class ApiUtils { - internal static byte[] serialize(this RequestHeader header, T body) where T : IImmutableMessage { + public static byte[] serialize(this RequestHeader header, T body) where T : IImmutableMessage { int body_size = body?.CalculateSize() ?? 0; int header_size = header.CalculateSize() + 1; // 1 byte header length var buffer = new byte[header_size + body_size]; @@ -28,7 +28,7 @@ namespace bts.api { return $"{method}/{qualifier}"; } - internal struct DeserializeResult { + public struct DeserializeResult { public THeader header; public TBody body; } @@ -36,7 +36,7 @@ namespace bts.api { private static DeserializeResult mkresult(THeader header, TBody body) { return new DeserializeResult() { header = header, body = body }; } - internal static unsafe DeserializeResult deserialize(byte* buffer, long buffer_length) where THeader : IMessage, new() where TBody : class, IMessage, new() { + public static unsafe DeserializeResult deserialize(byte* buffer, long buffer_length) where THeader : IMessage, new() where TBody : class, IMessage, new() { var header_size = buffer[0]; Debug.Assert(header_size <= buffer_length); THeader header = new THeader(); @@ -48,7 +48,7 @@ namespace bts.api { return mkresult(header, body); } - internal static byte[] serialize(this ResponseHeader header, T body) where T : IImmutableMessage { + public static byte[] serialize(this ResponseHeader header, T body) where T : IImmutableMessage { int header_size = 1 + header.CalculateSize(); int body_size = body == null ? 0 : body.CalculateSize(); var buffer = new byte[header_size + body_size]; @@ -59,7 +59,7 @@ namespace bts.api { } return buffer; } - internal static byte[] serialize(this ResponseHeader header) { + public static byte[] serialize(this ResponseHeader header) { int header_size = 1 + header.CalculateSize(); var buffer = new byte[header_size]; using (var stream = new MemoryStream(buffer)) { diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 54aceebc1..15870c2f1 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -57,9 +57,9 @@ namespace bts.api.core { return tcs.Task; } - public override IObservable> subscribe(int method_id, string method_and_qualifier, MessageParser parser, Func converter) { + public override IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { - var request = new StreamAccessRequest() { Qualifier = method_and_qualifier }; + var request = new StreamAccessRequest() { Qualifier = qualifier }; var response = await send(method_id, request); if (!response.success) { observer.OnError(new ApiException(response.error_message)); @@ -69,7 +69,7 @@ namespace bts.api.core { observer.OnError(new UnauthorizedAccessException()); return Disposable.Empty; } - return SubscribeNative(method_and_qualifier, parser, converter, observer); + return SubscribeNative(ApiUtils.format_qualifier(method, qualifier), parser, converter, observer); }); return result; } diff --git a/src/client/spark_api/api/ClientChannel.cs b/src/client/spark_api/api/ClientChannel.cs index 8ca3a7bbc..9624c9b93 100644 --- a/src/client/spark_api/api/ClientChannel.cs +++ b/src/client/spark_api/api/ClientChannel.cs @@ -13,7 +13,7 @@ namespace bts.api.core { public abstract void Dispose(); public abstract Task> send(int method_id, Request request) where Request: IImmutableMessage where Response : class,IMessage,new(); - public abstract IObservable> subscribe(int method_id, string method_and_qualifier, MessageParser parser, Func converter=null) + public abstract IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter=null) where TParse : IMessage; public abstract bool is_sync_call_ok(); diff --git a/src/lib/api/service_compiler/templates/c#/client.pb.cs b/src/lib/api/service_compiler/templates/c#/client.pb.cs index c5591de30..892b58b74 100644 --- a/src/lib/api/service_compiler/templates/c#/client.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/client.pb.cs @@ -20,10 +20,10 @@ public sealed class {{name}} : IApiClient, IDisposable { {{#if server_streaming}} // {{comment}} public IObservable> subscribe_{{name}}(string qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>({{@index}}, bts.api.ApiUtils.format_qualifier("{{name}}",qualifier), {{output_type_full}}.Parser, a=>a).reconstitute(key); + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>({{@index}}, "{{name}}", qualifier, {{output_type_full}}.Parser, a=>a).reconstitute(key); } public IObservable> subscribei_{{name}}(string qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>({{@index}}, bts.api.ApiUtils.format_qualifier("{{name}}",qualifier), {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>({{@index}}, "{{name}}", qualifier, {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); } private static {{key_type.cstype}} key({{output_type_full}} row) { return row.{{camel key_field}}; From 0bdd2dfca02e765780c70f8cacf7d1920ed16906 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 11:33:13 -0500 Subject: [PATCH 17/45] Api: centralize formatting stream topic+qualifier --- src/client/spark_api/api/ApiNativeMethods.cs | 4 ++-- src/client/spark_api/api/ApiServer.cs | 3 --- src/client/spark_api/api/ApiUtils.cs | 4 ---- .../api/Channels/QuickBusClientChannel.cs | 8 ++++---- src/client/spark_api/api/ServerChannel.cs | 4 ++-- src/lib/api/core/ApiClientInterop.cpp | 13 +++++++++---- src/lib/api/core/ApiClientInterop.h | 2 +- src/lib/api/core/ApiServerInterop.cpp | 6 +++--- src/lib/api/core/ApiServerInterop.h | 2 +- src/lib/api/public/ClientChannel.h | 6 +++--- src/lib/api/public/QuickbusClientChannel.cpp | 4 ++-- src/lib/api/public/QuickbusClientChannel.h | 2 +- src/lib/api/public/ServerChannel.cpp | 4 ++-- src/lib/api/public/ServerChannel.h | 2 +- .../api/service_compiler/templates/c#/server.pb.cs | 2 +- .../service_compiler/templates/cpp/client.pb.cc | 4 ++-- .../api/service_compiler/templates/cpp/client.pb.h | 4 +--- .../service_compiler/templates/cpp/server.pb.cc | 14 +++----------- .../api/service_compiler/templates/cpp/server.pb.h | 8 +++----- 19 files changed, 41 insertions(+), 55 deletions(-) diff --git a/src/client/spark_api/api/ApiNativeMethods.cs b/src/client/spark_api/api/ApiNativeMethods.cs index 7db7c0d20..fdc18ed0c 100644 --- a/src/client/spark_api/api/ApiNativeMethods.cs +++ b/src/client/spark_api/api/ApiNativeMethods.cs @@ -64,7 +64,7 @@ namespace bts.api.core { internal static extern void api_client_send(IntPtr nchannel, byte[] buffer, int length, raw_pb_callback p, IntPtr extra); [DllImport("libspark")] - internal static extern IntPtr api_client_subscribe(IntPtr client, string method_and_qualifier, raw_subscription_callback cb, IntPtr extra); + internal static extern IntPtr api_client_subscribe(IntPtr client, string method, string qualifier, raw_subscription_callback cb, IntPtr extra); [DllImport("libspark")] internal static extern void api_client_unsubscribe(IntPtr client, IntPtr subscription); @@ -96,7 +96,7 @@ namespace bts.api.core { } [DllImport("libspark")] - internal static extern IntPtr api_server_create_table(IntPtr server, string method_and_qualifier); + internal static extern IntPtr api_server_create_table(IntPtr server, string method, string qualifier); [DllImport("libspark")] internal static extern void api_server_update_table(IntPtr table, [In] StreamUpdate[] changes, long change_count); [DllImport("libspark")] diff --git a/src/client/spark_api/api/ApiServer.cs b/src/client/spark_api/api/ApiServer.cs index 6bf47ca34..6e7f08c95 100644 --- a/src/client/spark_api/api/ApiServer.cs +++ b/src/client/spark_api/api/ApiServer.cs @@ -19,9 +19,6 @@ namespace bts.api.core { public abstract void dispatch(RequestHeader header, Stream request, Action on_response); - // Indirection to allow ApiServer in different assembly - protected string format_qualifier(string method, string qualifier) => ApiUtils.format_qualifier(method, qualifier); - protected void respond(int request_id, Task task, Action on_response) where T : IMessage, IImmutableMessage { var header = new ResponseHeader() { RequestId = request_id }; if (task.IsCanceled || task.IsFaulted) { diff --git a/src/client/spark_api/api/ApiUtils.cs b/src/client/spark_api/api/ApiUtils.cs index ef1cd61ba..73f7c7545 100644 --- a/src/client/spark_api/api/ApiUtils.cs +++ b/src/client/spark_api/api/ApiUtils.cs @@ -23,10 +23,6 @@ namespace bts.api { return buffer; } - public static string format_qualifier(string method, string qualifier) { - if (string.IsNullOrEmpty(qualifier)) return method; - return $"{method}/{qualifier}"; - } public struct DeserializeResult { public THeader header; diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 15870c2f1..570794013 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -69,12 +69,12 @@ namespace bts.api.core { observer.OnError(new UnauthorizedAccessException()); return Disposable.Empty; } - return SubscribeNative(ApiUtils.format_qualifier(method, qualifier), parser, converter, observer); + return SubscribeNative(method, qualifier, parser, converter, observer); }); return result; } - private unsafe IDisposable SubscribeNative(string method_and_qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { + private unsafe IDisposable SubscribeNative(string method, string qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { bool first_update = true; // Memory optimization. There is only one update per subscription. RawUpdate the_update = new RawUpdate(); @@ -107,13 +107,13 @@ namespace bts.api.core { } } catch (Exception e) { - ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method_and_qualifier}' \n--\n '{e}'"); + ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method}/{qualifier}' \n--\n '{e}'"); // Sleep to let the log message get asyncronously written to disk Thread.Sleep(100); Environment.Exit(-1); } }; - var subscription = ApiNativeMethods.api_client_subscribe(_client, method_and_qualifier, cb, IntPtr.Zero); + var subscription = ApiNativeMethods.api_client_subscribe(_client, method, qualifier, cb, IntPtr.Zero); return FinalizeableAnonymousDisposable.Create((disposing) => { ApiNativeMethods.api_client_unsubscribe(_client, subscription); subscription = IntPtr.Zero; diff --git a/src/client/spark_api/api/ServerChannel.cs b/src/client/spark_api/api/ServerChannel.cs index ca1b2e1a8..a16c3d4b4 100644 --- a/src/client/spark_api/api/ServerChannel.cs +++ b/src/client/spark_api/api/ServerChannel.cs @@ -34,8 +34,8 @@ namespace bts.api.core { } public Action> on_request; - public IntPtr create_table(string method_and_qualifier) { - return ApiNativeMethods.api_server_create_table(_server, method_and_qualifier); + public IntPtr create_table(string method, string qualifier) { + return ApiNativeMethods.api_server_create_table(_server, method, qualifier); } public void Dispose() { diff --git a/src/lib/api/core/ApiClientInterop.cpp b/src/lib/api/core/ApiClientInterop.cpp index e905114a2..3927bbc3e 100644 --- a/src/lib/api/core/ApiClientInterop.cpp +++ b/src/lib/api/core/ApiClientInterop.cpp @@ -181,11 +181,16 @@ void safe_call_subscription_callback(raw_subscription_callback cb, EventType typ } -bts::qbus::Topic stream_topic(const std::string& base_topic, const char* method_and_qualifier) { - return qbus::Topic(base_topic + "-" + method_and_qualifier); +bts::qbus::Topic stream_topic(const std::string& base_topic, const char* method, const char* qualifier) { + if (qualifier == nullptr || strlen(qualifier) == 0) { + return qbus::Topic(base_topic + "-" + method); + } + else { + return qbus::Topic(base_topic + "-" + method + "/" + qualifier); + } } -CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* method_and_qualifier, raw_subscription_callback cb, void* extra) { +CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* method, const char* qualifier, raw_subscription_callback cb, void* extra) { bts_assert(pclient); static_assert((int)qbus::TableEvent::EventType::TABLE_CREATED == EventType::TABLE_CREATED, "Keep these Enums in sync"); static_assert((int)qbus::TableEvent::EventType::TABLE_DESTROYED == EventType::TABLE_DESTROYED, ""); @@ -194,7 +199,7 @@ CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* meth static_assert((int)qbus::Change::Type::REPLACE == StreamUpdate::REPLACE, ""); static_assert((int)qbus::Change::Type::CREATE == StreamUpdate::CREATE, ""); - auto topic = stream_topic(pclient->service_name, method_and_qualifier); + auto topic = stream_topic(pclient->service_name, method, qualifier); LOG(Api,Diag,"api subscribe: {}" ,topic.value()); auto result = new qbus::TableSubscriber(pclient->qbus, equal_topic(topic), [cb, extra](const qbus::TableEvent& ev) { diff --git a/src/lib/api/core/ApiClientInterop.h b/src/lib/api/core/ApiClientInterop.h index 863672f8b..b150e5463 100644 --- a/src/lib/api/core/ApiClientInterop.h +++ b/src/lib/api/core/ApiClientInterop.h @@ -21,7 +21,7 @@ enum EventType { typedef void* TableSubscription; typedef void(*raw_subscription_callback)(EventType event_type, const StreamUpdate* changes, int count, void* extra); -CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* method_and_qualifier, raw_subscription_callback cb, void* extra); +CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* method, const char* qualifier, raw_subscription_callback cb, void* extra); CAPI void api_client_unsubscribe(ApiClient* pclient, TableSubscription ptable); }}//namespace diff --git a/src/lib/api/core/ApiServerInterop.cpp b/src/lib/api/core/ApiServerInterop.cpp index fa00bdef9..8b57c72dd 100644 --- a/src/lib/api/core/ApiServerInterop.cpp +++ b/src/lib/api/core/ApiServerInterop.cpp @@ -9,7 +9,7 @@ namespace api { // defined in ApiClientInterop.h std::string base_topic(const char* type_name, const char* service_qualifier); bts::qbus::RPCServiceName rpc_topic(const std::string& base_topic); -bts::qbus::Topic stream_topic(const std::string& base_topic, const char* method_and_qualifier); +bts::qbus::Topic stream_topic(const std::string& base_topic, const char* method, const char* qualifier); struct ApiServerCore { ApiServerCore(Quickbus& qbus, const std::string topic, const qbus::OnRPCRequest& handler) : @@ -51,9 +51,9 @@ CAPI void api_server_call_callback(ReplyHandler** ppvhandler, const uint8_t* buf *pphandler = nullptr; } -CAPI TableHandle api_server_create_table(ApiServerCore* pserver, const char* method_and_qualifier) { +CAPI TableHandle api_server_create_table(ApiServerCore* pserver, const char* method, const char* qualifier) { bts_assert(pserver); - auto topic = stream_topic(pserver->topic, method_and_qualifier); + auto topic = stream_topic(pserver->topic, method, qualifier); LOG(Api,Info,"Create table: {}",topic.value()); return new qbus::TablePublisher(pserver->qbus, topic); } diff --git a/src/lib/api/core/ApiServerInterop.h b/src/lib/api/core/ApiServerInterop.h index 3e03d2be3..e25b637b2 100644 --- a/src/lib/api/core/ApiServerInterop.h +++ b/src/lib/api/core/ApiServerInterop.h @@ -12,7 +12,7 @@ CAPI ApiServerCore* api_server_create(Quickbus* pbus, const char* type_name, con CAPI void api_server_call_callback(ReplyHandler** pphandler, const uint8_t* buffer, int length); typedef void* TableHandle; -CAPI TableHandle api_server_create_table(ApiServerCore* pserver, const char* method_and_qualifier); +CAPI TableHandle api_server_create_table(ApiServerCore* pserver, const char* method, const char* qualifier); CAPI void api_server_update_table(TableHandle htable, StreamUpdate* raw_changes, int change_count); }}//namespace diff --git a/src/lib/api/public/ClientChannel.h b/src/lib/api/public/ClientChannel.h index 17782f46d..c194a1b5a 100644 --- a/src/lib/api/public/ClientChannel.h +++ b/src/lib/api/public/ClientChannel.h @@ -63,7 +63,7 @@ public: template - rxcpp::observable>> subscribe(const std::string& method_and_qualifier) { + rxcpp::observable>> subscribe(const char* method, const char* qualifier) { return rxcpp::observable<>::create>>([=](rxcpp::subscriber>> observer) { bool first_update = true; auto cb = [observer, first_update](EventType event_type, const StreamUpdate* changes, int change_count) mutable { @@ -98,7 +98,7 @@ public: } }; observer.add( - subscribe_core(method_and_qualifier, cb)); + subscribe_core(method, qualifier, cb)); }); } @@ -109,7 +109,7 @@ protected: typedef std::function Unsubscribe; typedef std::function OnSubscriptionCB; virtual void send_core(const std::string& request_buffer, OnReply on_response) = 0; - virtual Unsubscribe subscribe_core(const std::string& method_and_qualifier, OnSubscriptionCB cb) = 0; + virtual Unsubscribe subscribe_core(const char* method, const char* qualifier, OnSubscriptionCB cb) = 0; private: ClientChannel(const ClientChannel& other);// = delete; diff --git a/src/lib/api/public/QuickbusClientChannel.cpp b/src/lib/api/public/QuickbusClientChannel.cpp index 3713bcbf1..157e00c40 100644 --- a/src/lib/api/public/QuickbusClientChannel.cpp +++ b/src/lib/api/public/QuickbusClientChannel.cpp @@ -28,14 +28,14 @@ void QuickbusClientChannel::send_core(const std::string& request_envalope, OnRep api_client_send(_pclient, request_envalope.c_str(), request_envalope.size(), trampoline, heap_on_response); } -ClientChannel::Unsubscribe QuickbusClientChannel::subscribe_core(const std::string & method_and_qualifier, OnSubscriptionCB cb) { +ClientChannel::Unsubscribe QuickbusClientChannel::subscribe_core(const char* method, const char* qualifier, OnSubscriptionCB cb) { raw_subscription_callback trampoline = [](EventType event_type, const StreamUpdate* changes, int count, void* extra) { OnSubscriptionCB* heap_cb = static_cast(extra); assert(heap_cb != nullptr); (*heap_cb)(event_type, changes, count); }; OnSubscriptionCB* heap_cb = new OnSubscriptionCB(cb); - auto subscription = api_client_subscribe(_pclient, method_and_qualifier.c_str(), trampoline, heap_cb); + auto subscription = api_client_subscribe(_pclient, method, qualifier, trampoline, heap_cb); return [this,subscription,heap_cb]() { api_client_unsubscribe(_pclient, subscription); delete heap_cb; diff --git a/src/lib/api/public/QuickbusClientChannel.h b/src/lib/api/public/QuickbusClientChannel.h index ab973a9ee..bfda19f4f 100644 --- a/src/lib/api/public/QuickbusClientChannel.h +++ b/src/lib/api/public/QuickbusClientChannel.h @@ -19,7 +19,7 @@ private: BTS_NO_COPY(QuickbusClientChannel); virtual void send_core(const std::string& request_envalope, OnReply on_response) override; - virtual Unsubscribe subscribe_core(const std::string& method_and_qualifier, OnSubscriptionCB cb) override; + virtual Unsubscribe subscribe_core(const char* method, const char* qualifier, OnSubscriptionCB cb) override; virtual bool is_sync_call_ok() override; }; diff --git a/src/lib/api/public/ServerChannel.cpp b/src/lib/api/public/ServerChannel.cpp index a614806e8..6a791638e 100644 --- a/src/lib/api/public/ServerChannel.cpp +++ b/src/lib/api/public/ServerChannel.cpp @@ -51,8 +51,8 @@ ServerChannel::ServerChannel(ServerChannel&& other) : _me(std::move(other._me)) ServerChannel::~ServerChannel() { } -TableHandle ServerChannel::create_table(const std::string& method_and_qualifier) const { - return api_server_create_table(_me->_core, method_and_qualifier.c_str()); +TableHandle ServerChannel::create_table(const char* method, const char* qualifier) const { + return api_server_create_table(_me->_core, method, qualifier); } void ServerChannel::publish(TableHandle table, StreamUpdate* changes, int change_count) const { api_server_update_table(table, changes, change_count); diff --git a/src/lib/api/public/ServerChannel.h b/src/lib/api/public/ServerChannel.h index 102db0bf3..bce1c6661 100644 --- a/src/lib/api/public/ServerChannel.h +++ b/src/lib/api/public/ServerChannel.h @@ -15,7 +15,7 @@ public: ServerChannel(ServerChannel&& other);// : _me(std::move(other._me)) {} ~ServerChannel(); - TableHandle create_table(const std::string& method_and_qualifier) const; + TableHandle create_table(const char* method, const char* qualifier) const; void publish(TableHandle table, StreamUpdate* changes, int change_count) const; private: diff --git a/src/lib/api/service_compiler/templates/c#/server.pb.cs b/src/lib/api/service_compiler/templates/c#/server.pb.cs index 59a03518b..8e4fa0076 100644 --- a/src/lib/api/service_compiler/templates/c#/server.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/server.pb.cs @@ -123,7 +123,7 @@ internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { //{{comment}} protected {{cap name}}Publisher make_{{name}}_publisher(string qualifier=null) { - IntPtr table = _channel.create_table(format_qualifier("{{name}}",qualifier)); + IntPtr table = _channel.create_table("{{name}}",qualifier); return new {{cap name}}Publisher(table); } protected static {{key_type.cstype}} {{name}}_key({{output_type_full}} row) { diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.cc b/src/lib/api/service_compiler/templates/cpp/client.pb.cc index 1bdc3dc9e..a14427d06 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/client.pb.cc @@ -18,12 +18,12 @@ using namespace rxcpp::operators; {{#if server_streaming}} rxcpp::observable<{{cap name}}Update> {{../name}}::subscribe_{{name}}(std::string const&qualifier) { return - _pchannel->subscribe<{{output_type_cpp}}>(std::string("{{name}}/") + qualifier) + _pchannel->subscribe<{{output_type_cpp}}>("{{name}}/", qualifier.c_str()) | (bts::api::reconstitute,const {{key_type.cpptype}}, {{../name}}>()); } rxcpp::observable<{{cap name}}Update> {{../name}}::subscribe_{{name}}() { return - _pchannel->subscribe<{{output_type_cpp}}>("{{name}}") + _pchannel->subscribe<{{output_type_cpp}}>("{{name}}", nullptr) | (bts::api::reconstitute,const {{key_type.cpptype}}, {{../name}}>()); } diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.h b/src/lib/api/service_compiler/templates/cpp/client.pb.h index 836e8db84..338462bd1 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/client.pb.h @@ -47,9 +47,7 @@ class BTS_EXPORT {{name}} { {{#each method}} {{#if server_streaming}} // {{comment}} - // rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(const {{input_type_cpp}}& qualifier); - // {{comment}} - rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(std::string const&); + rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(std::string const& qualifier); // {{comment}} rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(); {{else}} diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib/api/service_compiler/templates/cpp/server.pb.cc index 77b1592fa..9c83b25c4 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.cc @@ -72,12 +72,8 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, {{#each method}}{{#if server_streaming}} -{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(std::string const&qualifier) const { - bts::api::TableHandle handle = _channel.create_table(std::string("{{name}}/") + qualifier); - return make_{{name}}_publisher(handle); -} -{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher() const { - bts::api::TableHandle handle = _channel.create_table("{{name}}"); +{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(const char* qualifier) const { + bts::api::TableHandle handle = _channel.create_table("{{name}}", qualifier); return make_{{name}}_publisher(handle); } {{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(bts::api::TableHandle handle) const { @@ -175,11 +171,7 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, }; } -{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher() const { - return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(), {{name}}_key); -} - -{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher(const std::string& qualifier) const { +{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher(const char* qualifier) const { return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); } diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.h b/src/lib/api/service_compiler/templates/cpp/server.pb.h index ac6cc21fc..90aec631c 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.h @@ -37,11 +37,9 @@ protected: {{#each method}} {{#if server_streaming}} - {{cap name}}Publisher make_{{name}}_publisher() const; - {{cap name}}Publisher make_{{name}}_publisher(const std::string &) const; - - {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher() const; - {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher(const std::string& qualifier) const; + {{cap name}}Publisher make_{{name}}_publisher(const std::string& qualifier) const { return make_{{name}}_publisher(qualifier.c_str()); } + {{cap name}}Publisher make_{{name}}_publisher(const char* qualifier=nullptr) const; + {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher(const char* qualifier=nullptr) const; virtual void allow_{{name}}(const bts::api::AuthToken* token, const std::string& qualifier, const api::Response& reply); From 97925a82d43b11130adabaed01817838075c0afd Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 13:35:57 -0500 Subject: [PATCH 18/45] SPARK-1906 - C++ client --- src/lib/api/public/ClientChannel.h | 79 +++++++++++-------- .../templates/cpp/client.pb.cc | 6 +- 2 files changed, 50 insertions(+), 35 deletions(-) diff --git a/src/lib/api/public/ClientChannel.h b/src/lib/api/public/ClientChannel.h index c194a1b5a..46266a1e9 100644 --- a/src/lib/api/public/ClientChannel.h +++ b/src/lib/api/public/ClientChannel.h @@ -21,7 +21,7 @@ public: virtual ~ClientChannel(); template - void send(int method_id, const Request& request, std::function)> on_response) { + void send(int method_id, const Request& request, std::function)> on_response) { RequestHeader header; header.set_method(method_id); header.set_request_id(++_id); @@ -63,42 +63,57 @@ public: template - rxcpp::observable>> subscribe(const char* method, const char* qualifier) { + rxcpp::observable>> subscribe(int method_id, const char* method, const std::string& qualifier) { return rxcpp::observable<>::create>>([=](rxcpp::subscriber>> observer) { - bool first_update = true; - auto cb = [observer, first_update](EventType event_type, const StreamUpdate* changes, int change_count) mutable { - if (event_type == EventType::TABLE_UPDATED) { - std::vector> added_items; - std::vector added_keys, - removed_keys; - for (size_t x = 0; x < change_count; ++x) { - const StreamUpdate& change = changes[x]; - if (change.type != StreamUpdate::REMOVE) { - added_keys.reserve(change_count); - added_items.reserve(change_count); - added_keys.push_back(change.key); - google::protobuf::io::ArrayInputStream stream(change.buffer, change.buffer_len); - auto item = std::make_shared(); - if (item->ParseFromZeroCopyStream(&stream)) { - added_items.push_back(move(item)); + StreamAccessRequest request; + request.set_qualifier(qualifier); + send(method_id, request, [=](const Result& response) { + // There is a race on server startup. If the server is not yet we can't return a dead stream + // if (!response) { + // observer.on_error( + // std::make_exception_ptr( + // ApiException(response.error_message()))); + // } + if (response && !response.value()->authorized()) { + observer.on_completed(); + } + else { + bool first_update = true; + auto cb = [observer, first_update](EventType event_type, const StreamUpdate* changes, int change_count) mutable { + if (event_type == EventType::TABLE_UPDATED) { + std::vector> added_items; + std::vector added_keys, + removed_keys; + for (size_t x = 0; x < change_count; ++x) { + const StreamUpdate& change = changes[x]; + if (change.type != StreamUpdate::REMOVE) { + added_keys.reserve(change_count); + added_items.reserve(change_count); + added_keys.push_back(change.key); + google::protobuf::io::ArrayInputStream stream(change.buffer, change.buffer_len); + auto item = std::make_shared(); + if (item->ParseFromZeroCopyStream(&stream)) { + added_items.push_back(move(item)); + } + } + if (change.type != StreamUpdate::CREATE) { + removed_keys.reserve(change_count); + removed_keys.push_back(change.key); + } } + observer.on_next(RawUpdate>(added_items, added_keys, removed_keys)); } - if (change.type != StreamUpdate::CREATE) { - removed_keys.reserve(change_count); - removed_keys.push_back(change.key); + else if (event_type == EventType::TABLE_CREATED) { + if (!first_update) { + observer.on_next(RawUpdate>::Reset()); + } + first_update = false; } - } - observer.on_next(RawUpdate>(added_items, added_keys, removed_keys)); + }; + observer.add( + subscribe_core(method, qualifier.c_str(), cb)); } - else if (event_type == EventType::TABLE_CREATED) { - if (!first_update) { - observer.on_next(RawUpdate>::Reset()); - } - first_update = false; - } - }; - observer.add( - subscribe_core(method, qualifier, cb)); + }); }); } diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.cc b/src/lib/api/service_compiler/templates/cpp/client.pb.cc index a14427d06..105646be3 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/client.pb.cc @@ -18,12 +18,12 @@ using namespace rxcpp::operators; {{#if server_streaming}} rxcpp::observable<{{cap name}}Update> {{../name}}::subscribe_{{name}}(std::string const&qualifier) { return - _pchannel->subscribe<{{output_type_cpp}}>("{{name}}/", qualifier.c_str()) + _pchannel->subscribe<{{output_type_cpp}}>({{@index}}, "{{name}}/", qualifier) | (bts::api::reconstitute,const {{key_type.cpptype}}, {{../name}}>()); } rxcpp::observable<{{cap name}}Update> {{../name}}::subscribe_{{name}}() { return - _pchannel->subscribe<{{output_type_cpp}}>("{{name}}", nullptr) + _pchannel->subscribe<{{output_type_cpp}}>({{@index}}, "{{name}}", "") | (bts::api::reconstitute,const {{key_type.cpptype}}, {{../name}}>()); } @@ -39,7 +39,7 @@ using namespace rxcpp::operators; {{else}} - void {{../name}}::{{name}}(const {{input_type_cpp}}& input, std::function)> callback, uint32_t timeout_ms) { + void {{../name}}::{{name}}(const {{input_type_cpp}}& input, std::function)> callback, uint32_t timeout_ms) { _pchannel->send({{@index}}, input, callback); } From 67d0a0351acaa9554ce7b8a08002c457da7b22c8 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 13:36:20 -0500 Subject: [PATCH 19/45] SPARK-1901 Fix race with server startup in c# api client --- .../api/Channels/QuickBusClientChannel.cs | 38 ++++++++++++++----- src/client/sparkcmd/Cmd/ServiceTestCommand.cs | 2 +- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 570794013..5c78858c4 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -59,20 +59,38 @@ namespace bts.api.core { public override IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { - var request = new StreamAccessRequest() { Qualifier = qualifier }; - var response = await send(method_id, request); - if (!response.success) { - observer.OnError(new ApiException(response.error_message)); - return Disposable.Empty; + while (true) { + var response = await check_stream_access(method_id, qualifier); + if (response.success) { + if (response.value.Authorized) { + // success. Break loop and subscribe + break; + } + else { + // Not authorized. return empty stream + observer.OnCompleted(); + return Disposable.Empty; + } + } + else { + // Wait for stream to fire once before trying again + var tcs = new TaskCompletionSource(); + ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + tcs.SetResult(true); + }; + await tcs.Task; + } } - else if (!response.value.Authorized) { - observer.OnError(new UnauthorizedAccessException()); - return Disposable.Empty; - } - return SubscribeNative(method, qualifier, parser, converter, observer); + + // Authorized. Stream events + return SubscribeNative(method, qualifier, parser, converter, observer); }); return result; } + private Task> check_stream_access(int method_id, string qualifier) { + var request = new StreamAccessRequest() { Qualifier = qualifier }; + return send(method_id, request); + } private unsafe IDisposable SubscribeNative(string method, string qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { bool first_update = true; diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs index 291adfe00..8682986b4 100644 --- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs +++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs @@ -93,7 +93,7 @@ namespace bts { var ctx = new ServiceContext(); var s = ctx.locate(); - var d = s.subscribei_admin_data("quack").Subscribe(Console.WriteLine); + var d = s.subscribei_admin_data().Subscribe(Console.WriteLine); //var resp = s.get_admin_data(new VoidMessage()); //Console.WriteLine("{0}", resp); From 5626614e2dc30f6b4df3fdb1525bed66ac557686 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 13:54:21 -0500 Subject: [PATCH 20/45] SPARK-1901 Delegates don't do anything if they aren't used --- .../spark_api/api/Channels/QuickBusClientChannel.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 5c78858c4..21ed082a7 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -59,6 +59,11 @@ namespace bts.api.core { public override IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { + IntPtr temp_subscription = IntPtr.Zero; + void unsubscribe_temp_sub() { + // Unsubscribe late to keep qb refcount > 0 continuously + if (temp_subscription != IntPtr.Zero) ApiNativeMethods.api_client_unsubscribe(_client, temp_subscription); + } while (true) { var response = await check_stream_access(method_id, qualifier); if (response.success) { @@ -68,21 +73,26 @@ namespace bts.api.core { } else { // Not authorized. return empty stream + unsubscribe_temp_sub(); observer.OnCompleted(); return Disposable.Empty; } } else { // Wait for stream to fire once before trying again + unsubscribe_temp_sub(); var tcs = new TaskCompletionSource(); ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { - tcs.SetResult(true); + tcs.TrySetResult(true); }; + temp_subscription = ApiNativeMethods.api_client_subscribe(_client, method, qualifier, cb, IntPtr.Zero); await tcs.Task; + GC.KeepAlive(cb); } } // Authorized. Stream events + unsubscribe_temp_sub(); return SubscribeNative(method, qualifier, parser, converter, observer); }); return result; From 69b75c5f5eab27946fdbead65b9e8e182221a8f0 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 14:08:28 -0500 Subject: [PATCH 21/45] SPARK-1901 Protobuf doesn't want null here --- src/client/spark_api/api/Channels/QuickBusClientChannel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 21ed082a7..937ac10b8 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -98,7 +98,7 @@ namespace bts.api.core { return result; } private Task> check_stream_access(int method_id, string qualifier) { - var request = new StreamAccessRequest() { Qualifier = qualifier }; + var request = new StreamAccessRequest() { Qualifier = qualifier ?? "" }; return send(method_id, request); } From 0468fe4f4d12d784feae165c93595a130f092bb5 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 15:37:40 -0500 Subject: [PATCH 22/45] Add AuthToken unit tests --- src/lib/utils/AuthToken.cpp | 1 + src/lib/utils/tests/AuthTokenTests.cpp | 40 ++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 src/lib/utils/tests/AuthTokenTests.cpp diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 69537bfca..43f1290ec 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -40,6 +40,7 @@ AuthToken generate_wheel_token() { #endif bool decode_token(const std::string& token, user::TokenPayload* payload) { + if (token.empty()) return false; std::string temp = websocketpp::base64_decode(token); if (payload) { return payload->ParseFromString(temp); diff --git a/src/lib/utils/tests/AuthTokenTests.cpp b/src/lib/utils/tests/AuthTokenTests.cpp new file mode 100644 index 000000000..779f53f07 --- /dev/null +++ b/src/lib/utils/tests/AuthTokenTests.cpp @@ -0,0 +1,40 @@ +#ifndef _WIN32 +#include "../AuthToken.h" +#include "catch/catch.hpp" +namespace bts { +namespace test { + +TEST_CASE("AuthToken", "[security]") { + api::admin::BTSUser user; + user.set_id(42); + user.set_name("user1"); + + SECTION("round trip") { + auto token = api::auth::generate_token(user); + api::user::TokenPayload payload; + REQUIRE(api::auth::decode_token(token.token(), &payload)); + REQUIRE(payload.id() == user.id()); + REQUIRE(payload.wheel() == false); + } + + SECTION("empty token") { + api::user::TokenPayload payload; + REQUIRE(!api::auth::decode_token("", &payload)); + REQUIRE(payload.id() == 0); + REQUIRE(!payload.wheel()); + } + + SECTION("bts is the big wheel") { + user.set_name("bts"); + auto token = api::auth::generate_token(user); + api::user::TokenPayload payload; + REQUIRE(api::auth::decode_token(token.token(), &payload)); + REQUIRE(payload.id() == user.id()); + REQUIRE(payload.wheel()); + } + + +} + +}}//ns +#endif \ No newline at end of file From 9c5ddba7f7275ca2b48cfd983155a7619760558b Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 6 Dec 2018 12:07:16 -0500 Subject: [PATCH 23/45] SPARK-1901 'real' aes --- .vscode/launch.json | 2 +- src/lib/utils/AuthToken.cpp | 68 +++++++++++++++++++++----- src/lib/utils/AuthToken.h | 1 + src/lib/utils/tests/AuthTokenTests.cpp | 4 +- 4 files changed, 60 insertions(+), 15 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 163cad3eb..fd21a1f69 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -209,7 +209,7 @@ "type": "cppdbg", "request": "launch", "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd", - "args": ["test","Co2Tests"], + "args": ["test","AuthToken"], "stopAtEntry": false, "cwd": "/home/bts/spark/build/ninja_debug/src/server/sparkd/", "environment": [], diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 43f1290ec..e4cb116ea 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -1,14 +1,46 @@ #include "AuthToken.h" +#ifndef _WIN32 #include "lib/utils/base64.hpp" #include "lib/utils/bts_assert.h" #include "datetime.h" #include "base64.hpp" +// cryptopp +#include //temp +#include +#include +#include +#include +#include +#include + namespace bts { namespace api { namespace auth { -#ifndef _WIN32 +using namespace CryptoPP; +// chosen by fair dice roll. +// guaranteed to be random. +constexpr byte raw_key[AES::DEFAULT_KEYLENGTH] = { 75, 22, 52, 77, 93, 194, 234, 176, 155, 181, 215, 7, 185, 211, 20, 43 }; +const SecByteBlock bts_key(raw_key, AES::DEFAULT_KEYLENGTH); +constexpr byte raw_ivector[16] = { 182, 169, 236, 110, 146, 158, 187, 4, 5, 160, 205, 242, 174, 92, 127, 175 }; +const SecByteBlock bts_iv(raw_ivector, sizeof(raw_ivector)); + +std::string encrypt(const std::string& buffer) { + CFB_Mode::Encryption enc(bts_key, bts_key.size(), bts_iv); + std::string result; + result.resize(buffer.size()); + enc.ProcessData((byte*)result.c_str(), (byte*)buffer.c_str(), buffer.size()); + return result; +} + +std::string decrypt(const std::string& buffer) { + CFB_Mode::Decryption dec(bts_key, bts_key.size(), bts_iv); + std::string result; + result.resize(buffer.size()); + dec.ProcessData((byte*)result.c_str(), (byte*)buffer.c_str(), buffer.size()); + return result; +} AuthToken generate_token(const admin::BTSUser& user) { api::user::TokenPayload payload; @@ -17,7 +49,7 @@ AuthToken generate_token(const admin::BTSUser& user) { if(user.name() == "bts") { payload.set_wheel(true); } - auto token = websocketpp::base64_encode(payload.SerializeAsString()); + auto token = encrypt(payload.SerializeAsString()); bts_assert_d(token.size() < 255-8); AuthToken result; result.set_token(token); @@ -28,28 +60,40 @@ AuthToken generate_wheel_token() { payload.set_date(datetime::ll_now()); payload.set_id(99999); payload.set_wheel(true); - auto token = websocketpp::base64_encode(payload.SerializeAsString()); + auto token = encrypt(payload.SerializeAsString()); AuthToken result; result.set_token(token); return result; } -#else -AuthToken generate_wheel_token() { - return AuthToken(); -} -#endif - bool decode_token(const std::string& token, user::TokenPayload* payload) { if (token.empty()) return false; - std::string temp = websocketpp::base64_decode(token); + std::string temp = decrypt(token); if (payload) { - return payload->ParseFromString(temp); + return payload->ParseFromString(temp) && !is_expired(*payload); } else { // validate the token but don't return it user::TokenPayload payload; - return payload.ParseFromString(temp); + return payload.ParseFromString(temp) && !is_expired(payload); } } +bool is_expired(const user::TokenPayload&) { + return false; +} + + +#else +namespace bts { +namespace api { +namespace auth { + +AuthToken generate_wheel_token() { + return AuthToken(); +} +bool decode_token(const std::string& token, user::TokenPayload* payload) { + return false; +} +#endif + }}} diff --git a/src/lib/utils/AuthToken.h b/src/lib/utils/AuthToken.h index d9043939a..e0b330b41 100644 --- a/src/lib/utils/AuthToken.h +++ b/src/lib/utils/AuthToken.h @@ -10,6 +10,7 @@ namespace auth { AuthToken generate_token(const admin::BTSUser&); AuthToken generate_wheel_token(); bool decode_token(const std::string& token, user::TokenPayload* payload); +bool is_expired(const user::TokenPayload&); }}} diff --git a/src/lib/utils/tests/AuthTokenTests.cpp b/src/lib/utils/tests/AuthTokenTests.cpp index 779f53f07..18c098b3f 100644 --- a/src/lib/utils/tests/AuthTokenTests.cpp +++ b/src/lib/utils/tests/AuthTokenTests.cpp @@ -11,6 +11,8 @@ TEST_CASE("AuthToken", "[security]") { SECTION("round trip") { auto token = api::auth::generate_token(user); + // We use 1 byte for api header size + REQUIRE(token.ByteSize() <= 240); api::user::TokenPayload payload; REQUIRE(api::auth::decode_token(token.token(), &payload)); REQUIRE(payload.id() == user.id()); @@ -32,8 +34,6 @@ TEST_CASE("AuthToken", "[security]") { REQUIRE(payload.id() == user.id()); REQUIRE(payload.wheel()); } - - } }}//ns From 09d4d1f9073c5174cdc0785f211ded4f8bd461fa Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 6 Dec 2018 14:09:50 -0500 Subject: [PATCH 24/45] SPARK-1901 ServiceContext.login( existing token). --- .../api/Channels/QuickBusClientChannel.cs | 60 +++++++++---------- src/client/spark_api/api/ServiceContext.cs | 8 ++- src/lib/api/public/ServiceContext.cpp | 3 + src/lib/api/public/ServiceContext.h | 1 + 4 files changed, 40 insertions(+), 32 deletions(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 937ac10b8..c22bf583d 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -35,7 +35,7 @@ namespace bts.api.core { var header = new RequestHeader() { Method = method_id, RequestId = id, - Token = _context.token + Token = _context.token.HasValue ? new AuthToken() { Token = _context.token?.Token } : null }; var buffer = header.serialize(request); var tcs = new TaskCompletionSource>(); @@ -60,44 +60,44 @@ namespace bts.api.core { public override IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { IntPtr temp_subscription = IntPtr.Zero; - void unsubscribe_temp_sub() { - // Unsubscribe late to keep qb refcount > 0 continuously + void unsubscribe_temp_sub() { + // Unsubscribe late to keep qb refcount > 0 continuously if (temp_subscription != IntPtr.Zero) ApiNativeMethods.api_client_unsubscribe(_client, temp_subscription); } while (true) { - var response = await check_stream_access(method_id, qualifier); - if (response.success) { - if (response.value.Authorized) { - // success. Break loop and subscribe - break; - } - else { - // Not authorized. return empty stream - unsubscribe_temp_sub(); - observer.OnCompleted(); - return Disposable.Empty; - } - } - else { - // Wait for stream to fire once before trying again - unsubscribe_temp_sub(); - var tcs = new TaskCompletionSource(); - ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { - tcs.TrySetResult(true); - }; - temp_subscription = ApiNativeMethods.api_client_subscribe(_client, method, qualifier, cb, IntPtr.Zero); - await tcs.Task; - GC.KeepAlive(cb); - } + var response = await check_stream_access(method_id, qualifier); + if (response.success) { + if (response.value.Authorized) { + // success. Break loop and subscribe + break; + } + else { + // Not authorized. return empty stream + unsubscribe_temp_sub(); + observer.OnCompleted(); + return Disposable.Empty; + } + } + else { + // Wait for stream to fire once before trying again + unsubscribe_temp_sub(); + var tcs = new TaskCompletionSource(); + ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + tcs.TrySetResult(true); + }; + temp_subscription = ApiNativeMethods.api_client_subscribe(_client, method, qualifier, cb, IntPtr.Zero); + await tcs.Task; + GC.KeepAlive(cb); + } } // Authorized. Stream events - unsubscribe_temp_sub(); - return SubscribeNative(method, qualifier, parser, converter, observer); + unsubscribe_temp_sub(); + return SubscribeNative(method, qualifier, parser, converter, observer); }); return result; } - private Task> check_stream_access(int method_id, string qualifier) { + private Task> check_stream_access(int method_id, string qualifier) { var request = new StreamAccessRequest() { Qualifier = qualifier ?? "" }; return send(method_id, request); } diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index 3f2ce048e..978b85957 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -10,6 +10,7 @@ namespace bts.api.core { public class ServiceContext : IDisposable { IntPtr _qbus; + AuthToken _token; public ServiceContext() { _qbus = ApiNativeMethods.api_create_quickbus(null, 0); @@ -31,7 +32,7 @@ namespace bts.api.core { return ch; } - public AuthToken token { get; private set; } + public AuthTokenImmutable? token => _token; public string user { get; private set; } public async Task login(string username, string password) { @@ -41,12 +42,15 @@ namespace bts.api.core { Password = password }); if (result.success) { - token = result.value.Token; + _token = result.value.Token; user = username; return true; } return false; } + public void login(AuthTokenImmutable token) { + this._token = token.CloneToMutable(); + } #region IDisposable Support diff --git a/src/lib/api/public/ServiceContext.cpp b/src/lib/api/public/ServiceContext.cpp index 3fafa77f0..26c333f34 100644 --- a/src/lib/api/public/ServiceContext.cpp +++ b/src/lib/api/public/ServiceContext.cpp @@ -54,6 +54,9 @@ bool ServiceContext::login(const std::string& username, const std::string& passw } return false; } +void ServiceContext::login(const AuthToken& token) { + _self->_token = token; +} void ServiceContext::post(const Action& action, uint64_t delay) { api_post(_self->_qbus, action, delay); diff --git a/src/lib/api/public/ServiceContext.h b/src/lib/api/public/ServiceContext.h index e434affe1..be886666d 100644 --- a/src/lib/api/public/ServiceContext.h +++ b/src/lib/api/public/ServiceContext.h @@ -36,6 +36,7 @@ public: const AuthToken token() const; const std::string& user() const; bool login(const std::string& username, const std::string& password); + void login(const AuthToken& token); typedef std::function Action; void post(const Action&, uint64_t delayms=0); From 0419d084f417387c52845857c8032fff3814986c Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 6 Dec 2018 15:01:40 -0500 Subject: [PATCH 25/45] moved co2 stuff down to spark_api to refactor or remove MarketDataClient.cs --- src/client/spark/Daemons/MDDaemon.cs | 3 +- .../Co2/AtomicPriceSize.cs | 0 .../Co2/Co2NativeMethods.cs | 11 ++----- .../Co2/Co2RelayControl.cs | 6 ++-- .../{spark_core => spark_api}/Co2/IntPrice.cs | 0 .../Co2/MDConsumer.cs | 1 + .../Co2/MDConsumerChannel.cs | 0 .../Co2/MDConsumerHandle.cs | 0 .../Co2/NativePriceHelpers.cs | 0 .../Co2/PriceSize.cs | 0 .../api/Channels/QuickBusClientChannel.cs | 2 +- src/client/spark_api/utils/APIExtensions.cs | 31 +++++++++++++++++++ .../utils/AnonymousDisposable.cs | 0 .../utils/EqualityComparer.cs | 0 .../utils/LLDateTime.cs | 0 .../utils/MathUtils.cs | 0 .../spark_core/utils/GlobalExtensions.cs | 19 +----------- 17 files changed, 41 insertions(+), 32 deletions(-) rename src/client/{spark_core => spark_api}/Co2/AtomicPriceSize.cs (100%) rename src/client/{spark_core => spark_api}/Co2/Co2NativeMethods.cs (93%) rename src/client/{spark_core => spark_api}/Co2/Co2RelayControl.cs (84%) rename src/client/{spark_core => spark_api}/Co2/IntPrice.cs (100%) rename src/client/{spark_core => spark_api}/Co2/MDConsumer.cs (96%) rename src/client/{spark_core => spark_api}/Co2/MDConsumerChannel.cs (100%) rename src/client/{spark_core => spark_api}/Co2/MDConsumerHandle.cs (100%) rename src/client/{spark_core => spark_api}/Co2/NativePriceHelpers.cs (100%) rename src/client/{spark_core => spark_api}/Co2/PriceSize.cs (100%) create mode 100644 src/client/spark_api/utils/APIExtensions.cs rename src/client/{spark_core => spark_api}/utils/AnonymousDisposable.cs (100%) rename src/client/{spark_core => spark_api}/utils/EqualityComparer.cs (100%) rename src/client/{spark_core => spark_api}/utils/LLDateTime.cs (100%) rename src/client/{spark_core => spark_api}/utils/MathUtils.cs (100%) diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index 76c89157f..4529156e4 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -36,7 +36,8 @@ namespace bts { _bus = bus; _token = token; _ss = ss; - _relay = new Co2RelayControl(_consumer); + uint naggle_ms = mbts.config.Configuration.get().naggle_ms; + _relay = new Co2RelayControl(_consumer, naggle_ms); _relay.preload_securities((co2.MDRequest.Types.Flags)0xff).ignore(); _dispose.Add(_consumer.on_security.Subscribe(this)); } diff --git a/src/client/spark_core/Co2/AtomicPriceSize.cs b/src/client/spark_api/Co2/AtomicPriceSize.cs similarity index 100% rename from src/client/spark_core/Co2/AtomicPriceSize.cs rename to src/client/spark_api/Co2/AtomicPriceSize.cs diff --git a/src/client/spark_core/Co2/Co2NativeMethods.cs b/src/client/spark_api/Co2/Co2NativeMethods.cs similarity index 93% rename from src/client/spark_core/Co2/Co2NativeMethods.cs rename to src/client/spark_api/Co2/Co2NativeMethods.cs index 1276d1ca9..03bb18f20 100644 --- a/src/client/spark_core/Co2/Co2NativeMethods.cs +++ b/src/client/spark_api/Co2/Co2NativeMethods.cs @@ -13,14 +13,9 @@ namespace mbts.co2 { internal static unsafe T deserialize(byte* buffer, ulong length) where T : new() { var stream = new System.IO.UnmanagedMemoryStream(buffer, (long)length); - if (typeof(IMessage).IsAssignableFrom(typeof(T))) { - IMessage result = (IMessage)new T(); - result.MergeFrom(stream); - return (T)result; - } - else { - return ProtoBuf.Serializer.Deserialize(stream); - } + IMessage result = (IMessage)new T(); + result.MergeFrom(stream); + return (T)result; } [DllImport("libspark")] diff --git a/src/client/spark_core/Co2/Co2RelayControl.cs b/src/client/spark_api/Co2/Co2RelayControl.cs similarity index 84% rename from src/client/spark_core/Co2/Co2RelayControl.cs rename to src/client/spark_api/Co2/Co2RelayControl.cs index 9adef0694..dbc8f9060 100644 --- a/src/client/spark_core/Co2/Co2RelayControl.cs +++ b/src/client/spark_api/Co2/Co2RelayControl.cs @@ -14,12 +14,10 @@ namespace mbts.co2 { MDConsumer _consumer; IntPtr _relay; - public Co2RelayControl(MDConsumer consumer) { + public Co2RelayControl(MDConsumer consumer, uint naggle_ms) { _consumer = consumer; Log.assert(consumer.native_pointer() != IntPtr.Zero); - _relay = - Co2NativeMethods.start_private_relay(consumer.native_pointer(), - config.Configuration.get().naggle_ms); + _relay = Co2NativeMethods.start_private_relay(consumer.native_pointer(), naggle_ms); Log.assert(_relay != IntPtr.Zero); } diff --git a/src/client/spark_core/Co2/IntPrice.cs b/src/client/spark_api/Co2/IntPrice.cs similarity index 100% rename from src/client/spark_core/Co2/IntPrice.cs rename to src/client/spark_api/Co2/IntPrice.cs diff --git a/src/client/spark_core/Co2/MDConsumer.cs b/src/client/spark_api/Co2/MDConsumer.cs similarity index 96% rename from src/client/spark_core/Co2/MDConsumer.cs rename to src/client/spark_api/Co2/MDConsumer.cs index d8f7b7304..439d65af0 100644 --- a/src/client/spark_core/Co2/MDConsumer.cs +++ b/src/client/spark_api/Co2/MDConsumer.cs @@ -9,6 +9,7 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; using security_key = System.UInt32; +using bts; namespace mbts.co2 { diff --git a/src/client/spark_core/Co2/MDConsumerChannel.cs b/src/client/spark_api/Co2/MDConsumerChannel.cs similarity index 100% rename from src/client/spark_core/Co2/MDConsumerChannel.cs rename to src/client/spark_api/Co2/MDConsumerChannel.cs diff --git a/src/client/spark_core/Co2/MDConsumerHandle.cs b/src/client/spark_api/Co2/MDConsumerHandle.cs similarity index 100% rename from src/client/spark_core/Co2/MDConsumerHandle.cs rename to src/client/spark_api/Co2/MDConsumerHandle.cs diff --git a/src/client/spark_core/Co2/NativePriceHelpers.cs b/src/client/spark_api/Co2/NativePriceHelpers.cs similarity index 100% rename from src/client/spark_core/Co2/NativePriceHelpers.cs rename to src/client/spark_api/Co2/NativePriceHelpers.cs diff --git a/src/client/spark_core/Co2/PriceSize.cs b/src/client/spark_api/Co2/PriceSize.cs similarity index 100% rename from src/client/spark_core/Co2/PriceSize.cs rename to src/client/spark_api/Co2/PriceSize.cs diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index c22bf583d..ac054c2c8 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -75,7 +75,7 @@ namespace bts.api.core { // Not authorized. return empty stream unsubscribe_temp_sub(); observer.OnCompleted(); - return Disposable.Empty; + return System.Reactive.Disposables.Disposable.Empty; } } else { diff --git a/src/client/spark_api/utils/APIExtensions.cs b/src/client/spark_api/utils/APIExtensions.cs new file mode 100644 index 000000000..d1300fab5 --- /dev/null +++ b/src/client/spark_api/utils/APIExtensions.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; + +namespace mbts +{ + public static class APIExtensions + { + public static T? TryFirst(this IEnumerable src) where T : struct + { + foreach (var v in src) + return v; + return null; + } + + public static DateTime lldatetime(this ulong ll) + { + // Warning: Do not remove these consts, or try to simplify this method. + // System.DateTime() requires bits 63-64 to be empty in the "DateTime(long ticks)" constructor. + // The only way to set the DateTimeKind is through the "DateTime(long ticks, DateTimeKind kind)" constructor. + // (Yes, it is annoying. Internally, System.DateTime stores the DateTimeKind in bits 63-64 - in the exact format we already have!!!) + const ulong ticks_mask = 0x3FFFFFFFFFFFFFFF; + const int kind_shift = 62; + return new DateTime((long)(ll & ticks_mask), (DateTimeKind)(ll >> kind_shift)); + } + + public static string fmt(this string input, params object[] vals) + { + return string.Format(input, vals); + } + } +} \ No newline at end of file diff --git a/src/client/spark_core/utils/AnonymousDisposable.cs b/src/client/spark_api/utils/AnonymousDisposable.cs similarity index 100% rename from src/client/spark_core/utils/AnonymousDisposable.cs rename to src/client/spark_api/utils/AnonymousDisposable.cs diff --git a/src/client/spark_core/utils/EqualityComparer.cs b/src/client/spark_api/utils/EqualityComparer.cs similarity index 100% rename from src/client/spark_core/utils/EqualityComparer.cs rename to src/client/spark_api/utils/EqualityComparer.cs diff --git a/src/client/spark_core/utils/LLDateTime.cs b/src/client/spark_api/utils/LLDateTime.cs similarity index 100% rename from src/client/spark_core/utils/LLDateTime.cs rename to src/client/spark_api/utils/LLDateTime.cs diff --git a/src/client/spark_core/utils/MathUtils.cs b/src/client/spark_api/utils/MathUtils.cs similarity index 100% rename from src/client/spark_core/utils/MathUtils.cs rename to src/client/spark_api/utils/MathUtils.cs diff --git a/src/client/spark_core/utils/GlobalExtensions.cs b/src/client/spark_core/utils/GlobalExtensions.cs index 0f231a633..ee6769ee7 100644 --- a/src/client/spark_core/utils/GlobalExtensions.cs +++ b/src/client/spark_core/utils/GlobalExtensions.cs @@ -6,9 +6,6 @@ using System.Text; namespace mbts { public static class GlobalExtensions { - public static string fmt(this string input, params object[] vals) { - return string.Format(input, vals); - } public static string Repeat(this string s, uint count) { if (count == 0) return ""; if (count == 1) return s; @@ -27,15 +24,6 @@ namespace mbts { return range.Skip(index).First(); } - public static DateTime lldatetime(this ulong ll) { - // Warning: Do not remove these consts, or try to simplify this method. - // System.DateTime() requires bits 63-64 to be empty in the "DateTime(long ticks)" constructor. - // The only way to set the DateTimeKind is through the "DateTime(long ticks, DateTimeKind kind)" constructor. - // (Yes, it is annoying. Internally, System.DateTime stores the DateTimeKind in bits 63-64 - in the exact format we already have!!!) - const ulong ticks_mask = 0x3FFFFFFFFFFFFFFF; - const int kind_shift = 62; - return new DateTime((long)(ll & ticks_mask), (DateTimeKind)(ll >> kind_shift)); - } //this overloaded declaration, (as opposed to one function with comp = null) allows observable_collection.sync_with to be passed into functions as a parameterless Action public static void sync_with(this IList dest, IEnumerable src) { dest.sync_with(src, EqualityComparer.Default); } @@ -70,11 +58,6 @@ namespace mbts { } } - public static T? TryFirst(this IEnumerable src) where T : struct - { - foreach(var v in src) - return v; - return null; - } + } } \ No newline at end of file From b80fe1e748c4b03e5bad521d91cf44a9cbbfa330 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 6 Dec 2018 15:07:24 -0500 Subject: [PATCH 26/45] moved admin model down for some changes upstream --- src/client/spark/Admin/AdminModel.cs | 1 + src/client/spark/Orders/OrdersModel.cs | 6 ++--- .../admin}/AdminModelWrapper.cs | 4 ++-- .../admin}/PermissionFilters.cs | 24 +++++++++---------- 4 files changed, 17 insertions(+), 18 deletions(-) rename src/client/{spark/Admin => spark_core/admin}/AdminModelWrapper.cs (97%) rename src/client/{spark/Admin => spark_core/admin}/PermissionFilters.cs (66%) diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index da1ae42f4..af7cf9499 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -6,6 +6,7 @@ using System.ComponentModel.Composition; using System.Linq; using System.Reactive.Linq; using System.Reactive.Subjects; +using bts.api.core; namespace mbts.spark { [Export] diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 7e470f842..bf24da63c 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -44,8 +44,8 @@ namespace mbts.spark { _dynamic_helper = dynamic_helper; var scheduler = ThreadPoolScheduler.Instance; var interval = TimeSpan.FromMilliseconds(100); - on_orders = _service.subscribei_orders().Naggle(interval, scheduler).PermissionFilter(admin_model).Table().Cache(); - on_positions = _position_service.subscribei_position_data().Naggle(interval, scheduler).PermissionFilter(admin_model).Table().Cache(); + on_orders = _service.subscribei_orders().Naggle(interval, scheduler).PermissionFilter(admin_model.on_admin_data).Table().Cache(); + on_positions = _position_service.subscribei_position_data().Naggle(interval, scheduler).PermissionFilter(admin_model.on_admin_data).Table().Cache(); working_orders = on_orders.Scan( ImmutableDictionary.Empty, @@ -55,7 +55,7 @@ namespace mbts.spark { on_order_tuples = order_record_tuple_source.subscribe_incremental_update(); on_order_tuples_table = order_record_tuple_source.subscribe_incremental_table_update(); on_order_securities = order_record_tuple_source.subscribe_order_securities(); - on_fills = _service.subscribei_fills().Naggle(interval, scheduler).PermissionFilter(admin_model).Table().Cache(); + on_fills = _service.subscribei_fills().Naggle(interval, scheduler).PermissionFilter(admin_model.on_admin_data).Table().Cache(); _activity = new OrderActivitySummarizer(bus, on_orders); on_fill_tuples = FillTupleSource.create_observable(bus.subscribe(SparkTags.SecuritiesTag), on_orders, on_fills); _security_orders_demuxer = new TableUpdateDemuxer(o => o.Key, o => o.security_key()); diff --git a/src/client/spark/Admin/AdminModelWrapper.cs b/src/client/spark_core/admin/AdminModelWrapper.cs similarity index 97% rename from src/client/spark/Admin/AdminModelWrapper.cs rename to src/client/spark_core/admin/AdminModelWrapper.cs index 62895933c..f52f016c5 100644 --- a/src/client/spark/Admin/AdminModelWrapper.cs +++ b/src/client/spark_core/admin/AdminModelWrapper.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Linq; -namespace mbts.spark +namespace bts.api.core { - class AdminModelWrapper + public class AdminModelWrapper { readonly AdminDataImmutable? _admin_data; readonly string _user_name; diff --git a/src/client/spark/Admin/PermissionFilters.cs b/src/client/spark_core/admin/PermissionFilters.cs similarity index 66% rename from src/client/spark/Admin/PermissionFilters.cs rename to src/client/spark_core/admin/PermissionFilters.cs index 115187a45..3da6a137c 100644 --- a/src/client/spark/Admin/PermissionFilters.cs +++ b/src/client/spark_core/admin/PermissionFilters.cs @@ -4,10 +4,6 @@ using bts.api.core; using bts.api.orderman; using bts.api.position; using bts.spark; -using mbts.collections; -using mbts.spark; -using mbts.spark.utilities; -using mbts.utils; using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -18,14 +14,14 @@ using System.Reactive.Linq; namespace bts.api.core { - - static class PermissionFilters + public static class PermissionFilters { - public static IObservable> PermissionFilter(this IObservable> source, AdminModel am) + public static IObservable> + PermissionFilter(this IObservable> source, IObservable am) { var pred = Observable.Create>( observer => { - return am.on_admin_data.Subscribe(x => + return am.Subscribe(x => { Func filter = (z => x.can_view_account(z.Account)); observer.OnNext(filter); @@ -35,13 +31,14 @@ namespace bts.api.core return source.Filter(pred); } - public static IObservable> PermissionFilter(this IObservable> source, AdminModel am) + public static IObservable> + PermissionFilter(this IObservable> source, IObservable am) { var pred = Observable.Create>(observer => { - return am.on_admin_data.Subscribe(x => + return am.Subscribe(x => { - Func filter = (z => x.can_view_account(z.account())); + Func filter = (z => x.can_view_account(z.Def.Account ?? string.Empty)); observer.OnNext(filter); }); }); @@ -49,11 +46,12 @@ namespace bts.api.core return source.Filter(pred); } - public static IObservable> PermissionFilter(this IObservable> source, AdminModel am) + public static IObservable> + PermissionFilter(this IObservable> source, IObservable am) { var pred = Observable.Create>(observer => { - return am.on_admin_data.Subscribe(x => + return am.Subscribe(x => { Func filter = (z => x.can_view_account(z.Account)); observer.OnNext(filter); From e1b638a4b6568c959d88e532a8d3a56d4ab3af65 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 08:55:35 -0500 Subject: [PATCH 27/45] ServiceContext.login() needs to return more information --- src/client/spark_api/api/ServiceContext.cs | 30 +++++++++++++++++----- src/lib/api/public/ServiceContext.cpp | 26 ++++++++++++++++--- src/lib/api/public/ServiceContext.h | 9 ++++++- 3 files changed, 53 insertions(+), 12 deletions(-) diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index 0b2da3fae..b27ea9412 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -34,19 +34,28 @@ namespace bts.api.core { public AuthTokenImmutable? token => _token ?? (AuthTokenImmutable?)null; public string user { get; private set; } + public uint user_id { get; private set; } - public async Task login(string username, string password) { + public async Task login(string username, string password) { var auth_service = locate(); var result = await auth_service.authenticate_login_async(new AuthenticateLoginRequest() { - Login = username, - Password = password + Login = username ?? "", + Password = password ?? "" }); if (result.success) { - _token = result.value.Token; - user = username; - return true; + if (result.value.IsValid) { + _token = result.value.Token; + user = username; + user_id = result.value.UserId; + return new LoginResult(); + } + else { + return new LoginResult(result.value.Reason); + } + } + else { + return new LoginResult(result.error_message); } - return false; } public void login(AuthTokenImmutable token) { this._token = token.CloneToMutable(); @@ -73,4 +82,11 @@ namespace bts.api.core { } #endregion } + + public class LoginResult { + public LoginResult() { success = true; } + public LoginResult(string reason) { success = false; this.reason = reason; } + public bool success { get; } + public string reason { get; } + } } diff --git a/src/lib/api/public/ServiceContext.cpp b/src/lib/api/public/ServiceContext.cpp index 26c333f34..cef9c3d4c 100644 --- a/src/lib/api/public/ServiceContext.cpp +++ b/src/lib/api/public/ServiceContext.cpp @@ -8,6 +8,16 @@ namespace bts { namespace api { +LoginResult::LoginResult(): + success(true), + reason() + {} + +LoginResult::LoginResult(const std::string& why): + success(true), + reason(why) + {} + struct ServiceContextImpl { ServiceContextImpl(Quickbus* maybe_bus): _qbus(maybe_bus ? *maybe_bus : *api_create_quickbus(nullptr, 0)), @@ -42,17 +52,25 @@ ServerChannel ServiceContext::publish(ApiServer& service, const std::string& ser return ServerChannel(_self->_qbus, service_type, qualifier, service); } -bool ServiceContext::login(const std::string& username, const std::string& password) { +const LoginResult ServiceContext::login(const std::string& username, const std::string& password) { auto auth = locate(); user::AuthenticateLoginRequest request; request.set_login(username); request.set_password(password); auto result = auth.authenticate_login(request); if (result.success()) { - _self->_token = result.value()->token(); //.CopyFrom(result.value()->token()); - _self->_user = username; + if (result.value()->is_valid()) { + _self->_token = result.value()->token(); + _self->_user = username; + return {}; + } + else { + return {result.value()->reason()}; + } + } + else { + return {result.error_message()}; } - return false; } void ServiceContext::login(const AuthToken& token) { _self->_token = token; diff --git a/src/lib/api/public/ServiceContext.h b/src/lib/api/public/ServiceContext.h index be886666d..4ee20db78 100644 --- a/src/lib/api/public/ServiceContext.h +++ b/src/lib/api/public/ServiceContext.h @@ -18,6 +18,13 @@ namespace api { class ClientChannel; struct ServiceContextImpl; +struct LoginResult { + LoginResult(); + LoginResult(const std::string&); + bool success; + std::string reason; +}; + class BTS_EXPORT ServiceContext { std::shared_ptr _self; @@ -35,7 +42,7 @@ public: Quickbus& bus() const; const AuthToken token() const; const std::string& user() const; - bool login(const std::string& username, const std::string& password); + const LoginResult login(const std::string& username, const std::string& password); void login(const AuthToken& token); typedef std::function Action; From 38edcb27f1e986f6a5b0ac040f9071730bfe4537 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 11:44:34 -0500 Subject: [PATCH 28/45] Token must not be treated as null terminated string --- src/client/spark_core/Co2/Co2NativeMethods.cs | 2 +- src/lib/md/MDConsumerInterop.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark_core/Co2/Co2NativeMethods.cs b/src/client/spark_core/Co2/Co2NativeMethods.cs index 1276d1ca9..54126de6a 100644 --- a/src/client/spark_core/Co2/Co2NativeMethods.cs +++ b/src/client/spark_core/Co2/Co2NativeMethods.cs @@ -81,7 +81,7 @@ namespace mbts.co2 [DllImport("libspark")] internal unsafe static extern IntPtr add_relay_symbol(IntPtr relay, UserSymbol symbol, bts.co2.MDRequest.Types.Flags flags); [DllImport("libspark")] - internal unsafe static extern IntPtr set_relay_token(IntPtr relay, string user_name); + internal unsafe static extern IntPtr set_relay_token(IntPtr relay, byte[] token, long token_size); [DllImport("libspark")] internal unsafe static extern void post_on_scan_security_thread(Action callback); diff --git a/src/lib/md/MDConsumerInterop.cpp b/src/lib/md/MDConsumerInterop.cpp index b526ebc28..01b0616bb 100644 --- a/src/lib/md/MDConsumerInterop.cpp +++ b/src/lib/md/MDConsumerInterop.cpp @@ -162,8 +162,8 @@ CAPI void add_relay_symbol(md::RelayControl* prelay, BlitUserSymbol& symbol, uin } } -CAPI void set_relay_token(md::RelayControl* prelay, const char* token) { - md::set_relay_token(prelay, std::string(token)); +CAPI void set_relay_token(md::RelayControl* prelay, const char* token, size_t token_size) { + md::set_relay_token(prelay, std::string(token,token_size)); } From 601eec3ddbaaae18bebea3bd04392b7715447855 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 11:44:43 -0500 Subject: [PATCH 29/45] Convert shell to log into the context --- src/client/spark/Daemons/MDDaemon.cs | 4 +- src/client/spark/Daemons/ShellServices.cs | 5 +- .../spark/view/Shell/Login/LoginModel.cs | 113 +++++++----------- .../spark/view/Shell/Login/LoginViewModel.cs | 13 +- src/client/spark_api/md/MarketDataClient.cs | 5 +- src/client/spark_core/Co2/Co2RelayControl.cs | 5 +- .../rtd/subscriptions/MDSubscribe.cs | 2 +- src/lib/api/apicore.proto | 2 +- src/lib/md/protos/co2.proto | 2 +- src/server/sparkd/http/ApiGateway.cpp | 1 + 10 files changed, 63 insertions(+), 89 deletions(-) diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index 76c89157f..c673f0854 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -19,7 +19,7 @@ namespace bts { [Export(typeof(IInitializable))] class MDSource : IObserver>, IInitializable, IDisposable { readonly Lazy _bus; - readonly Lazy _token; + readonly Lazy _token; readonly Lazy _ss; readonly MDConsumer _consumer = new MDConsumer(); readonly Co2RelayControl _relay; @@ -31,7 +31,7 @@ namespace bts { [ImportingConstructor] public MDSource( Lazy bus, - Lazy token, + Lazy token, Lazy ss) { _bus = bus; _token = token; diff --git a/src/client/spark/Daemons/ShellServices.cs b/src/client/spark/Daemons/ShellServices.cs index 23ab2c1ca..eb9deee90 100644 --- a/src/client/spark/Daemons/ShellServices.cs +++ b/src/client/spark/Daemons/ShellServices.cs @@ -13,10 +13,7 @@ using System.ComponentModel.Composition; namespace Spark { public class ShellServices { [Export] - public static ServiceContext context { get; } = new ServiceContext(); - - [Export] - public AuthService user_service => context.locate(); + public ServiceContext context { get; } = new ServiceContext(); [Export("settings")] public PersistenceService settings_service => context.locate("settings"); diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 3df06a379..20e770318 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -1,40 +1,29 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.Composition; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Threading; -using mbts.config; -using mbts.ui.native; -using mbts.utils; -using bts.co2; +using bts; using bts.api; -using bts.api.user; +using bts.api.core; using bts.api.persistence; -using bts; +using bts.api.user; +using mbts.config; +using System; +using System.Collections.Generic; +using System.ComponentModel.Composition; +using System.Linq; +using System.Threading.Tasks; +using System.Windows.Threading; -namespace mbts.ui.shell -{ +namespace mbts.ui.shell { // The LoginContainer participates in the startup Import/Export dependency system // Since the login form should not depend on *anything* it will be shown before this is created // Once this is created it access the global LoginModel and retrieves the username internal class LoginContainer { [ImportingConstructor] - public LoginContainer(AuthService user, [Import("settings")] PersistenceService persist) { + public LoginContainer(ServiceContext context) { var model = LoginModel.instance; - model.provide_services(user, persist); + model.provide_services(context); // await_login pumps the dispatcher but doesn't allow control to return to MEF until the username and workspace are available model.await_login(); - var u = model.get_user(); - UserName = u.name; - UserId = u.id; - Token = u.token; + (UserName,UserId,Token) = model.get_user(); Workspace = model.get_workspace(); model.Dispose(); } @@ -45,21 +34,19 @@ namespace mbts.ui.shell [Export("userid")] public uint UserId { get; private set; } [Export] - public AuthToken Token { get; private set; } + public AuthTokenImmutable Token { get; private set; } [Export("workspace")] public string Workspace { get; private set; } } public struct User { - public User(string name, uint id, AuthToken token) { + public User(string name, uint id) { this.name = name; this.id = id; - this.token = token; } public readonly string name; public readonly UInt32 id; - public readonly AuthToken token; } public class LoginModel : IDisposable @@ -67,11 +54,10 @@ namespace mbts.ui.shell // Singleton to help bootstrap the system private static LoginModel _instance = new LoginModel(); public static LoginModel instance { get { return _instance; } } - private User _user; private string _workspace; private PreloginWorkspaceEnumerator _enum_workspace; - - AuthService _logon; + + ServiceContext _ctx; DispatcherFrame _frame = new DispatcherFrame(); private LoginModel() { @@ -83,13 +69,14 @@ namespace mbts.ui.shell public string ErrorMessage { get; private set; } public bool HasFatalError { get; set; } public User[] Users { get; private set; } - - + + // The final username - public User get_user() { - Log.assert_d(!string.IsNullOrEmpty(_user.name)); - return _user; + public (string, uint, AuthTokenImmutable) get_user() { + Log.assert_d(!string.IsNullOrEmpty(_ctx.user)); + return (_ctx.user, _ctx.user_id, _ctx.token.Value); } + public string get_workspace() { return _workspace ?? ""; } @@ -113,13 +100,13 @@ namespace mbts.ui.shell } // Wait for the hub to create the login doodad - (var users, var persist) = await _hub_src.Task; - _logon = users; + _ctx = await _hub_src.Task; // Populate the UI - _enum_workspace = new PreloginWorkspaceEnumerator(persist); - var response = await _logon.get_users_async(new GetUsersRequest()); + _enum_workspace = new PreloginWorkspaceEnumerator(_ctx.locate("settings")); + var auth = _ctx.locate(); + var response = await auth.get_users_async(new GetUsersRequest()); if (response.success) { - Users = response.value.Users.Select(x => new User(x.Login,x.Id, null)).OrderBy(u => u.name).ToArray(); + Users = response.value.Users.Select(x => new User(x.Login,x.Id)).OrderBy(u => u.name).ToArray(); } else { ErrorMessage = "Logon: " + response.error_message; @@ -130,49 +117,37 @@ namespace mbts.ui.shell #endregion - public async Task<(bool success,string info)> do_login(string username, string workspace, string password) { + public async Task do_login(string username, string workspace, string password) { if (Users.Select(u => u.name).Contains(username)) { - var response = await _logon.authenticate_login_async(new AuthenticateLoginRequest() { - Login = username, - Password = password ??"" - }); - if (response.success) { - if (response.value.IsValid) { - _workspace = workspace; - set_authenticated_user(new User(username, response.value.UserId, response.value.Token)); - return (true, ""); - } - else { - return (false, response.value.Reason); - } - } - else { - return (false, response.error_message); + var result = await _ctx.login(username, password); + if (result.success) { + _workspace = workspace; + on_user_authenticated(_ctx.user, _ctx.token); } + return result; } - return (false, "Invalid username"); + return new LoginResult("Invalid username"); } - private void set_authenticated_user(User user) { - Log.assert(!string.IsNullOrEmpty(user.name)); - Log.assert(Users.Select(u => u.name).Contains(user.name)); - _user = user; - Environment.SetEnvironmentVariable("BTS_USER", user.name); + private void on_user_authenticated(string username, AuthTokenImmutable? token) { + Log.assert(!string.IsNullOrEmpty(username)); + Log.assert(Users.Select(u => u.name).Contains(username)); + Environment.SetEnvironmentVariable("BTS_USER", username); _frame.Continue = false; } public void await_login() { - if (string.IsNullOrEmpty(_user.name)) { + if (!_ctx.token.HasValue) { Dispatcher.PushFrame(_frame); } } #region provide hub - public void provide_services(AuthService u, PersistenceService p) { - _hub_src.TrySetResult((u,p)); + internal void provide_services(ServiceContext ctx) { + _hub_src.TrySetResult(ctx); } - private TaskCompletionSource<(AuthService, PersistenceService)> _hub_src = new TaskCompletionSource<(AuthService, PersistenceService)>(); + private TaskCompletionSource _hub_src = new TaskCompletionSource(); #endregion #region Dispose diff --git a/src/client/spark/view/Shell/Login/LoginViewModel.cs b/src/client/spark/view/Shell/Login/LoginViewModel.cs index c2140dc91..b9994863d 100644 --- a/src/client/spark/view/Shell/Login/LoginViewModel.cs +++ b/src/client/spark/view/Shell/Login/LoginViewModel.cs @@ -138,14 +138,15 @@ namespace mbts.ui.shell if (selected_workspace == "New workspace...") { selected_workspace = null; } - (bool success, string message) = await _model.do_login(Name, selected_workspace, Password); - if (success) { VisualState = "Loading"; } - if (!success && !string.IsNullOrEmpty(message)) { - WarningMessage = message; + var result = await _model.do_login(Name, selected_workspace, Password); + if (result.success) { VisualState = "Loading"; } + if (!result.success && !string.IsNullOrEmpty(result.reason)) { + WarningMessage = result.reason; VisualState = "BadPassword"; } - else if (!string.IsNullOrEmpty(message)) { - BTSMessageBox.Show(message, "Login Message", BTSMessageBoxButtons.OK, MessageBoxImage.Information); + else if (!string.IsNullOrEmpty(result.reason)) { + // Login was successful but we have a message for the user + BTSMessageBox.Show(result.reason, "Login Message", BTSMessageBoxButtons.OK, MessageBoxImage.Information); } } private void OnCancel(object unused) { diff --git a/src/client/spark_api/md/MarketDataClient.cs b/src/client/spark_api/md/MarketDataClient.cs index 2512c2b72..d6d8664ab 100644 --- a/src/client/spark_api/md/MarketDataClient.cs +++ b/src/client/spark_api/md/MarketDataClient.cs @@ -61,14 +61,13 @@ namespace bts.api.md _subscription = load_request(exchange, token); } - public void set_auth_token(AuthToken toke) + public void set_auth_token(AuthToken token) { - _subscription.Token = toke?.Token ?? string.Empty; } MDRequest load_request(bts.api.Venue exchange, AuthToken token) { - var req = new MDRequest() { Token = token?.Token ?? string.Empty } ; + var req = new MDRequest() {} ; var prods = _all_products.Where(x=>x.Exchange == exchange || exchange == bts.api.Venue.Unset); foreach(var prod in prods) req.Channels.Add(new SecurityChannel() { Exchange = prod.Exchange, Type = prod.Type, Symbol = prod.Symbol, Flags = 0 }); diff --git a/src/client/spark_core/Co2/Co2RelayControl.cs b/src/client/spark_core/Co2/Co2RelayControl.cs index 9adef0694..86d8005b7 100644 --- a/src/client/spark_core/Co2/Co2RelayControl.cs +++ b/src/client/spark_core/Co2/Co2RelayControl.cs @@ -23,8 +23,9 @@ namespace mbts.co2 Log.assert(_relay != IntPtr.Zero); } - public void set_token(AuthToken token) { - Co2NativeMethods.set_relay_token(_relay, token.Token); + public void set_token(AuthTokenImmutable token) { + var buffer = token.Token.ToByteArray(); + Co2NativeMethods.set_relay_token(_relay, buffer, buffer.LongLength); } public async Task preload_securities(MDRequest.Types.Flags flags=MDRequest.Types.Flags.Security) { diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index cdfc364b4..47fb6f446 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -26,7 +26,7 @@ namespace bts.excel.rtd MarketDataClient.create_or_get(ven, out MarketDataClient md); md?.set_auth_token(toke); } - handle.SetResult(toke?.Token ?? "Could not log in check user/pass"); + handle.SetResult((object)toke?.Token ?? "Could not log in check user/pass"); } catch(Exception ex) { diff --git a/src/lib/api/apicore.proto b/src/lib/api/apicore.proto index c22e023cf..4da2a780d 100644 --- a/src/lib/api/apicore.proto +++ b/src/lib/api/apicore.proto @@ -13,7 +13,7 @@ message PingPong { // T Request message AuthToken { - string token = 1; + bytes token = 1; } message RequestHeader { diff --git a/src/lib/md/protos/co2.proto b/src/lib/md/protos/co2.proto index ce3fbf608..e255a7106 100644 --- a/src/lib/md/protos/co2.proto +++ b/src/lib/md/protos/co2.proto @@ -62,7 +62,7 @@ message MDRequest { IMPLIED = 0x40; } string host = 2; - string token = 3; + bytes token = 3; } message ChannelUpdate { diff --git a/src/server/sparkd/http/ApiGateway.cpp b/src/server/sparkd/http/ApiGateway.cpp index a1ebf346f..2d74e8ea9 100644 --- a/src/server/sparkd/http/ApiGateway.cpp +++ b/src/server/sparkd/http/ApiGateway.cpp @@ -47,6 +47,7 @@ struct ApiGatewayImpl { resp.mutable_logon()->set_is_valid(true); resp.mutable_logon()->set_token(logon_response.value()->token().token()); resp.mutable_logon()->set_can_create(logon_response.value()->can_create()); + // Do NOT log in _ctx as it is shared across all web clients } else { resp.mutable_logon()->set_reason(logon_response.value()->reason()); From ad8e803a8c22898b5db9f96acc6cd5648c808835 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 13:20:31 -0500 Subject: [PATCH 30/45] SPARK-1901 C++ AuthToken* is unwieldy. Replace with empty token --- src/lib/api/public/ServiceContext.cpp | 2 +- src/lib/api/public/ServiceContext.h | 2 +- src/lib/api/service_compiler/templates/cpp/server.pb.cc | 6 +++--- src/lib/api/service_compiler/templates/cpp/server.pb.h | 6 +++--- src/lib/utils/AuthToken.cpp | 8 ++++---- src/lib/utils/AuthToken.h | 2 +- src/lib/utils/tests/AuthTokenTests.cpp | 7 ++++--- src/server/sparkd/user/AdminServiceServer.cpp | 4 +++- src/server/sparkd/user/AuthServiceServer.cpp | 2 +- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/lib/api/public/ServiceContext.cpp b/src/lib/api/public/ServiceContext.cpp index cef9c3d4c..bcb22faac 100644 --- a/src/lib/api/public/ServiceContext.cpp +++ b/src/lib/api/public/ServiceContext.cpp @@ -81,7 +81,7 @@ void ServiceContext::post(const Action& action, uint64_t delay) { } Quickbus& ServiceContext::bus() const { return _self->_qbus; } -const AuthToken ServiceContext::token() const { return _self->_token; } +const AuthToken& ServiceContext::token() const { return _self->_token; } const std::string& ServiceContext::user() const { return _self->_user; } }}//namespace diff --git a/src/lib/api/public/ServiceContext.h b/src/lib/api/public/ServiceContext.h index 4ee20db78..11a685a70 100644 --- a/src/lib/api/public/ServiceContext.h +++ b/src/lib/api/public/ServiceContext.h @@ -40,7 +40,7 @@ public: } Quickbus& bus() const; - const AuthToken token() const; + const AuthToken& token() const; const std::string& user() const; const LoginResult login(const std::string& username, const std::string& password); void login(const AuthToken& token); diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib/api/service_compiler/templates/cpp/server.pb.cc index 9c83b25c4..4635e7803 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.cc @@ -41,7 +41,7 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, bts::api::StreamAccessRequest msg; if (msg.ParsePartialFromZeroCopyStream(&stream)) { allow_{{name}}( - header.has_token() ? &header.token() : nullptr, + header.token(), msg.qualifier(), [this,id,on_response](const bts::api::StreamAccessResponse& result) { respond(id,result,on_response); @@ -51,7 +51,7 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, {{input_type_cpp}} msg; if (msg.ParsePartialFromZeroCopyStream(&stream)) { auto id = header.request_id(); - {{name}}(header.has_token() ? &header.token() : nullptr, msg, [this,id,on_response](const {{output_type_cpp}}& result) { + {{name}}(header.token(), msg, [this,id,on_response](const {{output_type_cpp}}& result) { respond(id, result, on_response); }); } @@ -175,7 +175,7 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); } -void Authenticated{{../name}}Base::allow_{{name}}(const bts::api::AuthToken*, const std::string&, const api::Response& reply) { +void Authenticated{{../name}}Base::allow_{{name}}(const bts::api::AuthToken&, const std::string&, const api::Response& reply) { bts::api::StreamAccessResponse r; r.set_authorized(true); reply(r); diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.h b/src/lib/api/service_compiler/templates/cpp/server.pb.h index 90aec631c..aa6d2627c 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.h @@ -41,13 +41,13 @@ protected: {{cap name}}Publisher make_{{name}}_publisher(const char* qualifier=nullptr) const; {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher(const char* qualifier=nullptr) const; - virtual void allow_{{name}}(const bts::api::AuthToken* token, const std::string& qualifier, const api::Response& reply); + virtual void allow_{{name}}(const bts::api::AuthToken& token, const std::string& qualifier, const api::Response& reply); {{else}} // {{comment}} virtual void {{name}}( - const api::AuthToken* token, + const api::AuthToken& token, const {{input_type_cpp}}& request, const api::Response<{{output_type_cpp}}>& reply) = 0; {{/if}} @@ -76,7 +76,7 @@ public: {{#each method}} {{#unless server_streaming}} void {{name}}( - const api::AuthToken*, + const api::AuthToken&, const {{input_type_cpp}}& request, const api::Response<{{output_type_cpp}}>& reply) override { {{name}}(request, reply); diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index e4cb116ea..6d70a1c93 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -65,9 +65,9 @@ AuthToken generate_wheel_token() { result.set_token(token); return result; } -bool decode_token(const std::string& token, user::TokenPayload* payload) { - if (token.empty()) return false; - std::string temp = decrypt(token); +bool decode_token(const api::AuthToken& token, user::TokenPayload* payload) { + if (token.token().empty()) return false; + std::string temp = decrypt(token.token()); if (payload) { return payload->ParseFromString(temp) && !is_expired(*payload); } @@ -90,7 +90,7 @@ namespace auth { AuthToken generate_wheel_token() { return AuthToken(); } -bool decode_token(const std::string& token, user::TokenPayload* payload) { +bool decode_token(const api::AuthToken& token, user::TokenPayload* payload) { return false; } #endif diff --git a/src/lib/utils/AuthToken.h b/src/lib/utils/AuthToken.h index e0b330b41..cc704696c 100644 --- a/src/lib/utils/AuthToken.h +++ b/src/lib/utils/AuthToken.h @@ -9,7 +9,7 @@ namespace auth { AuthToken generate_token(const admin::BTSUser&); AuthToken generate_wheel_token(); -bool decode_token(const std::string& token, user::TokenPayload* payload); +bool decode_token(const api::AuthToken& token, user::TokenPayload* payload); bool is_expired(const user::TokenPayload&); }}} diff --git a/src/lib/utils/tests/AuthTokenTests.cpp b/src/lib/utils/tests/AuthTokenTests.cpp index 18c098b3f..51de507f7 100644 --- a/src/lib/utils/tests/AuthTokenTests.cpp +++ b/src/lib/utils/tests/AuthTokenTests.cpp @@ -14,14 +14,15 @@ TEST_CASE("AuthToken", "[security]") { // We use 1 byte for api header size REQUIRE(token.ByteSize() <= 240); api::user::TokenPayload payload; - REQUIRE(api::auth::decode_token(token.token(), &payload)); + REQUIRE(api::auth::decode_token(token, &payload)); REQUIRE(payload.id() == user.id()); REQUIRE(payload.wheel() == false); } SECTION("empty token") { api::user::TokenPayload payload; - REQUIRE(!api::auth::decode_token("", &payload)); + api::AuthToken empty; + REQUIRE(!api::auth::decode_token(empty, &payload)); REQUIRE(payload.id() == 0); REQUIRE(!payload.wheel()); } @@ -30,7 +31,7 @@ TEST_CASE("AuthToken", "[security]") { user.set_name("bts"); auto token = api::auth::generate_token(user); api::user::TokenPayload payload; - REQUIRE(api::auth::decode_token(token.token(), &payload)); + REQUIRE(api::auth::decode_token(token, &payload)); REQUIRE(payload.id() == user.id()); REQUIRE(payload.wheel()); } diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index a3f705ba9..e84cd722b 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -143,7 +143,9 @@ void AdminServiceServer::get_filtered_admin_data(const bts::api::admin::Filtered const api::Response& reply) { bts::api::user::TokenPayload toke; - if(bts::api::auth::decode_token(req.token(), &toke)) + api::AuthToken token; + token.set_token(req.token()); + if(bts::api::auth::decode_token(token, &toke)) { if(toke.wheel()) reply(_state); diff --git a/src/server/sparkd/user/AuthServiceServer.cpp b/src/server/sparkd/user/AuthServiceServer.cpp index 8be24cf67..48bb5cc64 100644 --- a/src/server/sparkd/user/AuthServiceServer.cpp +++ b/src/server/sparkd/user/AuthServiceServer.cpp @@ -70,7 +70,7 @@ void AuthServiceServer::authenticate_login(const api::user::AuthenticateLoginReq resp.mutable_token()->CopyFrom(api::auth::generate_token(user)); api::user::TokenPayload payload; - api::auth::decode_token(resp.token().token(), &payload); + api::auth::decode_token(resp.token(), &payload); resp.set_can_create(payload.wheel() || user.can_create()); respond(resp); return; From ba4b6aa1ff088f765cbe180d6e98c9bf436dbaed Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 13:39:58 -0500 Subject: [PATCH 31/45] Update QueryServer to use AuthenticatedMarketDataRelayBase --- src/lib/md/protos/co2.proto | 3 ++- src/lib/md/relay/QueryServer.cpp | 14 +++++++------- src/lib/md/relay/RelayClient.cpp | 23 ++++++++++++----------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/lib/md/protos/co2.proto b/src/lib/md/protos/co2.proto index e255a7106..a93fc1505 100644 --- a/src/lib/md/protos/co2.proto +++ b/src/lib/md/protos/co2.proto @@ -62,7 +62,8 @@ message MDRequest { IMPLIED = 0x40; } string host = 2; - bytes token = 3; +// bytes token = 3; + reserved 3; } message ChannelUpdate { diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index 2c6d692bb..53d7886d5 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -387,7 +387,7 @@ public: }; -struct MDRelayServer : bts::co2::MarketDataRelayBase { +struct MDRelayServer : bts::co2::AuthenticatedMarketDataRelayBase { const QueryServerImpl& _db; utils::Dispatcher& _threadpool; std::shared_ptr> _entitlements; @@ -396,7 +396,7 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { #endif MDRelayServer(const QueryServerImpl& db, utils::Dispatcher& threadpool, bts::api::ServiceContext ctx, metrics::MetricsContainer& stats) : - bts::co2::MarketDataRelayBase(ctx), + bts::co2::AuthenticatedMarketDataRelayBase(ctx), _db(db), _threadpool(threadpool), _entitlements() #ifndef _WIN32 , _time(std::make_shared>("spark_qserver_response_time_ms", std::array({ 5.0, 10.0, 20.0, 50.0, 100.0 }))), @@ -412,6 +412,7 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { void update_entitlements(std::shared_ptr>& entitlements) { _entitlements = entitlements; } + static const Entitlements* get_entitlements(uint32_t user_id, std::shared_ptr>& entitlements) { if (entitlements) { auto iter = entitlements->find(user_id); @@ -422,7 +423,7 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { return nullptr; } - virtual void requestmd(const MDRequest& request, const std::function& reply) override { + virtual void requestmd(const api::AuthToken& token, const MDRequest& request, const std::function& reply) override { TimeStamp start = TimeStamp::now(); _threadpool.post([=]() { google::protobuf::Arena arena; @@ -432,13 +433,12 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { auto ents = _entitlements; const Entitlements* user_entitlement = nullptr; bool bypass_entitlement = false; - if (api::auth::decode_token(request.token(), &payload)) { + if (api::auth::decode_token(token, &payload)) { bypass_entitlement = payload.wheel(); if (!bypass_entitlement) { user_entitlement = get_entitlements(payload.id(), ents); } } - // Temporarily bypass all entitlements _db.query(request, preply, user_entitlement, bypass_entitlement); reply(*preply); #ifndef _WIN32 @@ -449,7 +449,7 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { }); } - virtual void request_products(const api::VoidMessage&, const std::function& reply) override { + virtual void request_products(const api::AuthToken&, const api::VoidMessage&, const std::function& reply) override { ProductListReply list; std::set syms; get_system_md_symbols(syms); @@ -463,7 +463,7 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { reply(list); } - virtual void request_names(const api::VoidMessage&, const std::function& reply) override { + virtual void request_names(const api::AuthToken&, const api::VoidMessage&, const std::function& reply) override { _threadpool.post([=]() { google::protobuf::Arena arena; ExpirationNameListReply* preply = google::protobuf::Arena::CreateMessage(&arena); diff --git a/src/lib/md/relay/RelayClient.cpp b/src/lib/md/relay/RelayClient.cpp index cd3b696a4..ca9bf5030 100644 --- a/src/lib/md/relay/RelayClient.cpp +++ b/src/lib/md/relay/RelayClient.cpp @@ -219,14 +219,9 @@ public: } } - void set_token(const std::string& token) { - _request.set_token(token); - } - std::string compact_log_format() const { ostringstream log; log << "{"; - log << std::endl << "token: " << _request.token(); for (const auto& ch : _request.channels()) { log << std::endl; log << ch.symbol() << " "; @@ -315,11 +310,15 @@ struct RelayScheduler { } }; +api::ServiceContext elevated_relay_context() { + api::ServiceContext ctx; + ctx.login(api::auth::generate_wheel_token()); + return ctx; +} void relay_selected(api::ServiceContext& ctx, const std::set& symbols, IRelayWriter& writer) { auto relay = ctx.locate(); RelayClient client(relay, nullptr, symbols, writer); - client.set_token(api::auth::generate_wheel_token().token()); RelayScheduler scheduler(ctx, config::get().naggle_ms(), client); ctx.post([&]() { scheduler.run(); }); @@ -328,7 +327,7 @@ void relay_selected(api::ServiceContext& ctx, const std::set& symbol } void relay_everything() { - api::ServiceContext ctx; + api::ServiceContext ctx = elevated_relay_context(); std::set system_symbols; get_system_md_symbols(system_symbols); RelayProducer producer(true); @@ -336,7 +335,8 @@ void relay_everything() { } void local_relay(IRelayWriter& writer) { - api::ServiceContext ctx; + api::ServiceContext ctx = elevated_relay_context(); + ctx.login(api::auth::generate_wheel_token()); auto relay = ctx.locate(); std::set symbols; { @@ -378,14 +378,13 @@ void record_everything(std::string path, std::string filename) { auto naggle_ms = config::get().naggle_ms(); RelayRecorder recorder(path, filename, naggle_ms); - api::ServiceContext ctx; + api::ServiceContext ctx = elevated_relay_context(); auto relay = ctx.locate(); std::set system_symbols; get_system_md_symbols(system_symbols); RelayClient client(relay, nullptr, system_symbols, recorder); - client.set_token(api::auth::generate_wheel_token().token()); RelayScheduler scheduler(ctx, naggle_ms, client); scheduler.run(); @@ -435,7 +434,9 @@ void add_relay_symbol(RelayControl* relay, const SecurityChannel& chan) { void set_relay_token(RelayControl* relay, const std::string& token) { bts_assert(relay); relay->context.post([=]() { - relay->client.set_token(token); + api::AuthToken auth_token; + auth_token.set_token(token); + relay->context.login(auth_token); }); } From 04dadc46d5f30486632508cc2bb1fa763fc6ff12 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 14:33:34 -0500 Subject: [PATCH 32/45] ServiceContext.token needs more atomic --- src/client/spark_api/api/ServiceContext.cs | 29 ++++++++++++---------- src/lib/api/public/ClientChannel.h | 3 ++- src/lib/api/public/ServiceContext.cpp | 19 ++++++++++---- src/lib/api/public/ServiceContext.h | 4 +-- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index b27ea9412..89d53f482 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -35,6 +35,7 @@ namespace bts.api.core { public AuthTokenImmutable? token => _token ?? (AuthTokenImmutable?)null; public string user { get; private set; } public uint user_id { get; private set; } + public bool is_authenticated => token.HasValue; public async Task login(string username, string password) { var auth_service = locate(); @@ -43,21 +44,23 @@ namespace bts.api.core { Password = password ?? "" }); if (result.success) { - if (result.value.IsValid) { - _token = result.value.Token; - user = username; - user_id = result.value.UserId; + if (result.value.IsValid) { + _token = result.value.Token; + user = username; + user_id = result.value.UserId; return new LoginResult(); } - else { - return new LoginResult(result.value.Reason); + else { + return new LoginResult(result.value.Reason); } } - else { - return new LoginResult(result.error_message); + else { + return new LoginResult(result.error_message); } } public void login(AuthTokenImmutable token) { + this.user = ""; + this.user_id = 0; this._token = token.CloneToMutable(); } @@ -83,10 +86,10 @@ namespace bts.api.core { #endregion } - public class LoginResult { - public LoginResult() { success = true; } - public LoginResult(string reason) { success = false; this.reason = reason; } - public bool success { get; } - public string reason { get; } + public class LoginResult { + public LoginResult() { success = true; } + public LoginResult(string reason) { success = false; this.reason = reason; } + public bool success { get; } + public string reason { get; } } } diff --git a/src/lib/api/public/ClientChannel.h b/src/lib/api/public/ClientChannel.h index 46266a1e9..3918f3f05 100644 --- a/src/lib/api/public/ClientChannel.h +++ b/src/lib/api/public/ClientChannel.h @@ -25,7 +25,8 @@ public: RequestHeader header; header.set_method(method_id); header.set_request_id(++_id); - header.mutable_token()->set_token(_context.token().token()); + auto ptoken = _context.token(); + if (ptoken) header.mutable_token()->CopyFrom(*ptoken); int header_size = header.ByteSize()+1; assert(header_size < 128); diff --git a/src/lib/api/public/ServiceContext.cpp b/src/lib/api/public/ServiceContext.cpp index bcb22faac..39de8b4fa 100644 --- a/src/lib/api/public/ServiceContext.cpp +++ b/src/lib/api/public/ServiceContext.cpp @@ -4,6 +4,7 @@ #include "ApiServer.h" #include "lib/logging/logging.h" #include "lib/api/services/AuthService.client.pb.h" +#include namespace bts { namespace api { @@ -30,9 +31,14 @@ struct ServiceContextImpl { api_destroy_quickbus(&_qbus); } } + void set_token(const AuthToken& t) { + auto st = std::make_shared(); + st->CopyFrom(t); + _token = st; + } Quickbus& _qbus; bool _owns_qb; - AuthToken _token; + std::shared_ptr _token; std::string _user; }; @@ -60,7 +66,7 @@ const LoginResult ServiceContext::login(const std::string& username, const std:: auto result = auth.authenticate_login(request); if (result.success()) { if (result.value()->is_valid()) { - _self->_token = result.value()->token(); + _self->set_token(result.value()->token()); _self->_user = username; return {}; } @@ -73,7 +79,8 @@ const LoginResult ServiceContext::login(const std::string& username, const std:: } } void ServiceContext::login(const AuthToken& token) { - _self->_token = token; + _self->set_token(token); + _self->_user.clear(); } void ServiceContext::post(const Action& action, uint64_t delay) { @@ -81,8 +88,10 @@ void ServiceContext::post(const Action& action, uint64_t delay) { } Quickbus& ServiceContext::bus() const { return _self->_qbus; } -const AuthToken& ServiceContext::token() const { return _self->_token; } -const std::string& ServiceContext::user() const { return _self->_user; } +bool ServiceContext::is_authenticated() const { return _self->_token != nullptr; } +const std::shared_ptr ServiceContext::token() const { + return _self->_token; +} }}//namespace #endif diff --git a/src/lib/api/public/ServiceContext.h b/src/lib/api/public/ServiceContext.h index 11a685a70..181e673f3 100644 --- a/src/lib/api/public/ServiceContext.h +++ b/src/lib/api/public/ServiceContext.h @@ -40,8 +40,8 @@ public: } Quickbus& bus() const; - const AuthToken& token() const; - const std::string& user() const; + bool is_authenticated() const; + const std::shared_ptr token() const; const LoginResult login(const std::string& username, const std::string& password); void login(const AuthToken& token); From c4393637e7a10a6f28d25e4e4572af957159b2ae Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 15:33:12 -0500 Subject: [PATCH 33/45] Update ApiGateway to copy input token --- src/lib/api/apigateway.proto | 5 +++-- src/server/sparkd/http/ApiGateway.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/api/apigateway.proto b/src/lib/api/apigateway.proto index f55413bba..47b44c838 100644 --- a/src/lib/api/apigateway.proto +++ b/src/lib/api/apigateway.proto @@ -1,6 +1,7 @@ syntax="proto3"; package bts.api.gateway; option csharp_namespace="bts.api.gateway"; +import "lib/api/apicore.proto"; message GatewayLogin { string username = 1; @@ -9,13 +10,13 @@ message GatewayLogin { message GatewayLoginResult { bool is_valid = 1; string reason = 2; - string token = 3; + api.AuthToken token = 3; bool can_create = 4; } message GatewayCallHeader { int32 request_id = 1; int32 method = 2; - string token = 3; + api.AuthToken token = 3; string service_type = 4; string service_qualifier = 5; } diff --git a/src/server/sparkd/http/ApiGateway.cpp b/src/server/sparkd/http/ApiGateway.cpp index 2d74e8ea9..a242fe3c1 100644 --- a/src/server/sparkd/http/ApiGateway.cpp +++ b/src/server/sparkd/http/ApiGateway.cpp @@ -45,7 +45,7 @@ struct ApiGatewayImpl { if (logon_response) { if (logon_response.value()->is_valid()) { resp.mutable_logon()->set_is_valid(true); - resp.mutable_logon()->set_token(logon_response.value()->token().token()); + resp.mutable_logon()->mutable_token()->CopyFrom(logon_response.value()->token()); resp.mutable_logon()->set_can_create(logon_response.value()->can_create()); // Do NOT log in _ctx as it is shared across all web clients } @@ -87,7 +87,7 @@ struct ApiGatewayImpl { api::RequestHeader api_header; api_header.set_method(header.method()); api_header.set_request_id(header.request_id()); - //todo: token + api_header.mutable_token()->CopyFrom(header.token()); int header_size = 1 + api_header.ByteSize(); bts_assert(header_size < 128); std::string buffer; From 1b2aeee069ccacdee61e86a264c7cf643be2cc99 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 15:33:28 -0500 Subject: [PATCH 34/45] Update AdminServiceServer to use AuthenticatedAdminServiceBase --- .../extensions/OrderService_Excel.cs | 2 +- src/lib/api/services/AdminService.proto | 4 +- src/server/sparkd/user/AdminServiceServer.cpp | 24 +++++++--- src/server/sparkd/user/AdminServiceServer.h | 45 ++++++++++++------- src/web/ui/src/Access.fs | 4 +- src/web/ui/src/Accounts/State.fs | 8 ++-- src/web/ui/src/Users/State.fs | 6 +-- 7 files changed, 57 insertions(+), 36 deletions(-) diff --git a/src/client/spark_excel/extensions/OrderService_Excel.cs b/src/client/spark_excel/extensions/OrderService_Excel.cs index 853d3227d..09ba73298 100644 --- a/src/client/spark_excel/extensions/OrderService_Excel.cs +++ b/src/client/spark_excel/extensions/OrderService_Excel.cs @@ -26,7 +26,7 @@ namespace bts.api.orderman try { List accts = new List(); - var admin = await _admin.Value.get_filtered_admin_data_async(new FilteredAdminDataRequest { Token = login_token }); + var admin = await _admin.Value.get_filtered_admin_data_async(new FilteredAdminDataRequest()); if (admin.success) { foreach (var acc in admin.value.Accounts) diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index c671fb4d0..23ae7337a 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -459,9 +459,7 @@ message AdminServiceCreateAccountResult { uint32 new_id = 30; } -message FilteredAdminDataRequest { - string token = 1; -} +message FilteredAdminDataRequest { } service AdminService { option (bts.api.service_description) = "Provides a management interface to the user model"; diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index e84cd722b..09b33068d 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -21,7 +21,7 @@ namespace admin{ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) : - bts::api::admin::AdminServiceBase (context), + bts::api::admin::AuthenticatedAdminServiceBase (context), _db_name("admin"), _table_name("admin_data"), _unique_key("0"), @@ -73,6 +73,7 @@ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) } AdminServiceServer::~AdminServiceServer() {} void AdminServiceServer::create_account( + const api::AuthToken&, const AccountCreateAPIArgument& request, const api::Response& reply){ bts::api::admin::AdminServiceCreateAccountResult result; @@ -102,6 +103,7 @@ void AdminServiceServer::create_account( reply(result); } void AdminServiceServer::update_account( + const api::AuthToken&, const AccountUpdateAPIArgument& request, const api::Response& reply){ bts::api::admin::AdminServiceOperationResult result; @@ -110,6 +112,7 @@ void AdminServiceServer::update_account( reply(result); } void AdminServiceServer::create_user( + const api::AuthToken&, const UserCreateAPIArgument& request, const api::Response& reply){ AdminServiceCreateEntityResult result; @@ -127,6 +130,7 @@ void AdminServiceServer::create_user( reply(result); } void AdminServiceServer::update_user( + const api::AuthToken&, const UserUpdateAPIArgument& request, const api::Response& reply){ AdminServiceOperationResult result; @@ -134,17 +138,19 @@ void AdminServiceServer::update_user( _update_and_publish(false); reply(result); } -void AdminServiceServer::get_admin_data(const bts::api::VoidMessage&, - const api::Response& reply){ +void AdminServiceServer::get_admin_data( + const api::AuthToken&, + const bts::api::VoidMessage&, + const api::Response& reply){ reply(_state); } -void AdminServiceServer::get_filtered_admin_data(const bts::api::admin::FilteredAdminDataRequest& req, - const api::Response& reply) +void AdminServiceServer::get_filtered_admin_data( + const api::AuthToken& token, + const bts::api::admin::FilteredAdminDataRequest&, + const api::Response& reply) { bts::api::user::TokenPayload toke; - api::AuthToken token; - token.set_token(req.token()); if(bts::api::auth::decode_token(token, &toke)) { if(toke.wheel()) @@ -215,6 +221,7 @@ void AdminServiceServer::get_filtered_admin_data(const bts::api::admin::Filtered void AdminServiceServer::delete_user( + const api::AuthToken&, const IDAPIArgument& id, const api::Response& reply){ AdminServiceOperationResult result; result.set_is_success(true); @@ -223,6 +230,7 @@ void AdminServiceServer::delete_user( reply(result); } void AdminServiceServer::delete_account( + const api::AuthToken&, const IDAPIArgument& id, const api::Response& reply){ AdminServiceOperationResult result; result.set_is_success(true); @@ -252,6 +260,7 @@ void AdminServiceServer::_update_and_publish(bool is_insert){ } void AdminServiceServer::get_order_summary( + const api::AuthToken&, const bts::api::VoidMessage&, const api::Response& reply){ std::map> agg; @@ -273,6 +282,7 @@ void AdminServiceServer::get_order_summary( reply(rv); } void AdminServiceServer::cancel_orders( + const api::AuthToken&, const OrderCancelRequest& req, const api::Response&){ vector accts, users; diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index ec1363032..cd19fc4b8 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -15,7 +15,7 @@ using namespace bts::api::orderman; using namespace bts::api::admin; using namespace std; -class AdminServiceServer : public api::admin::AdminServiceBase +class AdminServiceServer : public api::admin::AuthenticatedAdminServiceBase { private: const std::string _db_name; @@ -34,41 +34,54 @@ public: ~AdminServiceServer(); void create_account( - const AccountCreateAPIArgument& request, - const api::Response& reply) override; + const api::AuthToken&, + const AccountCreateAPIArgument& request, + const api::Response& reply) override; void update_account( - const AccountUpdateAPIArgument& request, - const api::Response& reply) override; - + const api::AuthToken&, + const AccountUpdateAPIArgument& request, + const api::Response& reply) override; + void create_user( - const UserCreateAPIArgument& request, - const api::Response& reply) override; + const api::AuthToken&, + const UserCreateAPIArgument& request, + const api::Response& reply) override; void update_user( + const api::AuthToken&, const UserUpdateAPIArgument& request, const api::Response& reply) override; - void get_admin_data(const bts::api::VoidMessage& request, - const api::Response& reply) override; + void get_admin_data( + const api::AuthToken&, + const bts::api::VoidMessage& request, + const api::Response& reply) override; - void get_filtered_admin_data(const bts::api::admin::FilteredAdminDataRequest& request, - const api::Response& reply) override; + void get_filtered_admin_data( + const api::AuthToken&, + const bts::api::admin::FilteredAdminDataRequest& request, + const api::Response& reply) override; void delete_user( + const api::AuthToken&, const IDAPIArgument& request, const api::Response& reply) override; void delete_account( + const api::AuthToken&, const IDAPIArgument& request, const api::Response& reply) override; - void get_order_summary(const bts::api::VoidMessage& request, - const api::Response& reply) override; + void get_order_summary( + const api::AuthToken&, + const bts::api::VoidMessage& request, + const api::Response& reply) override; void cancel_orders( - const OrderCancelRequest& request, - const api::Response& reply) override; + const api::AuthToken&, + const OrderCancelRequest& request, + const api::Response& reply) override; private: // this is mainly does 2 things : diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index f625884e9..3de9afcff 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -7,9 +7,9 @@ open bts.api.orderman let superuser = "bts" -let getAdminData (admin:IAdminService) (token) (fsuc) (ffail) = +let getAdminData (admin:IAdminService) (fsuc) (ffail) = Cmd.ofPromise - admin.get_filtered_admin_data { token = token } + admin.get_filtered_admin_data () fsuc (fun e -> ffail e.Message) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index 9be77a425..23158a82a 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -37,7 +37,7 @@ let init (context:ServiceContext.ServiceContext) = can_create = context.can_create this_username = context.username ShowLoading = false - }, Access.getAdminData admin context.token UpdateAdminData NoAdminData + }, Access.getAdminData admin UpdateAdminData NoAdminData let existingSelection (scratch:BTSAccount) (previousScratch:BTSAccount) (data:AdminData) = List.choose id [ @@ -76,7 +76,7 @@ let applySIMUpdate (data:SIMAccountData) = function let saveAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise { let! result = admin.update_account { completeData = account } if result.isSuccess then - let! data = admin.get_filtered_admin_data {token = model.token} + let! data = admin.get_filtered_admin_data () return UpdateAdminData data else return ErrorOccured (sprintf "Error saving account: %s" result.errorText) @@ -94,7 +94,7 @@ let createAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = pro let deleteAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise { let! result = admin.delete_account { id = account.id } if result.isSuccess then - let! data = admin.get_filtered_admin_data {token = model.token} + let! data = admin.get_filtered_admin_data () return UpdateAdminData data else return ErrorOccured (sprintf "Error deleting account: %s" result.errorText) @@ -105,7 +105,7 @@ let cancelOrders (admin:IAdminService) (accountName:string) (orders:OrdersSummar let accounts = [| accountName |] let! result = admin.cancel_orders {accounts = accounts; users = users } - let! data = admin.get_filtered_admin_data {token = model.token} + let! data = admin.get_filtered_admin_data () return UpdateAdminData data } diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 6e288c739..f7103039a 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -28,7 +28,7 @@ let isNewUser (user:BTSUser) = let getAdminData (admin:IAdminService) (token:string) = Cmd.ofPromise - admin.get_filtered_admin_data { token = token } + admin.get_filtered_admin_data () UpdateAdminData (fun _ -> RpcResponse "Error getting admin data") @@ -156,7 +156,7 @@ let userIsSelected (initialState:BTSUser) (scratch:BTSUser) = scratch <> initial let saveUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise { let! result = admin.update_user { completeData = user } if (result.isSuccess) then - let! data = admin.get_filtered_admin_data {token = model.token} + let! data = admin.get_filtered_admin_data () return UpdateAdminData data else return ErrorOccured (sprintf "Error saving user: %s" result.errorText) @@ -165,7 +165,7 @@ let saveUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise { let deleteUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise { let! result = admin.delete_user { id = user.id } if (result.isSuccess) then - let! data = admin.get_filtered_admin_data {token = model.token} + let! data = admin.get_filtered_admin_data () return UpdateAdminData data else return ErrorOccured (sprintf "Error deleting user: %s" result.errorText) From dcee2930f5715bf5d6bf501148d7a056630309d4 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 15:47:43 -0500 Subject: [PATCH 35/45] Fix F# warnings --- src/web/ui/src/Accounts/State.fs | 2 +- src/web/ui/src/Controls/Fields.fs | 7 +++-- src/web/ui/src/Nav.fs | 3 +- src/web/ui/src/Users/State.fs | 48 +++++++++++++------------------ 4 files changed, 27 insertions(+), 33 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index 23158a82a..fcbaac147 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -191,7 +191,7 @@ let update msg (model:Model) : Model * Cmd = | true, h::m::tail -> orders | true, h::_ -> h::model.SelectedOrders | false, h::_ -> List.filter (fun elm -> (orderIsEqual elm h) |> not) model.SelectedOrders - | false, _ -> [] + | _ -> [] {model with SelectedOrders = so}, Cmd.Empty | SelectAccount account -> { (clearSelection model) with previousScratch = model.scratch; scratch = account }, Cmd.Empty diff --git a/src/web/ui/src/Controls/Fields.fs b/src/web/ui/src/Controls/Fields.fs index 20cd5876e..2fbd6cd2f 100644 --- a/src/web/ui/src/Controls/Fields.fs +++ b/src/web/ui/src/Controls/Fields.fs @@ -194,9 +194,10 @@ let radioButton (lbl:string) (description:string) (dv:bool) (attrs:IHTMLProp lis let mapSelectEx (lbl:string) (options:Map) (defaultText:string option) (defaultValue:string option) (onchange:'a->unit) (is_disabled:bool option) = - let dis = match is_disabled with - | None -> false - | Some a -> a + let dis = + match is_disabled with + | None -> false + | Some a -> a let optList:ReactElement list = match defaultText with diff --git a/src/web/ui/src/Nav.fs b/src/web/ui/src/Nav.fs index d272169e6..c156bc27d 100644 --- a/src/web/ui/src/Nav.fs +++ b/src/web/ui/src/Nav.fs @@ -59,4 +59,5 @@ let root (currentPage:Page) (sc:ServiceContext) dispatch = ] ] -let (navRoot: 'a -> ServiceContext -> Dispatch -> ReactElement) = lazyView3With (fun b c -> isCurrentPage (fst b) (fst c)) root \ No newline at end of file +let (navRoot: Page -> ServiceContext -> Dispatch -> ReactElement) = + lazyView3With (fun b c -> isCurrentPage (fst b) (fst c)) root \ No newline at end of file diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index f7103039a..d59dd43a1 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -20,12 +20,6 @@ let SMPInstructionMap:Map = Map.empty let isNewUser (user:BTSUser) = user.id = 0u && user.isPresent -// let getUserData (user:IUserService) username password = -// Cmd.ofPromise -// user.authenticate_login { login = username; password = password} -// (fun u -> UpdateAdminAuthData u.adminData) -// (fun _ -> RpcResponse "Error getting admin auth data") - let getAdminData (admin:IAdminService) (token:string) = Cmd.ofPromise admin.get_filtered_admin_data () @@ -109,13 +103,13 @@ let init (context:ServiceContext.ServiceContext) : Model * Cmd = accountsList = [] scratchUser = defaultScratchUser PreviousScratchUser = defaultScratchUser - currentTab = Tab.General + currentTab = Tab.General admin = admin adminData = None OptionsMenuOpen = "" ConfirmModal = "", (Msg.SwitchTab Tab.General) token = context.token - can_create = context.can_create + can_create = context.can_create this_username = context.username }, getAdminData admin context.token @@ -180,7 +174,7 @@ let createUser (admin:IAdminService) (user:BTSUser) (model:Model)= promise { company = user.company licenseData = user.licenseData licenseEntitlements = user.licenseEntitlements - } + } let! result = admin.create_user args if result.isSuccess then return! saveUser admin { user with id = result.newId } model @@ -189,26 +183,24 @@ let createUser (admin:IAdminService) (user:BTSUser) (model:Model)= promise { } let updateExchangeMdEntitlementDataCMEData user dta :BTSUser = { user with userData = { user.userData with exchangeMdEntitlementData = { user.userData.exchangeMdEntitlementData with cmeData = dta}}} -let updateCMEExchangeUserData user dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with cmeData = dta }}} -let updateSIMExchangeUserData user dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with simData = dta }}} +let updateCMEExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with cmeData = dta }}} +let updateSIMExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with simData = dta }}} -let default_user_account = { - tradingPermission = { - hasPermissions = false - submitMarketOrders = false - submitGtcOrders = false - algoTradingPermission = { - submitIcebergOrders = false - submitTimeBoxOrders = false - submitSpreaderOrders = false - } - } - adminPermission = { - hasPermissions = false - hasMdPermissions = false - } +let default_user_account = { + tradingPermission = + { hasPermissions = false + submitMarketOrders = false + submitGtcOrders = false + algoTradingPermission = + { submitIcebergOrders = false + submitTimeBoxOrders = false + submitSpreaderOrders = false } + } + adminPermission = + { hasPermissions = false + hasMdPermissions = false } } - + let applyUpdate (field:UserField) (user:BTSUser) = match field with @@ -293,7 +285,7 @@ let update msg (model:Users.Types.Model) : Model * Cmd = company = usrDest.company isActive = usrDest.isActive } - { model with scratchUser = nusr }, Cmd.Empty + { model with scratchUser = nusr }, Cmd.Empty | Delete usr -> let mdl = { model with OptionsMenuOpen = "" } From 24f0b48f9d0b559ee328409d3045d1659475a211 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 7 Dec 2018 18:13:57 -0500 Subject: [PATCH 36/45] revamp MarketDataClient to use same MD as shell --- src/client/spark/Daemons/MDDaemon.cs | 57 +-- src/client/spark/core/Bus/SparkCommands.cs | 1 + .../core/GlobalExtensions/GlobalExtensions.cs | 4 +- .../spark/view/Spark/Ladder/LadderVM.cs | 1 + src/client/spark_api/md/MDBook.cs | 50 +++ src/client/spark_api/md/MDCombined.cs | 63 +++ src/client/spark_api/md/MDLast.cs | 39 ++ src/client/spark_api/md/MDMisc.cs | 67 +++ src/client/spark_api/md/MDSource.cs | 87 ++++ src/client/spark_api/md/MarketDataClient.cs | 385 +++++++----------- src/client/spark_api/md/PriceSize.cs | 20 + .../Spark/Core => spark_api/md}/SecurityMD.cs | 2 +- src/client/spark_api/utils/APIExtensions.cs | 5 +- .../spark_api/{md => utils}/Authenticator.cs | 0 .../spark_api/{md => utils}/LazyAsync.cs | 2 +- src/client/spark_api/{md => utils}/Locator.cs | 0 .../rtd/subscriptions/MDSubscribe.cs | 14 +- 17 files changed, 484 insertions(+), 313 deletions(-) create mode 100644 src/client/spark_api/md/MDBook.cs create mode 100644 src/client/spark_api/md/MDCombined.cs create mode 100644 src/client/spark_api/md/MDLast.cs create mode 100644 src/client/spark_api/md/MDMisc.cs create mode 100644 src/client/spark_api/md/MDSource.cs create mode 100644 src/client/spark_api/md/PriceSize.cs rename src/client/{spark/view/Spark/Core => spark_api/md}/SecurityMD.cs (94%) rename src/client/spark_api/{md => utils}/Authenticator.cs (100%) rename src/client/spark_api/{md => utils}/LazyAsync.cs (90%) rename src/client/spark_api/{md => utils}/Locator.cs (100%) diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index 4529156e4..faa7ef36f 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -17,32 +17,22 @@ using bts.api.user; namespace bts { [Export(typeof(IInitializable))] - class MDSource : IObserver>, IInitializable, IDisposable { + class MDDaemon : bts.md.MDSource, IObserver>, IInitializable, IDisposable { readonly Lazy _bus; readonly Lazy _token; readonly Lazy _ss; - readonly MDConsumer _consumer = new MDConsumer(); - readonly Co2RelayControl _relay; readonly Dictionary _deleted_synthetics = new Dictionary(); - long _version = 0; - readonly ConcurrentDictionary _exchange_sec_map = new ConcurrentDictionary(); - List _dispose = new List(); + + static uint get_naggle() => mbts.config.Configuration.get().naggle_ms; [ImportingConstructor] - public MDSource( - Lazy bus, - Lazy token, - Lazy ss) { + public MDDaemon(Lazy bus, Lazy token, Lazy ss) : base(get_naggle()) { _bus = bus; _token = token; - _ss = ss; - uint naggle_ms = mbts.config.Configuration.get().naggle_ms; - _relay = new Co2RelayControl(_consumer, naggle_ms); - _relay.preload_securities((co2.MDRequest.Types.Flags)0xff).ignore(); - _dispose.Add(_consumer.on_security.Subscribe(this)); + _ss = ss; } - public void initialize() { + override public void initialize() { _relay.set_token(_token.Value); _dispose.Add( _ss.Value.subscribei_metadata() @@ -67,6 +57,9 @@ namespace bts { // Post full dictionary of syntheics here bus.post(SparkTags.SyntheticstrategiesTag, t); })); + _dispose.Add( this.on_securities.Subscribe( (md) => { + bus.post(SparkTags.SecuritiesTag, md); + })); Task.Run(run); } @@ -75,37 +68,5 @@ namespace bts { public int priority => 55; IBus bus => _bus.Value; - - public void OnCompleted() { } - public void OnError(Exception error) => Log.Md.error(error.ToString()); - public void OnNext(List values) { - if (values.Count > 0) { - foreach (var v in values) { - var smd = new SecurityMD(v.security, v.handle); - _exchange_sec_map.AddOrUpdate(smd.security.Id, smd, (_, __) => smd); - } - _version += 1; - } - } - - public void Dispose() => Disposable.dispose(_dispose); - async Task run() { - long run_version = 0; - while (true) { - var exch = _exchange_sec_map; - long current_version = _version; - if (current_version > run_version) { - run_version = current_version; - try { - Log.Md.info($"MDSource publishing {exch.Count} securities"); - bus.post(SparkTags.SecuritiesTag, exch); - } catch (Exception e) { - Log.Md.error($"Error in publish_securities: {e}"); - } - } - await Task.Delay(TimeSpan.FromSeconds(1)); - } - } - } } \ No newline at end of file diff --git a/src/client/spark/core/Bus/SparkCommands.cs b/src/client/spark/core/Bus/SparkCommands.cs index 64f73fb9c..3d801d483 100644 --- a/src/client/spark/core/Bus/SparkCommands.cs +++ b/src/client/spark/core/Bus/SparkCommands.cs @@ -3,6 +3,7 @@ using bts.api.orderman; using bts.shell; using mbts.spark; using mbts.ui; +using mbts; using System; using System.Collections.Generic; diff --git a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs index 018261cc7..93ba83022 100644 --- a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs @@ -218,9 +218,7 @@ namespace mbts private Func _comparer_func; public DelegateComparer(Func comparer_func) { _comparer_func = comparer_func; } public int Compare(T x, T y) { return _comparer_func(x, y); } - } - - public static void ignore(this Task t) { } + } public static Google.Protobuf.WellKnownTypes.Timestamp ToGoogleTime(this DateTime self) { return Google.Protobuf.WellKnownTypes.Timestamp.FromDateTime(self); diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 905b5c072..f7f62b888 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -299,6 +299,7 @@ namespace mbts.spark { _change.set(mid - md.settlement_price); } _volume.set(volume); + _misc_time = _model.md.misc_timestamp; } } diff --git a/src/client/spark_api/md/MDBook.cs b/src/client/spark_api/md/MDBook.cs new file mode 100644 index 000000000..4f9498810 --- /dev/null +++ b/src/client/spark_api/md/MDBook.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +using bts.api; +using mbts; +using mbts.co2; + +namespace bts.md +{ + interface IMDUpdate + { + bool update(SecurityMD smd, ref ulong last_update_time); + } + + public interface IMDData + { + SecurityImmutable security { get; } + } + + public interface IMDBook : IMDData + { + List bids { get; } + List asks { get; } + } + + class MDBook : IMDBook, IMDUpdate + { + public MDBook() + { + } + public SecurityImmutable security { get; private set; } + + public List bids { get; private set; } + public List asks { get; private set; } + + bool IMDUpdate.update(SecurityMD smd, ref ulong last_update_time) + { + NativePriceSize[] bids = null, asks = null; + if (smd.md.get_depth(ref last_update_time, ref bids, ref asks, NativePriceHelpers.COCONUT_MAX_DEPTH)) + { + this.security = smd.security; + this.bids = bids.Select(x => new PriceSize(x.size, x.direct_size, x.implied_size, x.price)).ToList(); + this.asks = asks.Select(x => new PriceSize(x.size, x.direct_size, x.implied_size, x.price)).ToList(); + return true; + } + return false; + } + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/MDCombined.cs b/src/client/spark_api/md/MDCombined.cs new file mode 100644 index 000000000..741a8c62f --- /dev/null +++ b/src/client/spark_api/md/MDCombined.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using bts.api; +using mbts; + +namespace bts.md +{ + public interface IMDCombined : IMDData, IMDMisc, IMDLast, IMDBook + { + } + + class MDCombined : IMDCombined, IMDUpdate + { + MDBook _book = new MDBook(); + MDLast _last = new MDLast(); + MDMisc _misc = new MDMisc(); + public MDCombined() + { + } + public SecurityImmutable security { get; private set; } + + public ulong total_volume => _misc.total_volume; + public double settlement_price => _misc.settlement_price; + public DateTime settlement_date => _misc.settlement_date; + public double previous_settlement_price => _misc.previous_settlement_price; + public DateTime previous_settlement_date => _misc.previous_settlement_date; + + public double open_price => _misc.open_price; + public DateTime open_date => _misc.open_date; + public double close_price => _misc.close_price; + public DateTime close_date => _misc.close_date; + public double session_high => _misc.session_high; + public double session_low => _misc.session_low; + public double fixing_price => _misc.fixing_price; + + public PriceSize last => _last.last; + public ulong total_volume2 => _last.total_volume; + public DateTime last_time => _last.last_time; + + public List bids => _book.bids; + public List asks => _book.asks; + + + bool IMDUpdate.update(SecurityMD smd, ref ulong last_update_time) + { + var bl = last_update_time; + bool b = (_book as IMDUpdate).update(smd, ref bl); + + var ll = last_update_time; + bool l = (_last as IMDUpdate).update(smd, ref ll); + + var ml = last_update_time; + bool m = (_misc as IMDUpdate).update(smd, ref ml); + + last_update_time = new[] { bl, ll, ml }.Min(); + if (smd.md.market_timestamp > last_update_time) + { + } + return b || l || m; + } + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/MDLast.cs b/src/client/spark_api/md/MDLast.cs new file mode 100644 index 000000000..bb785afb5 --- /dev/null +++ b/src/client/spark_api/md/MDLast.cs @@ -0,0 +1,39 @@ +using System; +using bts.api; +using mbts; +using mbts.co2; + +namespace bts.md +{ + public interface IMDLast : IMDData + { + PriceSize last{ get; } + ulong total_volume { get; } + DateTime last_time { get; } + } + + class MDLast : IMDLast, IMDUpdate + { + public MDLast() + { + } + public SecurityImmutable security { get; private set; } + + public PriceSize last { get; private set; } + public ulong total_volume { get; private set; } + public DateTime last_time { get; private set; } + + bool IMDUpdate.update(SecurityMD smd, ref ulong last_update_time) + { + NativePriceSize x; DateTime ts; ulong vol; + if (smd.md.get_last_trade(ref last_update_time, out x, out ts, out vol)) + { + last = new PriceSize(x.size, x.direct_size, x.implied_size, x.price); + total_volume = vol; + last_time = ts; + return true; + } + return false; + } + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/MDMisc.cs b/src/client/spark_api/md/MDMisc.cs new file mode 100644 index 000000000..41e728f01 --- /dev/null +++ b/src/client/spark_api/md/MDMisc.cs @@ -0,0 +1,67 @@ +using System; +using bts.api; +using mbts; + +namespace bts.md +{ + public interface IMDMisc : IMDData + { + ulong total_volume { get; } + double settlement_price { get; } + DateTime settlement_date { get; } + double previous_settlement_price { get; } + DateTime previous_settlement_date { get; } + + double open_price { get; } + DateTime open_date { get; } + double close_price { get; } + DateTime close_date { get; } + double session_high { get; } + double session_low { get; } + double fixing_price { get; } + } + + class MDMisc : IMDMisc, IMDUpdate + { + public MDMisc() + { + } + public SecurityImmutable security { get; private set; } + + public ulong total_volume { get; private set; } + public double settlement_price { get; private set; } + public DateTime settlement_date { get; private set; } + public double previous_settlement_price { get; private set; } + public DateTime previous_settlement_date { get; private set; } + + public double open_price { get; private set; } + public DateTime open_date { get; private set; } + public double close_price { get; private set; } + public DateTime close_date { get; private set; } + public double session_high { get; private set; } + public double session_low { get; private set; } + public double fixing_price { get; private set; } + + bool IMDUpdate.update(SecurityMD smd, ref ulong last_update_time) + { + if (smd.md.misc_timestamp > last_update_time) + { + this.security = smd.security; + total_volume = smd.md.total_volume; + settlement_price = smd.md.settlement_price; + settlement_date = smd.md.settlement_date; + previous_settlement_price = smd.md.previous_settlement_price; + previous_settlement_date = smd.md.previous_settlement_date; + + open_price = smd.md.open_price; + open_date = smd.md.open_date; + close_price = smd.md.close_price; + close_date = smd.md.close_date; + session_high = smd.md.session_high; + session_low = smd.md.session_low; + fixing_price = smd.md.fixing_price; + } + return false; + } + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/MDSource.cs b/src/client/spark_api/md/MDSource.cs new file mode 100644 index 000000000..e9ae6f208 --- /dev/null +++ b/src/client/spark_api/md/MDSource.cs @@ -0,0 +1,87 @@ +using bts.api; +using bts.api.synthetic; +using mbts; +using mbts.co2; +using System; +using System.Collections.Generic; +using System.Reactive.Linq; +using System.Threading.Tasks; +using System.Linq; +using SecurityKey = System.UInt32; +using System.Collections.Concurrent; +using System.Threading; +using bts.api.user; +using System.Reactive.Subjects; + +namespace bts.md +{ + class MDSource : IObserver>, IDisposable + { + protected readonly MDConsumer _consumer = new MDConsumer(); + protected readonly Co2RelayControl _relay; + protected long _version = 0; + protected readonly ConcurrentDictionary _exchange_sec_map = new ConcurrentDictionary(); + protected List _dispose = new List(); + + public MDSource(uint naggle_ms) + { + _relay = new Co2RelayControl(_consumer, naggle_ms); + _relay.preload_securities((co2.MDRequest.Types.Flags)0xff).ignore(); + _dispose.Add(_consumer.on_security.Subscribe(this)); + } + + readonly Subject> _on_securities = new Subject>(); + public IObservable> on_securities => _on_securities; + + virtual public void initialize() + { + Task.Run(run); + } + + public void set_token(AuthToken token) + { + _relay.set_token(token); + } + + public void OnCompleted() { } + public void OnError(Exception error) => Log.Md.error(error.ToString()); + public void OnNext(List values) + { + if (values.Count > 0) + { + foreach (var v in values) + { + var smd = new SecurityMD(v.security, v.handle); + _exchange_sec_map.AddOrUpdate(smd.security.Id, smd, (_, __) => smd); + } + _version += 1; + } + } + + public void Dispose() => Disposable.dispose(_dispose); + async protected Task run() + { + long run_version = 0; + while (true) + { + var exch = _exchange_sec_map; + long current_version = _version; + if (current_version > run_version) + { + run_version = current_version; + try + { + Log.Md.info($"MDSource publishing {exch.Count} securities"); + _on_securities.OnNext(exch); + } + catch (Exception e) + { + Log.Md.error($"Error in publish_securities: {e}"); + } + } + await Task.Delay(TimeSpan.FromSeconds(1)); + } + } + + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/MarketDataClient.cs b/src/client/spark_api/md/MarketDataClient.cs index 2512c2b72..3f469db8a 100644 --- a/src/client/spark_api/md/MarketDataClient.cs +++ b/src/client/spark_api/md/MarketDataClient.cs @@ -11,103 +11,174 @@ using System.Reactive.Subjects; using bts.api; using bts.api.core; using bts.co2; +using mbts; +using SecurityKey = System.UInt32; -namespace bts.api.md +namespace bts.md { - using security_key = System.UInt32; - public class MarketDataClient : IDisposable + + public class MarketDataClient : IDisposable { - class Data - { - public long last_update_time; - public ChannelUpdate data; - } - - const UInt32 _all_flags = (uint)( - MDRequest.Types.Flags.Security | - MDRequest.Types.Flags.Bbo | - MDRequest.Types.Flags.Direct | - MDRequest.Types.Flags.Implied | - MDRequest.Types.Flags.LastTrade); + static uint naggle_ms = 100; + readonly static bts.md.MDSource _subscription = new MDSource(naggle_ms); - readonly ConcurrentDictionary _data = new ConcurrentDictionary(); - readonly ConcurrentDictionary _security_key_to_desc= new ConcurrentDictionary(); - readonly ConcurrentDictionary _security_desc_to_key = new ConcurrentDictionary(); - readonly MDRequest _subscription; - readonly Venue _venue; - - readonly static Lazy _md = new Lazy(() => Locator.locate(), true); - readonly static ConcurrentDictionary _venue_cache = new ConcurrentDictionary(); - static readonly List _all_products; - static MarketDataClient() + readonly ConcurrentDictionary _data = new ConcurrentDictionary(); + readonly List _disp = new List(); + public MarketDataClient(AuthToken token = null) { - _all_products = _md.Value.request_products(new VoidMessage()).Products.ToList(); - } + if (token != null) + set_auth_token(token); - public static IEnumerable cached_exchanges => _venue_cache.Keys; - public static bool create_or_get(api.Venue exchange, out MarketDataClient md, AuthToken token = null) - { - if (!_venue_cache.TryGetValue(exchange, out md)) + _disp.Add(_subscription.on_securities.Subscribe( md => { - _venue_cache[exchange] = md = new MarketDataClient(exchange, token); - return true; - } - return false; - } - - public MarketDataClient(bts.api.Venue exchange = Venue.Unset, AuthToken token = null) - { - _venue = exchange; - _subscription = load_request(exchange, token); + foreach (var entry in md) + _data.AddOrUpdate(entry.Key, entry.Value, (_, __) => entry.Value); + })); } public void set_auth_token(AuthToken toke) { - _subscription.Token = toke?.Token ?? string.Empty; + _subscription.set_token(toke); } - MDRequest load_request(bts.api.Venue exchange, AuthToken token) + public IEnumerable securities => _data.Values.Select(x => x.security); + public IObservable> on_securities { - var req = new MDRequest() { Token = token?.Token ?? string.Empty } ; - var prods = _all_products.Where(x=>x.Exchange == exchange || exchange == bts.api.Venue.Unset); - foreach(var prod in prods) - req.Channels.Add(new SecurityChannel() { Exchange = prod.Exchange, Type = prod.Type, Symbol = prod.Symbol, Flags = 0 }); - return req; + get { return _subscription.on_securities.Select(x => x.Values.Select(xx => xx.security)); } } - public Security lookup(security_key key) + public IObservable subscribe_combined(Product product) { - Data value; - if(_data.TryGetValue(key, out value)) - return value.data.Security; + Func where = (x => x.Exchange == product.Exchange && + x.Symbol == product.Symbol && x.security_type() == product.Type); + return subscribe_combined(where); + } + + public IObservable subscribe_book(Func filter) + { + return _subscribe(filter); + } + public IObservable subscribe_last(Func filter) + { + return _subscribe(filter); + } + public IObservable subscribe_misc(Func filter) + { + return _subscribe(filter); + } + public IObservable subscribe_combined(Func filter) + { + return _subscribe(filter); + } + + IObservable _subscribe(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) where T : IMDData, IMDUpdate, new() + { + List> slots = new List>(); + return timer_pump((last_timer_tick, observer) => + { + //if the number of securities has changed, or this is the first call + if (slots.Count == 0 || slots.Count != _data.Count) + slots = _data.Values.Where(x=> filter(x.security)).Select(xx => new Slot(xx)).ToList(); + foreach (var slot in slots) + { + bool did_update = slot.data.update(slot.secmd, ref slot.last_update_time); + if (slot.last_update_time > last_timer_tick) + observer.OnNext(slot.data); + } + }, + update_interval, scheduler); + } + + class Slot where T : IMDData, IMDUpdate, new() + { + public Slot(SecurityMD md) + { + secmd = md; + last_update_time = 0; + data = new T(); + } + public SecurityMD secmd; + public ulong last_update_time; + public T data; + } + + IObservable timer_pump(Action> tick, TimeSpan? interval, IScheduler scheduler = null) + { + if(!interval.HasValue) + interval = TimeSpan.FromMilliseconds(100); + ulong last_update_time = 0; + return Observable.Create(observer => + { + return Observable.Timer(interval.Value, interval.Value, scheduler ?? Scheduler.Default).Subscribe(_ => + { + tick(last_update_time, observer); + last_update_time = (ulong)DateTime.UtcNow.Ticks; + }); + }); + } + + public void Dispose() + { + _disp.ForEach(x => x.Dispose()); + } + + #region security search + + public SecurityImmutable? lookup(SecurityKey key) + { + if (_data.TryGetValue(key, out SecurityMD value)) + return value.security; else return null; } - public bool lookup_security_desc(security_key key, out string security_desc) + public bool lookup_security_desc(SecurityKey key, out string security_desc) { - return _security_key_to_desc.TryGetValue(key, out security_desc); + security_desc = null; + var sec = lookup(key); + if (sec.HasValue) + { + security_desc = sec.Value.glbx_desc(); + return true; + } + return false; } - public bool lookup_security_key_from_desc(string security_desc, out security_key key) + public bool lookup_security_key_from_desc(string security_desc, out SecurityKey key) { - return _security_desc_to_key.TryGetValue(security_desc, out key); + key = 0; + var fnd = find(x => x.glbx_desc() == security_desc).TryFirst(); + if (fnd.HasValue) + { + key = fnd.Value.security.Id; + return true; + } + return false; } - public Security find_security(Func filter) + IEnumerable find(Func filter) { - return _data.Values.Select(x => x.data.Security).Where(xx => filter(xx)).FirstOrDefault(); + Func filt = (SecurityMD secmd) => filter(secmd.security); + return _data.Values.Where(filt); } - public async Task find_security_async(Func filter, TimeSpan? timeout = null) + public SecurityImmutable? find_security(Func filter) { - if(!timeout.HasValue) { - timeout = TimeSpan.FromMilliseconds(int.MaxValue-1); + var fnd = find(filter).TryFirst(); + return fnd?.security; + } + + public async Task find_security_async(Func filter, TimeSpan? timeout = null) + { + if (!timeout.HasValue) + { + timeout = TimeSpan.FromMilliseconds(10000); } CancellationTokenSource src = new CancellationTokenSource(timeout.Value); - Security security = await Task.Run(async () => + SecurityImmutable? security = await Task.Run(async () => { - Security sec = null; + SecurityImmutable? sec = null; do { sec = find_security(filter); @@ -117,195 +188,11 @@ namespace bts.api.md while (sec == null); return sec; }, src.Token); - + return security ?? throw new KeyNotFoundException("Can't find security for filter"); ; } - public IObservable subscribe(Product product, - TimeSpan? update_interval = null, IScheduler scheduler = null) - { - return subscribe(product, _all_flags, update_interval, scheduler); - } - - public IObservable subscribe(Product product, uint flags, - TimeSpan? update_interval = null, IScheduler scheduler = null) - { - check_subscriptions(flags, x => - (x.Exchange == product.Exchange && x.Type == product.Type && x.Symbol == product.Symbol)); - return _subscribe( - x => (x.Exchange == product.Exchange && ((SecurityImmutable)x).security_type() == product.Type && x.Symbol == product.Symbol), - update_interval, - scheduler); - } - - IObservable _subscribe(Func filter, - TimeSpan? update_interval = null, IScheduler scheduler = null) - { - Data[] slots = new Data[0]; long local_security_count = 0; - return timer_pump((last_update, observer) => - { - //if the number of securities has changed, or this is the first call - if (slots.Length == 0 || local_security_count != _data.Count) - slots = _data.Values.Where(xx => filter(xx.data.Security)).ToArray(); - foreach (var slot in slots) - { - Data data; - if (_data.TryGetValue(slot.data.Security.Id, out data)) - { - if (data.last_update_time > last_update) - observer.OnNext(data); - } - } - }, - update_interval, scheduler).Select(x => x.data); - } - - /// - /// Poll for updates for a security on a specified update_interval, on the specified scheduler with default flags - /// - /// - /// - /// - /// - public IObservable subscribe(Security security, - TimeSpan? update_interval = null, IScheduler scheduler = null) - { - return subscribe(security, _all_flags, update_interval, scheduler); - } - - /// - /// Poll for updates for a security on a specified update_interval, on the specified scheduler - /// - /// - /// - /// - /// - /// - public IObservable subscribe(Security security, uint flags, - TimeSpan? update_interval = null, IScheduler scheduler = null) - { - check_subscriptions(flags, x => - (x.Exchange == security.Exchange && x.Type == ((SecurityImmutable)security).security_type() && security.Symbol == security.Symbol)); - return timer_pump( (last_update, observer) => - { - Data data; - if (_data.TryGetValue(security.Id, out data)) - { - if (data.last_update_time > last_update) - observer.OnNext(data); - } - }, - update_interval, scheduler).Select(x => x.data); - } - - IObservable timer_pump(Action> tick, TimeSpan? interval, IScheduler scheduler = null) - { - if(!interval.HasValue) - interval = TimeSpan.FromMilliseconds(25); - long last_update_time = 0; - return Observable.Create(observer => - { - return Observable.Timer(interval.Value, interval.Value, scheduler ?? Scheduler.Default).Subscribe(_ => - { - tick(last_update_time, observer); - last_update_time = DateTime.UtcNow.Ticks; - }); - }); - } - - bool check_subscriptions(uint flags, Func selector) - { - foreach (var sub in _subscription.Channels) - { - if (selector(sub)) - { - sub.Flags |= flags; - return true; - } - } - return false; - } - - /// - /// Start pumping market data for all subscribed channels and securities. Call this without await - /// - /// - /// - public async Task start_pump(TimeSpan? interval = null) - { - var rep = await _md.Value.request_names_async(new VoidMessage()); - int count = 0; - do - { - foreach (var s in rep.value.Securities) - { - foreach (var ss in s.Names) - { - _security_desc_to_key[ss.Value] = ss.Key; - _security_key_to_desc[ss.Key] = ss.Value; - } - } - } - while (!rep.success && count++ < 5); - while (true) - { - var reply = await _md.Value.requestmd_async(_subscription); - if (reply.success) - { - foreach (var channel in reply.value.Channels) - { - long now = DateTime.UtcNow.Ticks; - foreach (var update in channel.Updates) - { - Data data; - if (_data.TryGetValue(update.Security.Id, out data)) - { - //mergefrom concats repeated fields - if (update.Direct != null) - data.data.Direct = null; - //this can tear, but the book won't tear, so maybe it's ok - data.data.MergeFrom(update); - data.last_update_time = now; - } - else - { - _data[update.Security.Id] = new Data() { last_update_time = now, data = update }; - } - } - } - await Task.Delay(interval ?? TimeSpan.FromMilliseconds(100), _cts.Token); - } - } - } - - Task _pump_task; - public void run_pump(TimeSpan? interval = null) - { - if (_pump_task == null) - { - _pump_task = this.start_pump(interval) - .ContinueWith(ex => - { - System.Diagnostics.Debug.Assert(ex == null, ex.ToString()); - } - , TaskContinuationOptions.OnlyOnFaulted); - } - } - - public async void run_pump_async(TimeSpan? interval = null) - { - await this.start_pump(interval); - } - - - readonly CancellationTokenSource _cts = new CancellationTokenSource(); - public void Dispose() - { - _cts.Cancel(); - _cts.Dispose(); - if (_md.IsValueCreated) - _md.Value.Dispose(); - } + #endregion } } diff --git a/src/client/spark_api/md/PriceSize.cs b/src/client/spark_api/md/PriceSize.cs new file mode 100644 index 000000000..451b64d7f --- /dev/null +++ b/src/client/spark_api/md/PriceSize.cs @@ -0,0 +1,20 @@ +using bts.api; +using mbts.co2; + +namespace bts.md +{ + public class PriceSize + { + public uint size { get; } + public uint direct_size { get; } + public uint implied_size { get; } + public double price { get; } + public PriceSize(uint sz, uint direct_sz, uint implied_sz, double prx) + { + size = sz; + direct_size = direct_sz; + implied_size = implied_sz; + price = prx; + } + } +} \ No newline at end of file diff --git a/src/client/spark/view/Spark/Core/SecurityMD.cs b/src/client/spark_api/md/SecurityMD.cs similarity index 94% rename from src/client/spark/view/Spark/Core/SecurityMD.cs rename to src/client/spark_api/md/SecurityMD.cs index d059f7d07..d4ce00c1b 100644 --- a/src/client/spark/view/Spark/Core/SecurityMD.cs +++ b/src/client/spark_api/md/SecurityMD.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace mbts.spark { +namespace mbts { struct SecurityMD : IEquatable { public SecurityImmutable security { get; } public MDConsumerHandle md { get; } diff --git a/src/client/spark_api/utils/APIExtensions.cs b/src/client/spark_api/utils/APIExtensions.cs index d1300fab5..f5382b424 100644 --- a/src/client/spark_api/utils/APIExtensions.cs +++ b/src/client/spark_api/utils/APIExtensions.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Threading.Tasks; namespace mbts { @@ -26,6 +27,8 @@ namespace mbts public static string fmt(this string input, params object[] vals) { return string.Format(input, vals); - } + } + + public static void ignore(this Task t) { } } } \ No newline at end of file diff --git a/src/client/spark_api/md/Authenticator.cs b/src/client/spark_api/utils/Authenticator.cs similarity index 100% rename from src/client/spark_api/md/Authenticator.cs rename to src/client/spark_api/utils/Authenticator.cs diff --git a/src/client/spark_api/md/LazyAsync.cs b/src/client/spark_api/utils/LazyAsync.cs similarity index 90% rename from src/client/spark_api/md/LazyAsync.cs rename to src/client/spark_api/utils/LazyAsync.cs index c83dd4095..6203dacd9 100644 --- a/src/client/spark_api/md/LazyAsync.cs +++ b/src/client/spark_api/utils/LazyAsync.cs @@ -2,7 +2,7 @@ using System; using System.Threading.Tasks; -namespace bts +namespace bts.utils { public class AsyncLazy : Lazy> { diff --git a/src/client/spark_api/md/Locator.cs b/src/client/spark_api/utils/Locator.cs similarity index 100% rename from src/client/spark_api/md/Locator.cs rename to src/client/spark_api/utils/Locator.cs diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index cdfc364b4..712cc5e91 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -7,7 +7,7 @@ using ExcelDna.Integration.Rtd; using ExcelDna.Registration.Utils; using System.Reactive.Linq; using bts.api; -using bts.api.md; +using bts.md; using bts.api.orderman; namespace bts.excel.rtd @@ -21,11 +21,7 @@ namespace bts.excel.rtd try { var toke = await _auth.login(login, password); - foreach (var ven in MarketDataClient.cached_exchanges) - { - MarketDataClient.create_or_get(ven, out MarketDataClient md); - md?.set_auth_token(toke); - } + _md.set_auth_token(toke); handle.SetResult(toke?.Token ?? "Could not log in check user/pass"); } catch(Exception ex) @@ -34,12 +30,10 @@ namespace bts.excel.rtd } } + static MarketDataClient _md = new MarketDataClient(); public static MarketDataClient market_data(api.Venue exchange) { - var newc = MarketDataClient.create_or_get(exchange, out MarketDataClient md); - if(newc) - md.run_pump_async(TimeSpan.FromMilliseconds(333)); - return md; + return _md; } static public object spark_lookup_security_desc(string exchange, long security_key) From e07d602cf5cd76176dfa2ec28408b50a2f6e225f Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 10 Dec 2018 12:13:11 -0500 Subject: [PATCH 37/45] client MD refactor --- src/client/spark_api/Co2/Co2RelayControl.cs | 4 + src/client/spark_api/md/MDCombined.cs | 3 - src/client/spark_api/md/MDSource.cs | 2 +- src/client/spark_api/md/MarketDataClient.cs | 84 ++++++++++++++----- src/client/spark_api/utils/Authenticator.cs | 23 ----- src/client/spark_api/utils/Locator.cs | 7 +- .../rtd/formatting/BookMDFormatter.cs | 29 +++---- .../rtd/formatting/FormatterFactory.cs | 3 +- .../rtd/formatting/MiscMDFormatter.cs | 10 ++- .../rtd/formatting/TopOfBookMDFormatter.cs | 29 ++++--- .../rtd/formatting/TopicMDFormatter.cs | 47 ++++++----- .../rtd/subscriptions/MDSubscribe.cs | 34 ++++---- .../spark_sdk/samples/MarketDataSample.cs | 19 +++-- src/client/spark_sdk/samples/OrderSample.cs | 4 +- src/client/spark_sdk/samples/SDKMain.cs | 22 +++-- src/client/spark_sdk/samples/UISample.cs | 2 +- src/client/spark_sdk/uisamples/SparkSDKUI.cs | 2 +- 17 files changed, 187 insertions(+), 137 deletions(-) delete mode 100644 src/client/spark_api/utils/Authenticator.cs diff --git a/src/client/spark_api/Co2/Co2RelayControl.cs b/src/client/spark_api/Co2/Co2RelayControl.cs index dbc8f9060..84e17ade0 100644 --- a/src/client/spark_api/Co2/Co2RelayControl.cs +++ b/src/client/spark_api/Co2/Co2RelayControl.cs @@ -25,6 +25,10 @@ namespace mbts.co2 Co2NativeMethods.set_relay_token(_relay, token.Token); } + public void set_token(AuthTokenImmutable token) { + Co2NativeMethods.set_relay_token(_relay, token.Token); + } + public async Task preload_securities(MDRequest.Types.Flags flags=MDRequest.Types.Flags.Security) { var securities = UserSymbol.get_all(); foreach (var future in securities.Where(s => s.type == SecurityType.Future)) { diff --git a/src/client/spark_api/md/MDCombined.cs b/src/client/spark_api/md/MDCombined.cs index 741a8c62f..9c92511e2 100644 --- a/src/client/spark_api/md/MDCombined.cs +++ b/src/client/spark_api/md/MDCombined.cs @@ -54,9 +54,6 @@ namespace bts.md bool m = (_misc as IMDUpdate).update(smd, ref ml); last_update_time = new[] { bl, ll, ml }.Min(); - if (smd.md.market_timestamp > last_update_time) - { - } return b || l || m; } } diff --git a/src/client/spark_api/md/MDSource.cs b/src/client/spark_api/md/MDSource.cs index e9ae6f208..2a0ba5698 100644 --- a/src/client/spark_api/md/MDSource.cs +++ b/src/client/spark_api/md/MDSource.cs @@ -38,7 +38,7 @@ namespace bts.md Task.Run(run); } - public void set_token(AuthToken token) + public void set_token(AuthTokenImmutable token) { _relay.set_token(token); } diff --git a/src/client/spark_api/md/MarketDataClient.cs b/src/client/spark_api/md/MarketDataClient.cs index 3f469db8a..424f11fc1 100644 --- a/src/client/spark_api/md/MarketDataClient.cs +++ b/src/client/spark_api/md/MarketDataClient.cs @@ -24,8 +24,10 @@ namespace bts.md readonly ConcurrentDictionary _data = new ConcurrentDictionary(); readonly List _disp = new List(); - public MarketDataClient(AuthToken token = null) + readonly uint _default_pump_ms; + public MarketDataClient(uint default_pump_ms = 100, AuthToken token = null) { + _default_pump_ms = default_pump_ms; if (token != null) set_auth_token(token); @@ -35,40 +37,36 @@ namespace bts.md _data.AddOrUpdate(entry.Key, entry.Value, (_, __) => entry.Value); })); } - - public void set_auth_token(AuthToken toke) - { - _subscription.set_token(toke); - } - public IEnumerable securities => _data.Values.Select(x => x.security); public IObservable> on_securities { get { return _subscription.on_securities.Select(x => x.Values.Select(xx => xx.security)); } } - public IObservable subscribe_combined(Product product) + public void set_auth_token(AuthTokenImmutable? toke) { - Func where = (x => x.Exchange == product.Exchange && - x.Symbol == product.Symbol && x.security_type() == product.Type); - return subscribe_combined(where); + if(toke.HasValue) + _subscription.set_token(toke.Value); } - - public IObservable subscribe_book(Func filter) + public IObservable subscribe_book(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) { - return _subscribe(filter); + return _subscribe(filter, update_interval, scheduler); } - public IObservable subscribe_last(Func filter) + public IObservable subscribe_last(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) { - return _subscribe(filter); + return _subscribe(filter, update_interval, scheduler); } - public IObservable subscribe_misc(Func filter) + public IObservable subscribe_misc(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) { - return _subscribe(filter); + return _subscribe(filter, update_interval, scheduler); } - public IObservable subscribe_combined(Func filter) + public IObservable subscribe_combined(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) { - return _subscribe(filter); + return _subscribe(filter, update_interval, scheduler); } IObservable _subscribe(Func filter, @@ -90,6 +88,50 @@ namespace bts.md update_interval, scheduler); } + public IObservable> subscribe_book(IEnumerable ids, TimeSpan? update_interval = null, + IScheduler scheduler = null) + { + return _subscribe(ids, update_interval, scheduler); + } + public IObservable> subscribe_last(IEnumerable ids, TimeSpan? update_interval = null, + IScheduler scheduler = null) + { + return _subscribe(ids, update_interval, scheduler); + } + public IObservable> subscribe_misc(IEnumerable ids, TimeSpan? update_interval = null, + IScheduler scheduler = null) + { + return _subscribe(ids, update_interval, scheduler); + } + public IObservable> subscribe_combined(IEnumerable ids, TimeSpan? update_interval = null, + IScheduler scheduler = null) + { + return _subscribe(ids, update_interval, scheduler); + } + + IObservable> _subscribe(IEnumerable ids, TimeSpan? update_interval = null, + IScheduler scheduler = null) where T : IMDData, IMDUpdate, new() + { + List> slots = ids.Where(ii => _data.TryGetValue(ii, out SecurityMD _)).Select(x => + { + _data.TryGetValue(x, out SecurityMD smd); + return new Slot(smd); + }).ToList(); + return timer_pump>((last_timer_tick, observer) => + { + List updates = new List(); + foreach (var slot in slots) + { + bool did_update = slot.data.update(slot.secmd, ref slot.last_update_time); + if (slot.last_update_time > last_timer_tick) + updates.Add(slot.data); + } + if(updates.Count > 0) + observer.OnNext(updates); + }, + update_interval, scheduler); + } + class Slot where T : IMDData, IMDUpdate, new() { public Slot(SecurityMD md) @@ -106,7 +148,7 @@ namespace bts.md IObservable timer_pump(Action> tick, TimeSpan? interval, IScheduler scheduler = null) { if(!interval.HasValue) - interval = TimeSpan.FromMilliseconds(100); + interval = TimeSpan.FromMilliseconds(_default_pump_ms); ulong last_update_time = 0; return Observable.Create(observer => { diff --git a/src/client/spark_api/utils/Authenticator.cs b/src/client/spark_api/utils/Authenticator.cs deleted file mode 100644 index 001defa86..000000000 --- a/src/client/spark_api/utils/Authenticator.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Threading.Tasks; -using bts.api; -using bts.api.core; - -namespace bts.api -{ - public class Authenticator - { - readonly static Lazy _auth = new Lazy(() => Locator.locate(), true); - AuthToken _token = null; - public Authenticator() { } - - public AuthToken last_token => _token; - public async Task login(string login, string password) - { - var res = await _auth.Value.authenticate_login_async(new user.AuthenticateLoginRequest { Login = login, Password = password }); - if (res.success) - _token = res.value.Token; - return _token; - } - } -} \ No newline at end of file diff --git a/src/client/spark_api/utils/Locator.cs b/src/client/spark_api/utils/Locator.cs index e86c98a05..a95cb9fb3 100644 --- a/src/client/spark_api/utils/Locator.cs +++ b/src/client/spark_api/utils/Locator.cs @@ -11,6 +11,11 @@ namespace bts.api public static T locate(string qualifier="") where T : class, IApiClient { return _context.Value.locate(qualifier); - } + } + static public async Task login(string username, string password) + { + return await _context.Value.login(username, password); + } + static public AuthTokenImmutable? token => _context.Value.token; } } diff --git a/src/client/spark_excel/rtd/formatting/BookMDFormatter.cs b/src/client/spark_excel/rtd/formatting/BookMDFormatter.cs index b676e4877..ceebff059 100644 --- a/src/client/spark_excel/rtd/formatting/BookMDFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/BookMDFormatter.cs @@ -1,21 +1,22 @@ using System; +using bts.md; namespace bts.excel.rtd { class BookMDFormatter : IExcelFormatter { - readonly co2.ChannelUpdate _update; - public BookMDFormatter(co2.ChannelUpdate upd) + readonly IMDBook _update; + public BookMDFormatter(IMDBook upd) { _update = upd; } - public static double format_md(long mantissa, int exponent) + public object[,] format(bool include_headers = false) { - return mantissa * Math.Pow(10, exponent); + return format(_update, include_headers); } - public object[,] format(bool include_headers = false) + static public object[,] format(IMDBook update, bool include_headers = false) { const int cols = 5; const int rows = 30; @@ -24,21 +25,21 @@ namespace bts.excel.rtd for (int j = 0; j < cols; j++) ret[i, j] = string.Empty; - if (_update.Direct != null) + if (update != null) { int idx = 0; - for (int j = _update.Direct.Asks.Count - 1; j >= 0 && idx < rows; j--) + for (int j = update.asks.Count - 1; j >= 0 && idx < rows; j--) { - var ask = _update.Direct.Asks[j]; - ret[idx, 1] = format_md(ask.Mantissa, ask.Exponent); - ret[idx, 2] = ask.Size; + var ask = update.asks[j]; + ret[idx, 1] = ask.price; + ret[idx, 2] = ask.size; idx++; } - for (int j = 0; j < _update.Direct.Bids.Count && idx < rows; j++) + for (int j = 0; j < update.bids.Count && idx < rows; j++) { - var bid = _update.Direct.Bids[j]; - ret[idx, 1] = format_md(bid.Mantissa, bid.Exponent); - ret[idx, 0] = bid.Size; + var bid = update.bids[j]; + ret[idx, 1] = bid.price; + ret[idx, 0] = bid.size; idx++; } } diff --git a/src/client/spark_excel/rtd/formatting/FormatterFactory.cs b/src/client/spark_excel/rtd/formatting/FormatterFactory.cs index b4fcbd09e..eb718e228 100644 --- a/src/client/spark_excel/rtd/formatting/FormatterFactory.cs +++ b/src/client/spark_excel/rtd/formatting/FormatterFactory.cs @@ -1,4 +1,5 @@ using System; +using bts.md; namespace bts.excel.rtd { @@ -6,7 +7,7 @@ namespace bts.excel.rtd { public static IExcelFormatter make_formatter(object data) { - if(data is co2.ChannelUpdate upd) + if(data is IMDBook upd) return new BookMDFormatter(upd); else { diff --git a/src/client/spark_excel/rtd/formatting/MiscMDFormatter.cs b/src/client/spark_excel/rtd/formatting/MiscMDFormatter.cs index 6f7119b7d..5e79d6ae5 100644 --- a/src/client/spark_excel/rtd/formatting/MiscMDFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/MiscMDFormatter.cs @@ -1,16 +1,22 @@ using System; +using bts.md; namespace bts.excel.rtd { class MiscMDFormatter : IExcelFormatter { - readonly co2.ChannelUpdate _update; - public MiscMDFormatter(co2.ChannelUpdate upd) + readonly IMDMisc _update; + public MiscMDFormatter(IMDMisc upd) { _update = upd; } public object[,] format(bool include_headers = false) + { + return format(_update, include_headers); + } + + static public object[,] format(IMDMisc update, bool include_headers = false) { return new object[0, 0]; } diff --git a/src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs b/src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs index 82cb46be8..9b29ea5e9 100644 --- a/src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs @@ -1,17 +1,22 @@ - using System; +using bts.md; namespace bts.excel.rtd { class TopOfBookMDFormatter : IExcelFormatter { - readonly co2.ChannelUpdate _update; - public TopOfBookMDFormatter(co2.ChannelUpdate upd) + readonly IMDBook _update; + public TopOfBookMDFormatter(IMDBook upd) { _update = upd; } public object[,] format(bool include_headers = false) + { + return format(_update, include_headers); + } + + static public object[,] format(IMDBook update, bool include_headers = false) { const int cols = 4; const int rows = 1; @@ -20,22 +25,22 @@ namespace bts.excel.rtd for (int j = 0; j < cols; j++) ret[i, j] = string.Empty; - if (_update.Direct != null) + if (update != null) { int idx = 0; - for (int j = 0; j < _update.Direct.Asks.Count && idx < rows; j++) + for (int j = 0; j < update.asks.Count && idx < rows; j++) { - var ask = _update.Direct.Asks[j]; - ret[idx, 2] = BookMDFormatter.format_md(ask.Mantissa, ask.Exponent); - ret[idx, 3] = ask.Size; + var ask = update.asks[j]; + ret[idx, 2] = ask.price; + ret[idx, 3] = ask.size; idx++; } idx = 0; - for (int j = 0; j < _update.Direct.Bids.Count && idx < rows; j++) + for (int j = 0; j < update.bids.Count && idx < rows; j++) { - var bid = _update.Direct.Bids[j]; - ret[idx, 1] = BookMDFormatter.format_md(bid.Mantissa, bid.Exponent); - ret[idx, 0] = bid.Size; + var bid = update.bids[j]; + ret[idx, 1] = bid.price; + ret[idx, 0] = bid.size; idx++; } } diff --git a/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs b/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs index 92af1f8a3..3338a70bb 100644 --- a/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs @@ -1,86 +1,95 @@ using System; +using bts.md; namespace bts.excel.rtd { class TopicMDFormatter : IExcelFormatter { - readonly co2.ChannelUpdate _update; + readonly IMDCombined _update; readonly string _topic; - public TopicMDFormatter(co2.ChannelUpdate upd, string topic) + public TopicMDFormatter(IMDCombined upd, string topic) { _update = upd; _topic = topic; } public object[,] format(bool include_headers = false) + { + return format(_update, _topic, include_headers); + } + + static public object[,] format(IMDCombined update, string topic, bool include_headers = false) { var retval = new object[1, 1]; - switch (_topic.ToLower()) + if(update == null || string.IsNullOrEmpty(topic)) + return retval; + + switch (topic.ToLower()) { case "bid": case "bidprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.Direct?.Bids?[0]?.Mantissa ?? 0, _update?.Direct?.Bids?[0]?.Exponent ?? 0); + retval[0, 0] = update.bids?[0]?.price; break; case "ask": case "askprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.Direct?.Asks?[0]?.Mantissa ?? 0, _update?.Direct?.Asks?[0]?.Exponent ?? 0); + retval[0, 0] = update.asks?[0]?.price; break; case "bidsize": case "bidqty": - retval[0, 0] = _update?.Direct?.Bids?[0]?.Size; + retval[0, 0] = update.bids?[0]?.size; break; case "asksize": case "askqty": - retval[0, 0] = _update?.Direct?.Asks?[0]?.Size; + retval[0, 0] = update.asks?[0]?.size; break; case "impliedbid": case "impliedbidprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.Implied?.Bids?[0]?.Mantissa ?? 0, _update?.Implied?.Bids?[0]?.Exponent ?? 0); + retval[0, 0] = update.bids?[0]?.price; //TODO is this the first price with impsz > 0? break; case "impliedask": case "impliedaskprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.Implied?.Asks?[0]?.Mantissa ?? 0, _update?.Implied?.Asks?[0]?.Exponent ?? 0); + retval[0, 0] = update.asks?[0]?.price; break; case "impliedbidsize": case "impliedbidqty": - retval[0, 0] = _update?.Implied?.Bids?[0]?.Size; + retval[0, 0] = update.bids?[0]?.implied_size; break; case "impliedasksize": case "impliedaskqty": - retval[0, 0] = _update?.Implied?.Asks?[0]?.Size; + retval[0, 0] = update.asks?[0]?.implied_size; break; case "settlement": case "settlementprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.Misc?.Settlement?.Mantissa ?? 0, _update?.Misc?.Settlement?.Exponent ?? 0); + retval[0, 0] = update.settlement_price; break; case "previoussettlement": case "previoussettlementprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.Misc?.PreviousSettlementPrice?.Mantissa ?? 0, _update?.Misc?.PreviousSettlementPrice?.Exponent ?? 0); + retval[0, 0] = update.previous_settlement_price; break; case "open": case "openprice": - retval[0, 0] = _update?.Misc?.OpenPrice; + retval[0, 0] = update.open_price; break; case "close": case "closeprice": - retval[0, 0] = _update?.Misc?.ClosePrice; + retval[0, 0] = update.close_price; break; case "high": case "highprice": - retval[0, 0] = _update?.Misc?.SessionHigh; + retval[0, 0] = update.session_high; break; case "low": case "lowprice": - retval[0, 0] = _update?.Misc?.SessionLow; + retval[0, 0] = update.session_low; break; case "last": case "lastprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.LastTrade?.Mantissa ?? 0, _update?.LastTrade?.Exponent ?? 0); + retval[0, 0] = update?.last.price; break; case "lastsize": case "lastqty": - retval[0, 0] = _update?.LastTrade?.Size; + retval[0, 0] = update?.last.size; break; } return retval; diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index 712cc5e91..6da9579b1 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -14,15 +14,19 @@ namespace bts.excel.rtd { public class MDSubscribe { - static Authenticator _auth = new Authenticator(); [ExcelFunction(Category = "BTS", Description = "Log in to BTS Spark")] async public static void spark_login(string login, string password, ExcelAsyncHandle handle) { try { - var toke = await _auth.login(login, password); - _md.set_auth_token(toke); - handle.SetResult(toke?.Token ?? "Could not log in check user/pass"); + var res = await Locator.login(login, password); + if (res && Locator.token.HasValue) + { + _md.set_auth_token(Locator.token); + handle.SetResult("Login Successful"); + } + else + handle.SetResult("Login Error: Could not log in check user/pass"); } catch(Exception ex) { @@ -62,10 +66,10 @@ namespace bts.excel.rtd if (string.IsNullOrEmpty(contract)) return Observable.Return("Can't Parse Contract: " + contract ?? string.Empty); - Product prod = new Product() { Exchange = ven, Type = sectype, Symbol = symbol }; - Func filter = (x => x.Glbx.SecurityDesc == contract); //TODO GLBX + Func where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == sectype && + x.HasGlbx && x.Glbx.SecurityDesc == contract); - var stream = market_data(ven).subscribe(prod).Where(x => filter(x.Security)); + var stream = market_data(ven).subscribe_combined(where); return stream; } @@ -81,8 +85,8 @@ namespace bts.excel.rtd return ObservableRtdUtil.Observe(nameof(spark_md_book), param, () => md_observable(contract, symbol, security_type, exchange).Select(x => { - if (x is co2.ChannelUpdate upd) - return new BookMDFormatter(upd).format(); + if (x is IMDBook upd) + return BookMDFormatter.format(upd); return x; })); // security_type = string.IsNullOrEmpty(security_type) ? SecurityType.Future.ToString() : security_type; @@ -107,8 +111,8 @@ namespace bts.excel.rtd return ObservableRtdUtil.Observe(nameof(spark_md_top_of_book), param, () => md_observable(contract, symbol, security_type, exchange).Select(x => { - if (x is co2.ChannelUpdate upd) - return new TopOfBookMDFormatter(upd).format(); + if (x is IMDBook upd) + return TopOfBookMDFormatter.format(upd); return x; })); } @@ -124,8 +128,8 @@ namespace bts.excel.rtd return ObservableRtdUtil.Observe(nameof(spark_md_misc), param, () => md_observable(contract, symbol, security_type, exchange).Select(x => { - if (x is co2.ChannelUpdate upd) - return new MiscMDFormatter(upd).format(); + if (x is IMDMisc upd) + return MiscMDFormatter.format(upd); return x; })); @@ -143,8 +147,8 @@ namespace bts.excel.rtd return ObservableRtdUtil.Observe(nameof(spark_md), param, () => md_observable(contract, symbol, security_type, exchange).Select(x => { - if (x is co2.ChannelUpdate upd) - return new TopicMDFormatter(upd, topic).format(); + if (x is IMDCombined upd) + return TopicMDFormatter.format(upd, topic); return x; })); } diff --git a/src/client/spark_sdk/samples/MarketDataSample.cs b/src/client/spark_sdk/samples/MarketDataSample.cs index 6d4dd0146..11995514f 100644 --- a/src/client/spark_sdk/samples/MarketDataSample.cs +++ b/src/client/spark_sdk/samples/MarketDataSample.cs @@ -9,8 +9,7 @@ using System.Reactive.Concurrency; using bts.api; using bts.api.core; -using bts.co2; -using bts.api.md; +using bts.md; namespace bts.sdk { @@ -24,7 +23,7 @@ namespace bts.sdk _md = client; } - void print_update(ChannelUpdate update) + void print_update(IMDData update) { Console.WriteLine(update.ToString()); Console.WriteLine(); @@ -46,12 +45,14 @@ namespace bts.sdk return st; } - public void print_channel(string exch, string sectype, string symbol) + public void print_product(string exch, string sectype, string symbol) { Venue ven = parse_venue(exch); SecurityType st = parse_security_type(sectype); Product prod = new Product() { Exchange = ven, Type = st, Symbol = symbol }; - _disps.Add(_md.subscribe(prod).Subscribe(x => + Func where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == st); + + _disps.Add(_md.subscribe_combined(where).Subscribe(x => { print_update(x); })); @@ -61,11 +62,11 @@ namespace bts.sdk { Venue ven = parse_venue(exch); SecurityType st = parse_security_type(sectype); - Product prod = new Product() { Exchange = ven, Type = st, Symbol = symbol }; - Func filter = (x => x.Glbx.SecurityDesc == security_desc); - //if you have a security_id, we could make a more specifics subscription, but this is a command line driver.... - _disps.Add(_md.subscribe(prod).Where(x => filter(x.Security)).Subscribe(x => + Func where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == st && + x.HasGlbx && x.Glbx.SecurityDesc == security_desc); + + _disps.Add(_md.subscribe_combined(where).Subscribe(x => { print_update(x); })); diff --git a/src/client/spark_sdk/samples/OrderSample.cs b/src/client/spark_sdk/samples/OrderSample.cs index 186041c1a..0c6735ff2 100644 --- a/src/client/spark_sdk/samples/OrderSample.cs +++ b/src/client/spark_sdk/samples/OrderSample.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.Reactive.Linq; using bts.api; -using bts.api.md; +using bts.md; using bts.api.core; using bts.api.orderman; using bts.api.user; @@ -58,7 +58,7 @@ namespace bts.sdk else cr.NewOrder.CustomDef = new CustomOrderDefinition() { Market = new MarketOrderDefinition() }; var sec = await _md.find_security_async(x => x.Glbx.SecurityDesc == security_desc.ToUpper()); - cr.NewOrder.SecurityKey = sec.Id; + cr.NewOrder.SecurityKey = sec.Value.Id; Result resp = await _orders.Value.create_order_async(cr); print_update(resp); if(resp.value != null) diff --git a/src/client/spark_sdk/samples/SDKMain.cs b/src/client/spark_sdk/samples/SDKMain.cs index 3e7670e48..0ec5087b5 100644 --- a/src/client/spark_sdk/samples/SDKMain.cs +++ b/src/client/spark_sdk/samples/SDKMain.cs @@ -6,7 +6,7 @@ using System.Reactive.Disposables; using bts.api; using bts.api.core; -using bts.api.md; +using bts.md; namespace bts.sdk { @@ -14,10 +14,8 @@ namespace bts.sdk public class SDKMain { private static void user_test() - { - var ctx = new ServiceContext(); - - var s = ctx.locate(); + { + var s = Locator.locate(); var r = new api.user.GetUsersRequest(); var resp = s.get_users(r); Console.WriteLine("{0}", resp); @@ -31,7 +29,12 @@ namespace bts.sdk } else { - MarketDataClient client = new MarketDataClient(); + uint ms = 100; + string p = args.FirstOrDefault(x => x.Contains("--pump=")); + if (p != null) + ms = uint.Parse(p.Replace("--pump=", string.Empty)); + + MarketDataClient client = new MarketDataClient(ms); CompositeDisposable disp = new CompositeDisposable(client); if (args.FirstOrDefault() == "ui") { @@ -56,7 +59,7 @@ namespace bts.sdk } else if (args.Length >= 4) { - s.print_channel(args[1], args[2], args[3]); + s.print_product(args[1], args[2], args[3]); } else md_help(); @@ -73,11 +76,6 @@ namespace bts.sdk else help(); - int ms = 100; - string p = args.FirstOrDefault(x => x.Contains("--pump=")); - if (p != null) - ms = int.Parse(p.Replace("--pump=", string.Empty)); - client.run_pump(TimeSpan.FromMilliseconds(ms)); wait_for_stop(disp); } } diff --git a/src/client/spark_sdk/samples/UISample.cs b/src/client/spark_sdk/samples/UISample.cs index 6b8660454..97ae9fded 100644 --- a/src/client/spark_sdk/samples/UISample.cs +++ b/src/client/spark_sdk/samples/UISample.cs @@ -2,7 +2,7 @@ using System; using System.Linq; using bts.api; -using bts.api.md; +using bts.md; namespace bts.sdk.ui { diff --git a/src/client/spark_sdk/uisamples/SparkSDKUI.cs b/src/client/spark_sdk/uisamples/SparkSDKUI.cs index 9b56d2604..fadb12e0a 100644 --- a/src/client/spark_sdk/uisamples/SparkSDKUI.cs +++ b/src/client/spark_sdk/uisamples/SparkSDKUI.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using bts.api; -using bts.api.md; +using bts.md; namespace bts.sdk.ui { From 70db5ceb10a95581885d153efe59a31049088dca Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 10 Dec 2018 12:19:16 -0500 Subject: [PATCH 38/45] added spark_md_last to excel --- .../rtd/formatting/LastMDFormatter.cs | 35 +++++++++++++++++++ .../rtd/subscriptions/MDSubscribe.cs | 22 ++++++++++-- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 src/client/spark_excel/rtd/formatting/LastMDFormatter.cs diff --git a/src/client/spark_excel/rtd/formatting/LastMDFormatter.cs b/src/client/spark_excel/rtd/formatting/LastMDFormatter.cs new file mode 100644 index 000000000..5c1bfca4c --- /dev/null +++ b/src/client/spark_excel/rtd/formatting/LastMDFormatter.cs @@ -0,0 +1,35 @@ +using System; +using bts.md; + +namespace bts.excel.rtd +{ + class LastMDFormatter : IExcelFormatter + { + readonly IMDLast _update; + public LastMDFormatter(IMDLast upd) + { + _update = upd; + } + + public object[,] format(bool include_headers = false) + { + return format(_update, include_headers); + } + + static public object[,] format(IMDLast update, bool include_headers = false) + { + const int cols = 3; + const int rows = 1; + var ret = new object[rows, cols]; + + if (update != null) + { + ret[0, 0] = update.last?.price; + ret[0, 1] = update.last?.size; + ret[0, 1] = update.last_time; + } + return ret; + } + } + +} \ No newline at end of file diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index 6da9579b1..bf73fae89 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -115,7 +115,25 @@ namespace bts.excel.rtd return TopOfBookMDFormatter.format(upd); return x; })); - } + } + + [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark last trade market data")] + public static object spark_md_last( + [ExcelArgument("Required. The specific contract, GCZ8 or ZNU8-ZNZ8, etc")] string contract, + [ExcelArgument("Required. The symbol, GC or ZN, etc")] string symbol, + [ExcelArgument("Optional. The type, Future or Spread, default = Future")] string security_type = null, + [ExcelArgument("Optional. The exchange, default = GLBX")] string exchange = null) + { + var param = new object[] { contract, symbol, security_type, exchange }; + return ObservableRtdUtil.Observe(nameof(spark_md_last), param, + () => md_observable(contract, symbol, security_type, exchange).Select(x => + { + if (x is IMDLast upd) + return LastMDFormatter.format(upd); + return x; + })); + + } [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark miscellaneous market data")] public static object spark_md_misc( @@ -135,7 +153,7 @@ namespace bts.excel.rtd } - [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark top of book market data")] + [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark topic based market data")] public static object spark_md( [ExcelArgument("Required. The 'Topic' string, 'bid', 'ask', etc")] string topic, [ExcelArgument("Required. The specific contract, GCZ8 or ZNU8-ZNZ8, etc")] string contract, From dbea159fa92da59b69affdc6bb07879d8806c323 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 10 Dec 2018 16:22:50 -0500 Subject: [PATCH 39/45] spark.exe, spark_sdk.exe, excel all get market data and can send orders --- .vscode/launch.json | 6 +- src/client/spark/Daemons/MDDaemon.cs | 2 +- src/client/spark_api/md/MDBook.cs | 13 ++- src/client/spark_api/md/MDCombined.cs | 3 +- src/client/spark_api/md/MDLast.cs | 1 + src/client/spark_api/md/MDMisc.cs | 2 +- src/client/spark_api/md/MDSource.cs | 7 +- src/client/spark_api/md/MarketDataClient.cs | 48 +++++----- src/client/spark_api/md/PriceSize.cs | 6 +- .../rtd/formatting/TopicMDFormatter.cs | 4 +- .../rtd/subscriptions/MDSubscribe.cs | 38 ++++---- .../spark_excel/spark_excel_example_2018.xlsm | Bin 333992 -> 335420 bytes .../spark_sdk/samples/MarketDataSample.cs | 15 ++-- src/client/spark_sdk/samples/OrderSample.cs | 4 +- src/client/spark_sdk/samples/SDKMain.cs | 83 ++++++++---------- src/client/spark_sdk/spark_sdk.csproj | 1 + 16 files changed, 131 insertions(+), 102 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index fd21a1f69..d3f66bbaf 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -36,8 +36,8 @@ "name": "SDK Launch", "type": "clr", "request": "launch", - "program": "${workspaceRoot}/build/Debug/bin/net471/spark_sdk.exe", - "args": ["md","GLBX","Future","ZN", "ZNU8"], + "program": "${workspaceRoot}/build/Debug/bin/net471/spark_sdk.exe", + "args": ["md","GLBX","Future","CL", "CLZ9", "--user=bts", "--pass="], "cwd": "${workspaceRoot}", "stopAtEntry": false, "externalConsole": true, @@ -48,7 +48,7 @@ "type": "clr", "request": "launch", "program": "C:/Program Files/Microsoft Office/Office14/EXCEL.EXE", - "args": ["${workspaceRoot}/build/Debug/bin/net471/spark_excel-addin64.xll"], + "args": ["${workspaceRoot}/build/Debug/bin/net471/spark_excel-addin64-packed.xll"], "cwd": "${workspaceRoot}", "stopAtEntry": false, "externalConsole": true, diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index dcc61c32d..816faac4a 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -26,7 +26,7 @@ namespace bts { static uint get_naggle() => mbts.config.Configuration.get().naggle_ms; [ImportingConstructor] - public MDDaemon(Lazy bus, Lazy token, Lazy ss) : base(get_naggle()) { + public MDDaemon(Lazy bus, Lazy token, Lazy ss) : base(get_naggle(), true) { _bus = bus; _token = token; _ss = ss; diff --git a/src/client/spark_api/md/MDBook.cs b/src/client/spark_api/md/MDBook.cs index 4f9498810..7e71e7167 100644 --- a/src/client/spark_api/md/MDBook.cs +++ b/src/client/spark_api/md/MDBook.cs @@ -36,15 +36,24 @@ namespace bts.md bool IMDUpdate.update(SecurityMD smd, ref ulong last_update_time) { + this.security = smd.security; NativePriceSize[] bids = null, asks = null; if (smd.md.get_depth(ref last_update_time, ref bids, ref asks, NativePriceHelpers.COCONUT_MAX_DEPTH)) - { - this.security = smd.security; + { this.bids = bids.Select(x => new PriceSize(x.size, x.direct_size, x.implied_size, x.price)).ToList(); this.asks = asks.Select(x => new PriceSize(x.size, x.direct_size, x.implied_size, x.price)).ToList(); return true; } return false; } + + public override string ToString() + { + return security.ToString() + Environment.NewLine + + "Bid BidSz BidISz" + Environment.NewLine + + string.Join("\n", bids.Select(x => x.ToString())) + Environment.NewLine + + "Ask AskSz AskISz" + Environment.NewLine + + string.Join("\n", asks.Select(x => x.ToString())); + } } } \ No newline at end of file diff --git a/src/client/spark_api/md/MDCombined.cs b/src/client/spark_api/md/MDCombined.cs index 9c92511e2..57cc5ac83 100644 --- a/src/client/spark_api/md/MDCombined.cs +++ b/src/client/spark_api/md/MDCombined.cs @@ -44,6 +44,7 @@ namespace bts.md bool IMDUpdate.update(SecurityMD smd, ref ulong last_update_time) { + this.security = smd.security; var bl = last_update_time; bool b = (_book as IMDUpdate).update(smd, ref bl); @@ -53,7 +54,7 @@ namespace bts.md var ml = last_update_time; bool m = (_misc as IMDUpdate).update(smd, ref ml); - last_update_time = new[] { bl, ll, ml }.Min(); + last_update_time = new[] { bl, ll, ml }.Max(); return b || l || m; } } diff --git a/src/client/spark_api/md/MDLast.cs b/src/client/spark_api/md/MDLast.cs index bb785afb5..207b205b8 100644 --- a/src/client/spark_api/md/MDLast.cs +++ b/src/client/spark_api/md/MDLast.cs @@ -25,6 +25,7 @@ namespace bts.md bool IMDUpdate.update(SecurityMD smd, ref ulong last_update_time) { + this.security = smd.security; NativePriceSize x; DateTime ts; ulong vol; if (smd.md.get_last_trade(ref last_update_time, out x, out ts, out vol)) { diff --git a/src/client/spark_api/md/MDMisc.cs b/src/client/spark_api/md/MDMisc.cs index 41e728f01..9f5530db2 100644 --- a/src/client/spark_api/md/MDMisc.cs +++ b/src/client/spark_api/md/MDMisc.cs @@ -44,9 +44,9 @@ namespace bts.md bool IMDUpdate.update(SecurityMD smd, ref ulong last_update_time) { + this.security = smd.security; if (smd.md.misc_timestamp > last_update_time) { - this.security = smd.security; total_volume = smd.md.total_volume; settlement_price = smd.md.settlement_price; settlement_date = smd.md.settlement_date; diff --git a/src/client/spark_api/md/MDSource.cs b/src/client/spark_api/md/MDSource.cs index 2a0ba5698..c329f6216 100644 --- a/src/client/spark_api/md/MDSource.cs +++ b/src/client/spark_api/md/MDSource.cs @@ -23,14 +23,17 @@ namespace bts.md protected readonly ConcurrentDictionary _exchange_sec_map = new ConcurrentDictionary(); protected List _dispose = new List(); - public MDSource(uint naggle_ms) + public MDSource(uint naggle_ms, bool defer_init = false) { _relay = new Co2RelayControl(_consumer, naggle_ms); _relay.preload_securities((co2.MDRequest.Types.Flags)0xff).ignore(); _dispose.Add(_consumer.on_security.Subscribe(this)); + if(!defer_init) + initialize(); } - readonly Subject> _on_securities = new Subject>(); + readonly BehaviorSubject> _on_securities = + new BehaviorSubject>( new ConcurrentDictionary() ); public IObservable> on_securities => _on_securities; virtual public void initialize() diff --git a/src/client/spark_api/md/MarketDataClient.cs b/src/client/spark_api/md/MarketDataClient.cs index 424f11fc1..34909805d 100644 --- a/src/client/spark_api/md/MarketDataClient.cs +++ b/src/client/spark_api/md/MarketDataClient.cs @@ -19,13 +19,13 @@ namespace bts.md public class MarketDataClient : IDisposable { - static uint naggle_ms = 100; + static uint naggle_ms = 100; readonly static bts.md.MDSource _subscription = new MDSource(naggle_ms); - + readonly ConcurrentDictionary _data = new ConcurrentDictionary(); readonly List _disp = new List(); readonly uint _default_pump_ms; - public MarketDataClient(uint default_pump_ms = 100, AuthToken token = null) + public MarketDataClient(uint default_pump_ms = 250, AuthTokenImmutable? token = null) { _default_pump_ms = default_pump_ms; if (token != null) @@ -48,42 +48,49 @@ namespace bts.md if(toke.HasValue) _subscription.set_token(toke.Value); } - public IObservable subscribe_book(Func filter, - TimeSpan? update_interval = null, IScheduler scheduler = null) + public IObservable< IEnumerable > subscribe_book(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) { return _subscribe(filter, update_interval, scheduler); } - public IObservable subscribe_last(Func filter, - TimeSpan? update_interval = null, IScheduler scheduler = null) + public IObservable< IEnumerable > subscribe_last(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) { return _subscribe(filter, update_interval, scheduler); } - public IObservable subscribe_misc(Func filter, - TimeSpan? update_interval = null, IScheduler scheduler = null) + public IObservable< IEnumerable > subscribe_misc(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) { return _subscribe(filter, update_interval, scheduler); } - public IObservable subscribe_combined(Func filter, - TimeSpan? update_interval = null, IScheduler scheduler = null) + public IObservable< IEnumerable > subscribe_combined(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) { return _subscribe(filter, update_interval, scheduler); } - IObservable _subscribe(Func filter, - TimeSpan? update_interval = null, IScheduler scheduler = null) where T : IMDData, IMDUpdate, new() + IObservable> _subscribe(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) where T : IMDData, IMDUpdate, new() { - List> slots = new List>(); - return timer_pump((last_timer_tick, observer) => + List> slots = new List>(); int data_size = 0; + return timer_pump>((last_timer_tick, observer) => { //if the number of securities has changed, or this is the first call - if (slots.Count == 0 || slots.Count != _data.Count) - slots = _data.Values.Where(x=> filter(x.security)).Select(xx => new Slot(xx)).ToList(); + if (data_size != _data.Count) + { + slots = _data.Values.Where(x => filter(x.security)).Select(xx => new Slot(xx)).ToList(); + data_size = _data.Count; + } + List updates = new List(); foreach (var slot in slots) { bool did_update = slot.data.update(slot.secmd, ref slot.last_update_time); - if (slot.last_update_time > last_timer_tick) - observer.OnNext(slot.data); + //if (slot.last_update_time > last_timer_tick) + if(did_update) + updates.Add(slot.data); } + if(updates.Count > 0) + observer.OnNext(updates); }, update_interval, scheduler); } @@ -123,7 +130,8 @@ namespace bts.md foreach (var slot in slots) { bool did_update = slot.data.update(slot.secmd, ref slot.last_update_time); - if (slot.last_update_time > last_timer_tick) + //if (slot.last_update_time > last_timer_tick) + if(did_update) updates.Add(slot.data); } if(updates.Count > 0) diff --git a/src/client/spark_api/md/PriceSize.cs b/src/client/spark_api/md/PriceSize.cs index 451b64d7f..a08e687bc 100644 --- a/src/client/spark_api/md/PriceSize.cs +++ b/src/client/spark_api/md/PriceSize.cs @@ -15,6 +15,10 @@ namespace bts.md direct_size = direct_sz; implied_size = implied_sz; price = prx; - } + } + public override string ToString() + { + return $"{price} {size} {implied_size} "; + } } } \ No newline at end of file diff --git a/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs b/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs index 3338a70bb..e898bdc83 100644 --- a/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs @@ -85,11 +85,11 @@ namespace bts.excel.rtd break; case "last": case "lastprice": - retval[0, 0] = update?.last.price; + retval[0, 0] = update?.last?.price; break; case "lastsize": case "lastqty": - retval[0, 0] = update?.last.size; + retval[0, 0] = update?.last?.size; break; } return retval; diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index ff4bd622f..a96272d2a 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -49,7 +49,7 @@ namespace bts.excel.rtd return desc ?? string.Empty; } - static IObservable md_observable(string contract, string symbol, string security_type, string exchange) + static IObservable> md_observable(string contract, string symbol, string security_type, string exchange) { security_type = string.IsNullOrEmpty(security_type) ? SecurityType.Future.ToString() : security_type; exchange = string.IsNullOrEmpty(exchange) ? Security.ExchangeDataOneofCase.Glbx.ToString() : exchange; @@ -58,16 +58,16 @@ namespace bts.excel.rtd Venue ven; SecurityType sectype; if (!Utilities.parse_venue(exchange, out ven)) - return Observable.Return("Can't Parse Exchange: " + exchange ?? string.Empty); + return Observable.Return(new [] {"Can't Parse Exchange: " + exchange ?? string.Empty}); if (!Utilities.parse_security_type(security_type, out sectype)) - return Observable.Return("Can't Parse Security Type: " + security_type ?? string.Empty); + return Observable.Return(new [] {"Can't Parse Security Type: " + security_type ?? string.Empty}); if (string.IsNullOrEmpty(symbol)) - return Observable.Return("Can't Parse Symbol: " + symbol ?? string.Empty); + return Observable.Return(new []{"Can't Parse Symbol: " + symbol ?? string.Empty}); if (string.IsNullOrEmpty(contract)) - return Observable.Return("Can't Parse Contract: " + contract ?? string.Empty); + return Observable.Return(new []{"Can't Parse Contract: " + contract ?? string.Empty}); Func where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == sectype && - x.HasGlbx && x.Glbx.SecurityDesc == contract); + x.Glbx.SecurityDesc == contract); var stream = market_data(ven).subscribe_combined(where); return stream; @@ -83,9 +83,10 @@ namespace bts.excel.rtd var param = new object[] { contract, symbol, security_type, exchange }; return ObservableRtdUtil.Observe(nameof(spark_md_book), param, - () => md_observable(contract, symbol, security_type, exchange).Select(x => + () => md_observable(contract, symbol, security_type, exchange).Select(data => { - if (x is IMDBook upd) + var x = data.FirstOrDefault(); + if (x != null && x is IMDBook upd) return BookMDFormatter.format(upd); return x; })); @@ -109,9 +110,10 @@ namespace bts.excel.rtd { var param = new object[] { contract, symbol, security_type, exchange }; return ObservableRtdUtil.Observe(nameof(spark_md_top_of_book), param, - () => md_observable(contract, symbol, security_type, exchange).Select(x => + () => md_observable(contract, symbol, security_type, exchange).Select(data => { - if (x is IMDBook upd) + var x = data.FirstOrDefault(); + if (x != null && x is IMDBook upd) return TopOfBookMDFormatter.format(upd); return x; })); @@ -126,9 +128,10 @@ namespace bts.excel.rtd { var param = new object[] { contract, symbol, security_type, exchange }; return ObservableRtdUtil.Observe(nameof(spark_md_last), param, - () => md_observable(contract, symbol, security_type, exchange).Select(x => + () => md_observable(contract, symbol, security_type, exchange).Select(data => { - if (x is IMDLast upd) + var x = data.FirstOrDefault(); + if (x != null && x is IMDLast upd) return LastMDFormatter.format(upd); return x; })); @@ -144,9 +147,10 @@ namespace bts.excel.rtd { var param = new object[] { contract, symbol, security_type, exchange }; return ObservableRtdUtil.Observe(nameof(spark_md_misc), param, - () => md_observable(contract, symbol, security_type, exchange).Select(x => + () => md_observable(contract, symbol, security_type, exchange).Select(data => { - if (x is IMDMisc upd) + var x = data.FirstOrDefault(); + if (x != null && x is IMDMisc upd) return MiscMDFormatter.format(upd); return x; })); @@ -163,12 +167,14 @@ namespace bts.excel.rtd { var param = new object[] { topic, contract, symbol, security_type, exchange }; return ObservableRtdUtil.Observe(nameof(spark_md), param, - () => md_observable(contract, symbol, security_type, exchange).Select(x => + () => md_observable(contract, symbol, security_type, exchange).Select(data => { - if (x is IMDCombined upd) + var x = data.FirstOrDefault(); + if (x != null && x is IMDCombined upd) return TopicMDFormatter.format(upd, topic); return x; })); } + } } \ No newline at end of file diff --git a/src/client/spark_excel/spark_excel_example_2018.xlsm b/src/client/spark_excel/spark_excel_example_2018.xlsm index 3227be4d8d3bfa7eb8f1aa70c0866d114d038e54..99ff218d6ee868f4f10bcbcad21841630b613266 100644 GIT binary patch delta 167819 zcmc$^WmF#9mNksK1b6q40158yF2UX1-3liO1h?Q2+})kv?!i5{yFOpex%WtJ-*dYA z?H>L8sZoqw&)jpbxz=2pT~$zt+0ufEp&$(jg$V`&1_uTPMh13*Jd9MHmBq-y$!%VGS?dL6M1qdfS7*&0T)*l7Q6L(H)vMa~O|`4wgAR2q*H#5)rbRPl&G)WF*lsg?`*8YdI>AV# zFr<=JZBXD=pU$^-!ATj-4GNzn?e~$4I2)S>!MC@rWPG-u*vR*=Zz`^DF6DD`@ot%f zv@PJw(rv`Ka)ci1fxH%-{OXQ!r5tP_4^ zYnn@H?g1GdNA)d`_n%}xsdQs9IZF&P>>n=LXMBw+#se;|p+$1KC1Jdb5_Qe1gNgQ= zaP6bMK@TesM=;(|`%*d|N5Of24Y(RHEq*`n-MuqS9fodQGRmt)13HD41^`dYN`}OQ zu6@TuaaAo3MGOIi$BfB!Ga>b!NVEuVJ?z^`z-8q&%SbensStNi9+T95`a&sia~%X3 zAZ4^TalJFfueEag-9m+g(2!BCyNOn?lG)H}&eFX!LlrgCklf4yvkyOl&_Hc@#ahoj zCoaWs?xCP6EDXOX?vcWfg-9L~@$AqsH=0Rt(7=2m7O%k0WGQZ&H>90d;Wf`przIS$ z7iNL7(qlGVo; zFf#dmJ9_Kc_V^Of4pnMLNrduL{3~RqNop7ixm`+r3ipOZx5zL89Vt2NxN&1cTXMTV zC(?6Hb;~5NDH<2~=QlHuxyfb?o>%?a9^qO`zQqmG^j z9ORZnMo%MIU4w~ELzDxYC6pjq!K4Uul@wur*i$x{Tzzs!&4+#obGN&JsBQk-g*~JW z7AUryJqNRmfJP$pUj4{Sa88E3GlB-(00&f&&rVdeGT~z;lJc#)`<=c+>G9sMD@s`( z?iK;<%d6~i$G#*TVrY7A3V-C8R$OkE-RSjl{Zv_a5FWMjOAI8*>O_7%jL7e&xq6l)kLF<9Q3zFy{Gr;_ymrMGNC~gJ9ebj1qsIc z0gWW+VrDXekCvExrZ!V{p@6~eyjR^V3|L}zG9(7Tln6$301gHQK!Smx{%|dKYeqLa zM=L`+J1Yiv8|&~`S-USxFG5b}kAMnqc`~SPln90A^P&V)?*>DRwhb{#0zO&iOV%!c z+8|j<xRy1;|ZhuhG}#P(IjUt%RH< z8#B)d4FEV{&vr2~s2x|D?P<(Rmdksl8it$LGb021yN=MVRC=5AWOxAtiWt1-Ui5Qd zQe=Fg(zD(vfVqYqz4XItcQBJnQ=6eHKf27?_Q8 z?=t-kJ2YH=kpU#Pon3NrGbIrCMHw?+L;*W}A8gDz{d;^(&nTn?sx~bScTU-t7w6xY zJgegNL?2x~q!T?D7)k|6-s2&)Ee3;Yovu-tN-_v4Vc&6{j-jl-p`X}TW45o%;A54Bn#!+jNR1Tg%^`wFD+72Uxj~23kn6K_9B5#5_SF)J<2RydN0=9oNIk|6 zmHHZBoPLWM&VC)>kzmkmpE$mbK)nGjS9?yh8b(m;q`<>DzXcVmX;^5}H#-8q2w(Vf7-|43j z`7GTUzhy&4BPoc-=yZUMiU6}Y9*0BngTGDdJU>{XP=3HdN5ka0iANE`EF}hN;)CnX zo9n8kRaF-THMKlc)U54m&v7`co|R-CB@^i*C#+39KX%);Z=b@)8z^rJs%4c{ymrQN zQ^{iC$y(+Sto{uDJX=Vh#{S|%)7-nIgu%cvp)~42AvH4H+{sg@t_3n0X;y+#rZN?c zuy302jrn-U&2NO56_s!od4iXL>Tae7i+v!e3YH->mi4mZZpsT&W6kCM5z{WC;^1kr z`Cwwz^XAm#lKAUQwm6Wsz+J$2=w@P3I=J}0i9j>ZGw}Um={rs`NXK4D!VgE2?Yaok zOvOu9=RyL`?OUve^ckwJOT>jfahP30U1l?EbsQpbLa7YQ+{6n8rV0=M6jDqCUU3~5 zqBuh4ZXwZrDs;$2BeZn>0c%?mQsY}eI%UEz@ZZulRaiz}hN?&!v=cFd2?bmZ!%#3C za-9h`n-a0ICxfX{sA15O@4y+3Hg*^!9-(v0r!fYVtI$e=rK1$f7mJq~`09oevyC%Q znryZTRH@KP#(X5#HcyEH5E2F(td0efDAUxlmwN~k5vYcWU_N4QZo*+&^L|cl;X=U* zaK-V6M}TJJQvISP?Xv8TU;7h7Q+q1uyWsaGZqtZY(QG*49oz@lK5A1THb7;lrA zDunHoWeL`qU)-%A>IlKLs5`*IDr4#EFvtNSysaibSk1@bxl*2 z4`2L|XOLlzBJpGlvGn#sndGc$vbJ8R+1K$eW+AuO()Ydn=K566RU=-CryrTAsWb?c z5);%b#`>glrHe@cQc)3HbP`_aoc25POZx^61nlz%Y0sHhkytJKi9YHh1=l$NC-Z6z zGmx8XwpHEA;vT~cY-w=D*|dQ&kX1N5CSBs+Eo=F3V#PJ% z!B8?Ip3|S!^Bu4hkNwm z9JNhcRXqKIN&b3%sjfdWoAqv18a!T6oW?U7REl?h z_{bvsPGVPK4iOdOYLUN~@umo!hQqm1UihsdBc*D)9PniFC^xU=O-ZTfM;1=A|3)%9 zx~vZvjfUcwH5U;|npehNgYvBkBo+_XSHp#FTVY1hLao3lqU(O|vYz?Sx)TNMA_op1 z8yAE|LX*kQ=c$-l?bDEUs~xgRHmfZ!xm0ctJ> zWWL~ZObJ+Zz49gWdkQ$)ojYAewDlsXweVRWH0o{3g@GtvRB+lysimBgGK{1=qe>x0 z8UMGWV;o>4<=$D*Me==RupT=-*-TX#1*qmVmB@T#;cZ@9yk$J}EmE#=ZD${9xfP*R z?DW;Lr8;t@uWz?#fTg{*u-AOXb2or*J@gM<4>g zM#g(9{0Q7EZE+}u7Hy<%1i^sv+C_1pR|Zc{`TMMH>gJopmkww`nCJ;RLBlVuSf@K* zbYf#9Jd&}CYOc0?N4s(qcJD_Xv9(l8$9axg#FlfTlv5>^zs@K7!ejaz6|26WZ@!AE zpFC&0A|_1O^Dd;?=`9PV(t)V7F%3C9sFU5{n^Lx0W2+Y1}by3&_P*IY)R? zj2YuftjiF2<)1(3M+yD$0fx@+JG>+=YC6AR@2TjBXDx3s^7P(y_YLcsv7Htzuo_y8 zA@?XP^9@gK*2a6G2j#-m_}~_p_Glhrz7b;(t(rtqOH0d#Cq%MWgd@kRl~EKa>BX80 z7m1^Cv(FnYSvoo~ga+s(a<`By2lh0}_0@9rc!-ebAIOkpVWvNts=r5DLspxp3%ncI zOHhR%BDE5-H(oaW?BdT^KNJUN5#}r~ofgO8d%3igH67wxC2SjHpp_1|r?g7SU>}R& z*1cU>=zqDsyb$&>kNs!{Z^OQ{2jp6y9J-GS%q??Q^g6rrWBl_4RdccY|>?dPTqugohewNKD7WUL`3Hcc%QaInP-H8TX7!p(L`wFkWvYqyeG+z=THp>v-M zIAu*}4r8bV=B6ms22<61m6x)8+~K?5b!m2~*6#68Tup&0L%e!{v8tkc*BkE?)#XJW z8+B@}LFIDm!MTf?tzB~YhyCD=P_UsuEzmFj_4qGpXFcAn=APY z>21HF7L!UI{1%n3>V2doM!eo2-ZlCu)A`be!Pzoe_YA@crvbj$cqfZJoDA4}5M<(5 z5ja-0?<;OGV6IoS>EOpM8cYcc4DBEPSGgJ*C^*_#nix4V7+TmKY9s2a%zWm%8KuM% zLZ>FHiW0y>uRxP*xR4X2u6SEg3;k5qyT#s;>cniZGm)W8U^G>cn_jb zS8iw~2o11W4-|a}M}HxGo+#KYNazlz4kS$QDgO@wZ97mWBus_;1v*Lp!2}> zz+V9!g&jzlNVKq~5Y>L=5IKSNlTWL&0`!QRIHF#+>Zp%!%}}-cj_mN*6prS6sw|7V z80kxGdT*n&d2#qcJ(5yljhd2~$Uj^TL@+n5=&j`D4b@y;y_KHVob9>)<~S`BRBCi& z=~FTlh9sTHq>+7D2t@IhR4|-sO?R%TZtMVNr6oUh(A8ottQ0=`k#TH|(IR=z_caS} z-aLs8^7WtZ`Df@pfeT-Ogo3cZF~IjhED__l_9f5qK8p~IGEW)3(D;xq{igipJN7yV zGtmnmXxkuGizZxeQ99ro{46tJ3ZO^9zJr@VxO8~0Sqbn8)QLB>oDzVMjKjSG!-fFD z{Hpz`{d)v3Dxl0^H2umUF;`Imx(Xx?Sap;Vur}~i#8lWC@Eu4TFna%Y0$`c9M5o;T zq!sw;kR{Mfeu(}q0&u%9o_o+bgcdN9VzMeXC>EZ8+g$c83A` ztdLJ0r{EG}3=t~vGL?>3({r+gpXJUS)0d`<=Yp|VgIa4H-rHdg8&kq`=XD-Hs1W}! z0&hu^uRm`R@N!~{shOJYHOyt|z_tj6WQ7JaTV?@2K^f~VXYHX#e^-A^eKC?Tpk?()De>?v%Xb$AZ`d{Z2nxIF;U{adeg1O72j%d#AaNffgJJ!@N`NyGEi{`^fNMXi@y&Mc-M_6|h z=g*eZSQdt=x7)kIs!-uU7JY|h6^R~#bOgmw&X$#(xWU}_P9G5P2=aT$KAEJ*;ttl5 zY4w?{?HE>;s=}KyQ`aDT1acE6CdB&tqtcPkCg~-wGHsbQAj}M^P2`^lS+2OIhdpIP zT3%5$Lag6p_DYz-q%f*gc-CTk?##E3bDy;R9wA1dbM&N$U6Z=0(MUOtoIR>k=lpus zV5mFVw>f!6RyJJgyT;d*bd?s^VeRe9=OYKI zY<-@Ayjc0$JJ~s{tw2^;gg{MLuvbxwzk+x>B`5xaaMrATb7MRG^c|7Y!6b}ot+Nd! z;inLFdqsH`Tn!Rh#L8M#(Rm(v{<*D#y*NSzHZ~j$Z0Rud@?}Ils5x_yEd37oNthpg z5>TKvIqlU?$)UctTcw_qzqv!RHv%oGd3hM-7}KJ|b)q>+cRI-f=h0e>PBG7~ECme3=h2X$mIe;}#ClkOPcnfM_;)JW zcCi+w^H#SCMV)Jo#hy1=mkMS6yq1|!tmhh0_ml@ zkQIUT)#3ZYqChIEWdvV>t|z>uikacnE0`jfalB9XswKM0j0s#w@6dB351OWq(t5#y6S%Y6To zuk${li`|G-3=-@ea9Kon)iAt%L4!r{r9y~h#dJ^X&v93y+zW8 z5dQidQV(I$I6x)qY<75!8kjve21^OLOVOooI}%tzkrEuW$vU>lJz>x5Lu`H7~9HR zS-m7nLqbc~tUS@o(rUMb!3CMu7&$x}baJY!lX?j9jO9hS|9S$laVLN9xB^ztr5CUH^Qt&880G!F{pcaYHyD3WQ`=$U^WbXCXYs(AqV@Khf->^mKC z-G0v#E+WVs^!1s!5#$;{xlf8Gm2v&z64(tse|T2Xe=!4%v=X2zJPNu*+f4iNBWr zqTiywPRETOw;ur3hWZG0OJ+}V8rh-KvE0Gi(b^H|_u%*7zuZB*2EHb^mf=SN2}0t5 zdW5>gS<~|m^%wUO_wVxq*JnHhI8LDiwr|;Q`JtbQZt+erPo38I{qp_Iz+$|xpZV4} z*AhF*{hm55Isk}v7!)u@Fh+=Wa9_k0C_*S*7+r7_@N$T9@KFCbe-Ok9*a}nxm>qaK zQwC zTep$e4<*{ruhxdH9@~Q*F)4~=(m9phvxn?}asoFTY2e9CT4<;Ta+}w0b3VA@@r)|O zU`j=n?vtJNoPcz?!$Eq^Ab`uBxz!^qlKHI|hc$~rZjoG9nOyI#C~P%$PO7f6e&Vz{ zpN>{QKf3%@-32eeJ*?|HgziKqC?ju`JYh{R`gRf{I)41wMdvqU#Ub6eS zt#il+DYyA#ldG)0LN0^l>apN2^Q<7xnCbtLT^tIhq!;K7ZNC5{oqr2Xg^o^Pn}*&_ z>3Z;+=`Vz?6&C;go+K#fIbyW8Hj6=55g++(w z&k<{inqkp$&B@i5Cz!;e=2X|4p6nVC%wBPbK1Z*_Q9SKW>BBK*RVaK@D~^R%0t)E4 zHs|tI6gg(_dLjb=%g_kZt(DNX4F>RvL2h4sMWqi2n#d{Su*ie1C{;mpjJUt&ZLwovk>%ThB56g@TJa%u zM|P@r(H@eM!um*THSVdC!(Znv)M4;m*6Ds{{E#MZJlRhP&ZLP1- zTN|u*x9e5qZ|!SXr6bkF*uwW#@wt;8Y+LDBE={zTczAmEI(G82lOC8gg7-S;t^wJ^X z7d0^W7(XHc7e9PFq(vy$9Zju$SvD&!F+-t`47{+ec}qQs}we zS(&n-d=4X^tedRod$He#7C*q4q|v6xZP{jP!W`kW>exTrYvpL`P{6%(@icFGX?>;7 zo@O&4=Q`DSOfe(DhPq>IKm2_p2FeCNtf9;DS~jLEU%86jTKNJmxEO6r*>@6Cb8$p@ z)ejTqWaihOU zd3k5RU=rHPux2b%_WfI}g!)LM)}DDpWNRR7m%uKXxOk&87Q?6?GH-); zY9ow9!p?ChMa3-3jNkf7jUnpesRg8y&8zx%bld8H=a{+hTxa(AMjIQ5%12SUV$l|` zVurF&*9ln|O2K)kC^_uILA*sbuxtn|HJnr>X%Z1u>x<_rDKRXu;y?Jd(afsaz)Wp( z{YFdJNH%bzBc=-DU|z!VDRMu84{JT|YdOV-N6MfD1JkX`ok*;B<|f1vVp);WKANED zug}myD`V?1_m`y_af^aLC8eFB~q03zE*qK%n7$ge}7qzkpu|Hybn$G%+H_D zv3O^wDxaI*xf6bO-Msv!oFc(w@q5_v*I5yW<%C`absN1D_N8T_1h4RUSskKiCN{s~ zFW8_3u-T_Hn~_hS!YbD4xfYTiN8U+wZ}e=drPQ-&lw6Iz?3r9@^C+jPYbfRg(BEr! zjb6X8=t_9vwBEoLZk}K^8A{uKKXRMTe}IiyJy7{U+Q`jl%G!9y2(=)?gpnYs3sPx- zv3F6IkpJocQuLN}%Ci?zNfJk$mBt>b2$`3g}sBkvX@{M80sP zP3fdIrf`$4sg4UJ(U;|@+k1!mPHqQnCTypDpW9sT+Mw+q&3g{*Y9E#n z6e}LFmC|1CeCyisd^pcOH7+?T9b*U*jI;l`8PPU4@M!d^N=Bq`E@#RIIK=MP5qt{v zmOY4iZq&BLxVZ&ckTxkWMP+gdZX#wGC(LiF$-2{*XBw^>rI9@Cr#WB%q=oWsw;064 zRCmk1D2w+;esaabuAgHpMNeYBiPCBJvK>q^XDSH2U8d1#7AJeq{#fFm-kQ=!<7C-S zr0Y6IYkU(SbR8u(+wY197)hGG5~ONZkgPxt;-(iwA$PUPW2OZ|dfg~eB*s8#rJ9h$ z!<|h|DX;uRuK@lvIayoPV1KQZC(;SN$1T|0T)|%aj^+Iuo4Oh{MspWE1Dgvrc2-tK z@QIrK#f3vyf5|k3PhsUv2ownt;d$tea4f}8Lq2+DXkAU=70(WEKt@&%#RL)8y{};o zNA$^uylHP7d%F27N#!;QgEyCkTicKfpX$BS7JGTa>)Nn%S2td+B4qTpn2WgF*?dQE zTF#bez?n~+J|R3sg>p7HIoS2#DLZ~yRi5*%d6s^AFS(>n6D;sP5$}H4!;c z=?hZk$kb+O>0nz?RX{YCFCQ_53<06>MuMZ~LkYvmjl(v{7(FZhIhQUu8=*C;6WyIv z@?~bS>P`c3@|jXmS{~<{p%0RBW^b}-TQq7!95bd&-e_Qss*Js|`23A5dvm3PnT7b( z$8*Ev2{_;TcAgiHm!PIhDnkiSBD_#r0oe>KYul?{?MfZ=M{nTuO+dNrml~1tu*%Dw z)lDmqnNmnPxzuym+gta& z1#Y-nf0b?su@?v2DrhwG8LyU9LMRqzwq@$vXD7nOcEyQdfNmyeqtUCHwqUn$kHn-$sQ1T`vko$3(;xR|Ju zS;%kcFChkI>Du9fR`rGBxPl>OIXflv)EZ!8Eg92gYC;2CwRAqW&e~Sb>z}+hWqVyf z@3gqA8aiSMTxr8zE~U(DR|NPVgoETsCj zSK#G)?19+rF0rxr0{Pk*h9W_fx43&}XNUU!bM5h4uTRUfe(4%}HYM*~ma5trnS2^E zC|AL(-zcr!0GK(J33d!jI2h5S6+j$H;iRY)1#FyN*KJ5%hNAW~`46}ZFU z-9+LZ|6A8KKqTv0Y?D%du}m&Jq->&eETPkNc?NXv zkoi2IlmV{Zfe1#c6e0s934}jk^OE!pax3PeJX6L`xqPxK z52c!|)zmj+sRr0ln-_!}!~4*-ulEMMkf-<%LGTHCdBx2k2j3E;O9*&D=Wf@0d7YlI zU4xa#xMS!}&5wlRUqjFR=tF$E8G-%k7iD1LuMuv!0xvyD<{z3fF?QfGax!>!z`XM$ zxsW*Y<{sxLO(s@SUd08N9eJFlU%VGwunB8;ovA%seZ%8E=1~gT)N>jOyh#;DTCBr& zO&AS(3QVec!UAk;}oWA#JvP=b&@1lrN3*U?3T+n8M7P(vv!!amOYMwvDc^W~(u1TS}QXZFpT3Y9bfeiW@W(!sq%?2FH3 zOb{3>B3Vbr5yj;}in3bj1EauERr466`kN0Ec+v__n1A?8TnJwl1q8RA!gRGgW3X zEksm`KE#?M_*y6*KhlyASVX#Yj}e$0`cq_#{>91klNS&aDEg2AwJ1JGo@*8!7>uj0 zFI_YX1q)BtArKVG;Boc7I|x^wNdw6~;zeL`D%~iW;SU1coI*&Jj^8=N-wVp3SWkyB zsHnBQ2)rO9gE7p|JscKg(VgN$?uL41aNj04fO5_HII*D@@Pq=KK_51rw6LamoN;}l z)|60Vs(o$Xr`uz=$j2=|&p;3in{1ZQMeOx#0SU}0e9H^e@z&9LlklD77De+6R^f#I zS0|r`%G%HW;o{Z6RC52{a6Y*B`(g$k@W|WZjl+QB%m8$8}N1VzHDjqcyxDa_tkFYe}34%y9F3Yp6@bNp6Yz>x9^55 zYdI%bdHCA-pR4A*eY_mcy&p`j>@OZIpIojAR_|(jJsakCfegM39>7O)*?UQMcl~+m z@bYqhYyJE2nY$aZUB+|2O9{VEQ?pL)!J-{%ao@RsIOQ&ho%<$T^>0hIYnoGGEK0>uqE{MUUV{6+es6Cxex9ur>KLpVBX}WW5 zzZ<)<+ulFENc_Zi+EZLDEsC$z`gD8aeC1s%AH#QF95!_J(QfXh3H#}0ciq;zW-o+q z>Cpzb30pnpvu)c=%r74;V<_(}ZhX3K(cphPS*d5Yc7t9_NnEkEJG z?v%4{cH5u1W(`Hue?L5oCvItXGs4_-ZAog{cWe$jfEYX1<4@IT<-U98_UHE*3#avPgopa6Yz;Qtx;)o_DOK-3c(Qe1GD2<7nE{$7>8n^=z&ExNBzA zvi7h!x43h<%p5FTWiLsFM;VG4g{~xMDN&tR(7@}rkjSh&f-)%_qOj3+uRpJ$LP&K&`iPZZsLaa~rOYpT1h19iPOywB+5A;_M7g@<6>CX=^Ji6nlL#mR-<`LLE`@CN$umaAjX-9Qhm*%{+H!zH5d3~loOPwe@ z^3Rnm&D|_Nd!?^F$t~V44L1M$b=^IPS(Evbh{>&l3$;=INWbLG7x!5^s(K1T%!yDjLT@Ed=t!w@0;Z!(84X63 zZTKWYnSaUaGS1O(lA^{%nsxekX~(+QT`SNl-)GqyGXP~S_K!mI;+(erEy#Ujm%=_j zzQ`KW{waf!TZ35L>hDO2MlYkt;tIasMV6HuLHEU9oy#Enix`gPbN@^ltNXnBzSRM) zzLj6%IXGe3-ZAl3_I*RR_0F{`RO0t#`N9kQ1eD6?dI4oZn_nWjADSwF6xRJ)Ix*(?2A9bp*bjYRLVgaDabS zIO*%0z+VJy*l*ErdV?GwJc9@#dmQ?l$msp&D#VvS+#~%pp}6dJwGXLNfs0|15)|O@^ei ze!|Ge@)OXmhBKE_!G4Tx!yjS(gGm~DB!jDwgsiUa+1)FyG=NjZMN+TKj4SqN`?P=f zw`v#Alz{!!5@tLC_YB!tyUY}S^@F;^imb>a2(w?!<9AT@RQ4nW*F`c<<9m{)g$&Ni zp9|r)*cR+>x5U@*67z@Y-jNvjax(k8rUCwaqjOoYZMq~$c|`{Q=VbZQg!M5DZuE4I zp6%!S5jFf6-mSuaPV_&~r{8m|ck6PKee}#2C2U*KnM^$R{3inhe#cZx`+?~*^p{f- z=J%5T{J`Fj$-kKHZ_8^~=a4gHA&eAXy=Za%_Yr7VZ-I7hTznfk7e__;Lw%$e;J3!{ zyObdp*Q2@RG5;L@_rstPqrmT->rVvg zhG#A@GWM3w(SLTC-^1GNF|<9%-v8Ib+}jA;(0}>kKaB$aA>+C|xVHz@2L2bY|1I>t z@B;8Be_NGe_uPf+;I(^=GU;DtowBY`zQ9lY;LjzS-_k4R|Fcp4wsl*wUy<|plm_vy zc>(;>cGg?c&hh^?WUQ_Tf2pVIpw%I!#7`~`Y4OiShP-nWH}{P$>Zk4qGx^WX1Q3ia z(v?^Kzb)DF)^tT~o;dPvnGyUgGl2assr|ytuHx^Qt?2))7@dDBM&Pev0F;01KK>}= zA7a4#tr*DvZ%YYcPY?#LF{vuBF&TV7rFaTv9wFnPh5K>_%20~$c0ocIq57S z#9rl;lq`oSLvFu$Ot{6Izi&ryGX zj{gAN`_DmvUr;lCprZblP+w@K8p22am#BXE0gCpYf&v0RxGMZWrTed;=Kny&_)k#< z9Hx32_@8g}ysN&YqvA})#6>A7i496Z7gD~Lu`v5Yt#M*{$BzDzmI@xOgSJATi}<3 z{%soknoU1)p^ud*-=cyz@9)U|x|F|X4E&s${}syrtBiqv7jArorAzDY5ew;&ZkV(h zet#hyBr|coS*PbWemOzQ{ru@^N!hf&x_Qv8baeE7P#LDE)B({zmmNMnC~pev)zC21pc`F`R=bN z|3~cq0b}6jaQqAQzoq;$&p%=g`7tGZY)NtP;w%D!3Q<97P=d3NG(P8}N-VyT^u7eI z#rt0a+q-$mqmKH}MPx=)%H`Kh@8_B+QRL|9i;@ z{15BrFO%^vEB&fXPZZp=$jS%-r;HUG6*M$^U zIb`I&(8P^)8m4pJ9lya7--sG4&;GfPUJ=Z*gDo&d7eL-)Gp+(r=*~s5Ua{(s158tKi}=T zJ{>t+Jl{TYjDN|W$-n6XwQ=|qx4UlLZn^pHJeK-O-FdY;`99T6jN!O^j_roMJ3T%a z*?H%7ad~%qcDL($B}sC68K0h(e#{4a_HESwmWy(mASCNYfz11CWyA#R1Gd(?E>?;2vu;>B!>_YC4i179ikA z@}|rzYbUt_7`1BAwU(==GH3H^dp@OnESE(Mcsk|@>ej~?1QO)SpN;2edLuq1%hwUs zA4_4+`G)mSg)xd^eC^p#!hN-ul3;;J8M@GA%ZfAIkr%Ci#||B@F!9PI(lmAKEmxw- z*OmfvMWP;_lXMXSbcVsc;&^Vf`b|c9x525)vbFX6vD;@?w3W)@l*?G!whFxFwle^= z8_^YndAjS%2c*UuUC(y5-{ofvOc9Q?G}C)Ye!1u&xfD{j8>l&&Xk>gH5>ACm)%!@qg%9B`%q-b;uOLo04^V1B`tz_GI?P zNsUro2m&f}ij`7mdcsv?Ur5ygR2_=G(ixXcbgy59$X!rZfBaAd<<0kM%mZSa^5Wxx zaY-J8gtX_2%t|GHTzOdzE(8jg+=E+xk`7fQuWw!7f`eba-mA?>6jIHP+X+D@oqJKp zCXXGpe{b$3;z8d~)X+B6W*J0F2)o&_$C1DuVkrVBnsMN964?d#uvdMVpzX3@RZ5_& zQTX20ipy2cV`{|P<{^<)# z&T3ZVLz+(iH(#&3L13^Y!bTGMcC>{W%5Jc_z^eJOKpj)zsU|AfF#~jJMhb*0^7s|x z4H2!M@D}-W1z4zR;MqvC83n!lQwTIEhw3dqY3IdV9p2z#w3q#haO^EJJ#k+wM5ar; zB|p!(YM=KoOkwlu_n+N)(OPuK8~EALSR&g`wETqodS9aj2(S($+c2fYe z0x4dFnr60jc1rVsFwqgqdx-rL+8%vI|*v%~`S@ef+1i=wzimSK2G zI6!s}VH=Ck+ng+V_AE;(vD&w>xX7`z$stH+$J{~C#l#R@QI8c?fl?LN7FE=7yRALv zysEEPY#XA?W&JI2e3k3@CtJjvL|rBa6aadVLiue^Q4CQsThA+)AWe{=73xo zprA3`1IzHdm3s#>>#H7JD8E9Kt^eVvq91rE7<|bR1e2tJD2~*OruIIjmeN!`5I4)q zOfI}rteT_`?$$Isi)>>TbABP*v$wXNxyv+YxdidbcE_bwa25h#Ui z&^Ic}EP~4wj;6^=?Nl%(Wy6=&73w=!tbf4%_&JcFiPy9*4YxJgoP=i2T*w?Jhzq+4 zhKP6zTGcg={7b_`)Eh}Qt&4I|#Py>E|ay8Zum7K#p{66>rI>r6RJNhg)0Qck0j z4w&;CccFtyr87m=StUj)XCtS|VWc95ZH{x^95*}uHrN-SjH6sO?Zxxq*^;A+qDpocbb> z4fKbZ&WhkTY`t^Y{xS&%9Y|@*O=~|$NSjZk#Cd{2<;CdWGQ^#1Vtc92^aS@uc1`%x zbcv^RH)3_VIy1B)3}1KEPuh2@AkTw&^YS>GvIh~bi6X8R2$eZ~B1e{Oz&utkJ7Uq* zcD~PeQp{z?r6NsTJ` zKThO?CT1HaPXwcD|>cK*5jRIz1sB`4>N zHGUA4o6sk`z4827k?kGOzU1lZWJMll_^8ca6#B9zf=%+JzEwV8nsm+%RWHq$c^iJ zjPL5c+vKBAUh6BEnPeR-nB2D5R;5TN*#$k%EFemlKDl?}=4Vs#4Bm+;eEblwZWi$7 z5Nc<;_LPI;r|;;^np5vs5oru7@VHo!mS(^xD~O>nVA8S~HjAZ%sHI<8LxyXO0j=um*^d<>>2d^qF-yb3ZDE@rD=r}PxM#aFmc#13>6%=PAMj@*mv5R+Xx%`mvA{0Os2=G@k!) zR&wrKik;sEecHwK>+YJ>jZvhGaanfCajx=g$F#|r7&eMvY4Pidzh} zF1+GA0x}UagmkP9UoidJrRg=N zCyzr-ij3LvI>Vf%Z*I7d;-WicL+X-C&uk0q1nF{NC}F+Sg{};x&<$!k=C4-0=P}9I za$P&+h=N6YWc+ycG>*lmL$b{;>nYK;@u_xYS#K}fP}jv;o@B^e zZ&cI@q)Hsf?v(3^UW<(^!kfYGnACS>m)7eqIJGcJVPeIx&_YeqPws~E_Y1GEse8CQ zHU7l7!<7MRQVXZA-h>)&u-5(kjj>~=o6m^ZdtAf>Vl-KLZI~{>vTHfGr2Fu`@R^Bf z)hUNh85}vL)y;kzzEXiceVOFX(b#B9=P1rgTxJ&6*zsDf#Qnjx2BUnch$ zHOSST40O3Pwj<=e&O1*iyRdCP@ymGd+S*7eC z-fI%{;Di*)#O<0lE-X@;ryN*pRB>#@$7xEPj_-QsIqW=@J6{lEP_<>BT)NK{%!zRf z<13#I^t}p=+OkAl;-~||x-IQ~jIsE{nIELD-x)V<*|k#wfh&|%IHtn+o<@>acY=Fy zn_|-hGbor%f^IGr2JMBa^)nqBVJyF&GW_ruduPSnm`zHgbMZw71i&Nb*I*BolC z7y6_8T2|TFEvuI!EpIv-yid#~cZtE;uU5RKLOs6?rD+hcWq*#pq#cxSEjuK5y=3Gzi6A?1R_LMADT$E^`X zzHh+J2%uvNRvBd8UlBIvgW$M}w__lWw~v1&bMVbN!h)=$P56VGo?X3o=8=EG(%5}L zuV-58SqO)EBBshN*1|?UZ&oU8l;5bS;h*zHy4>pB z{ijDtK5jBot#}GeC@JU*U;OfV>ms&JL~K_>{y}Y0U5)-U%@;BIk7>Sq_n!Fa$^uEf zE3Gs3Pv4(*bu#QwN3oAXx3u@lkR@}sF3yNp=yxYTDMZV+E`EB!yC`gbljp}57ca@F z2nbv(7ySBli7P)hd0GT1l5SX5cM0^#h&W#sn0l#-DK}?a7G2FNY|Yh87ias;Gn;6A zIm#ve0E1v-_sqa)a^KSmsG*h|`2|wFrDk5wm}#^~z^bTFN1{>_l2AT3PA}lvHH)aYisV$E zK3qywg}e#qt0w^ukG@_Td<_mmNJ;BsFx0urZOelOLkJd@skANy6dq`L(Q4{@@nlZT zy?DT&*MF$*sh3fQQ{1RJ-uED!Fm#odTM&}o5J|;V6EN+R7%02DMipM0TvF@pO~tFj zQ#}iC?dzOK%{3qZLq>V^)8Tp_HDoZ_Id5Y}s2anKg-8?!iQ5%-N=9K@`KfI1~yZG6D1D{R^wEv?7ior$(V z^?gmQZ~`kg!l~DVvoptVjv>mxjUa;PT1Ci;k0?#$=yxgGXSF*FB1Vj3$;v3Vb)g_ zAPD3DbPo)*<|Z64sVev*5LZTHHy$L=7->xaR-A&O9)*l!G!_K5gc^D$cGNZ}qb2D%E>xgmm;yc_O~w;`yqC@f?qgp>cD&(;S ztk~=2*sS}#^~!00nE)-M5-Oj=4N`r2Ey;a=Nnm-YG8)kt49eLP)VgII?iT4@oo|9Z zvR%T}W3w7u=4mv5bs>9gQ?0eY#Z-FyK6(gm= zsOh)|4Oc|zwe)6_w_`awc6~kA& zKbN;81o(_$OzBRc8agXu{F?8-xEDl_k1doOp>xBBoyejj#(_j|^7zX#t2@M4pa z8S&Lrbcs|OnZp-XBo&d@MP>B%C6X=57=zaekeruV0E<&RPuM%f-f8W zk&CH}p1vk{$|V>&IcBI#+u3#=Y!p@pM&&0A(9ZH|r?z#)Ag#%nIwyR_GGu#KwHko3 zQcnVmgX7)-%tHAn^{TZFAp<9oyJi9g#|IHA6GAa#+pxLr6g4ngtm*J)%p!Qz>~BayWoAZNj>{91cRr%XI=MUr&EV6Bm$Mg^LI z@Yz4T)u@LK(5LMG<`vQ z#qt5Td{F?y)V7sAd+?SJ_W2WoME7~oFDtt55W@Khhx5L|z9azUr6a>{#faps5PDl5 z7$}T^lWMafL+BBY$rkQDgBAO6eAPo4Rt4tP1}AaGc7FRncxbcLt@P4oL-DhX^C<6hpvyBt2~a`1VO z{_78LuQymZ?De6&-0P1Hx_-dr2=3*K;V(C!axZrsd^zafNdNSn-0LINhn=3myWV&3 z^`9?~5!X1Da>6jx^3}}7!nH*aRvR-y{1=EiOJ0|KI&r#yMwuHY?PhCvZdnjw9CP35TEFZ%CEU5v zi%0v87a)@R83YFK=$8ceO_Ty$E&A#8g8@SP75@G%eZe;->rQPIR9b2ID#8+4J>JD; zW~1@q`&L^ruKKSMHIUpb!P7lev~R$F{2SK%C=rcD<=@W#_&3me4(6ZwX#C6lkAEZZ zZ_}v!+wmX&M&MugsP-@7KmLutzrCaKj~f8~=YPLB-S6$6Kp{Ea;uYB|`Gj%NgWHA~ z7yXxr8cR0FE?Tf>Zh!FVEmTMj7RLt|>PiYwkbfXR1_L8iz7g{8Mi}4r$}heG17mc) z5%SLjSiJ%^=YuJaOARzcsyxQfWydaWVBQPLK@?Bac9QM@#lZFWZyE@a8St2L6kAM^(oF)B2g7jzQ|GWF=lOX;K z{jFpuw>u{4^ms}H+}4y?gZ7^(x?l34Z2p2hJ7PBXCkK5ZTHNfm!cce2Kk5qxX1RYO z!5wA&+~;_HTfr~L?|0P~46tFh$My=yC_t-?F~JUFlDftZuE21U^XrD`ng8)`xcUT_ ze~(7x-@^a+H=w*Un14Z|@~`$k{*A!D`=j!2!GHW4fq#ah@~`AS{*A!Dr=#*udH^c!>s1P~Ft6Jvma_ z(j!Y@?B^_MXdartnU9^t_V#dg?sH>AqSY)@k`h+4CSxtw4jvwHEKzt}cN)Q>lG)jH zD=)HCo@{SfnUdyB<+iCpG4|1xDQVRz-hFg#zb59o2_!87YiY@`spA;6{wG(w>eorJ_xCZ(i4IS3M+256Yb&;Sk#WOCSCz-nuI2==JN zq$Ho)5)gatZ}ZyPFa#Y>m#&83NNTV;!JFCBe7uenR7!>-dJq^6y|JORB{Glutnx-y z@&-e0*C@M@RbL?^gWW>wrGurlwKy2o$9b~1cUKeZLqG*oFB*flz&E#G`|8^;>hOqE z&;^@HWrI#S0*zwjg$9wqhtm*3nwJ*?gVTfPxN{mRx-k$POE{ah4adU8b>*qUZ2(&x zOyRKGLR*5kyGvuOuT}EtTg##4W0X=o?{9*6Q~R6`M?)Gj)1IgiTD0kzxqYqG_aJGE zrl|0Cia{rl-b^AxJZ%V`#U*hO;&di>*3|X^X3wt0L8hZtpqR7{g!o24XIIx|DwwAx zdpgt1l`5I6mJnL&;@V=e9=i*Nl|HA#x!k0}Xlf?q8ItXjgE$+b@$8;pGanEJy6SG| zoXia9XfxzUM%&{XP1Yc&1$`t8qaYV~^DgkAu-mFDHlb_kVK7by1OY%2OCR*MhLUhN z2n@ERucNtPrKeX2osto1s2&d?;Bt$qk1>5-U#T6>>d>frQ;V?F0ra~1PZGxAN)e4g zoNy;LlUd(aBG2i<)H5~o0h6wa*~T&LMxkMHtd5paCsb!{CsSh`w+S`4v%Bd^t|1I8 z$`OBZp3US+s^|l$ab^x}0i3v@aaMTdp6v`;5*2h=x@;r$$>alaVhhSLoJvw4MH<6k-@%ipLERl>1f{PlnRdBIni;N<+;wLI zd=|ZwFdK&h=x2weOz5nK?DSWH^;I%nrXotM0Yn%&#G0K;H%npSH78s9t_f}uj^Q=zomH?S5x@xk$E``(OZoIkhU zI<;%pM@9(hU7}7(Q&mvXr(9I(NA7ozvdVpG$Y?cKWit@J=<}!|z&;x9owR#CmZ4Hg zD5#o_@-4$nYd?U;v!WHqBJ4W7o4uFJShF5Nx|d~E1%y%)4a-wl@^Q>14%FG^*mco5 z>I}|fB@c!~XhFC*N)T0fu(ZM}SKE#57;p<^UJ2{4&~J`E@3rf`CGrsgH@UAuCY%gQ z=<2g*1(R$ThNakhhDx`zKjLz1pb#xa@25ZnTHCAWD#JvCVM5cRmt&4odP-r5U1HU@ zXk{|4Q{6Bv?XFkdxJ~`zxBNVssUdtY-$2d=k?wvC?1o|LO|sd5u#_Cutl zqm9)|Qf7o}Z(VB#ys+CtQRf*#36|ECd?XEk?1)efopOkyFUMHdwCkQpqn>29(SuzV z>G<1*w&NJAytk~pg@}z26xuTsyeba}T>=ixi6%gRV>WwIc z;qi|@9zuJvYeKtNA#M=&m!Jus)suwytbbsiiP~*^Lq0XUFp$4HUp~pfMLd`-oL%l-9 zLpOvfhuVb7hnj?{hic0(g{I48AK%(xwM&Z{-MYDk0!J{b$(o&nC!ni)b>y63mpAO{ zthS~|xoa;vD;`>t@x;B|;?uRPNU!TBEN!lxC`c>tE4Wi|sUWuCOu^%V8wH64Ckq}F zTq}4{aK0d_;8sCu!SRB71y>5<3IYp2WWi_7N(a_tJams)817}_HrJ5`T}SS@msNdo z_f}s9QP6#il3y-S!d)`lk3Xr447pX)Cs&eS7sHxP9ttdL&ukHKNKqz&6d_E80!1!G zn4BR_ncyvi&XA`}_7*k?ER(9S*zUV~qpA>Mjlq36$8BZtueG5UQ{tdVSRv<>NTs+; zx*lbWmY89>F=eclI5gdWBAFtFNH?QMr-(z+H&7(J#o*~ClyT;&`=A$1MTDNOJvt#o z_sdw-XUUeZK;XTK=^TH$joop(q=zn`B@&drpCY0qic5E<2&IT%(vMNZQbft=UKBxZ z5p=o@MbulAkp5v-um2<@_X`uRA({biyaF@pU^&bswB$5%#J5xHxg9yNJ?p zW#R&NvGC*a#JTRGmdDkJs_x?W<1)nAG!dQSP@)P=3`EPt%CA!u5;UFpV$7D?b9V%4 zD7Tue3phqSHi1#oR+H}r(Grl!m`$0YC1{wjj50k%0GgpfnU*4m$k3!Hc?&=?lqpla z1>qU$4lhop&Nw<@Op)YceJdf=OQuJ{%#-1PWy%P7o0t3q3HVDgQomKyC{VW_ z{z-?=yq{Gl!H_FHQo%CKN;{LR5m)t7;GZ50{%Lzcd+Ds+;>v7rqfN(MK*@gtaf!Q7 zxW5f?mAjy&zX@@LyD;7#Nz|qZ==d8Fm(hgM{1L>X6TH^EpEdsWvOnDlU+?nA+8G%+{Ft3C> zpEF*Z?t0QzHtQwB(Dr9o?>hwe3ng6O3nO3d=c*$tR$Bo4IJX3baBKB8F1NVbyr8-- znUmE!!ZwHO@{9I>Z|bAbhElCbIjZ@RtButh2!WOy_oIe~N7wB`=;~O`rK`sWH`@sn zEajK{H4+R}NuEaP4$;WmBV3In?W%~?x22-Xlzan-6Wqs!`$iC_x=UO71`{W{kHh=M z6BXTMbbNz|lW1epd@)3Y1k)@_ffr*$4xfBKYq8(;jjANk%GZ0q7f@gRG2w-Tw@ zir7x}=i2XPX?H2pyO}Vjsu%i<_M%PY3#zJ9tTf#MxQu}W*)c08{-|7%GA#vM#YGN- zlkXLIf~l$wiy=!Z-o5osu`v0?ek4~rUTFWQ;dKp26=;^`8D34E;Z4fq8eYZKFwF;= zVWmfN+heN0(cxqah8VeKX)nR|iaaBS)2UgYQ3A<XBG+o#4QDmMkYJ(88tR)Q+)p-Mu+Z+Xt;{vI zuS&|8v9fi%diyf9^brmEca}~&Na*<*rKpP=H0z2ddgREpCF?04P-a#-wx?(?I-SK6 zWWWzw5-wwBd{criyjaWQ1+2Vcx`%4| z(?t7@XOsGQ=E&t4s9-t&JZpy;>=(uY0#Sc%uwNJp@Cm)Y=;pVDxm9(vK2Lt9SDBUtg_yxYtdWJ&Z4;s%Z^4MCzviVJ`sN8QAYx=DsjvGsY zA55Y6SVd&Ow%6O5q)FMIVl}xj(WjrWWc|LE=X$|c-+SvK&-Vt#_50qq-}JpRdA?WP zrr-A-8p$kz?-C3?)+bss9PMV}dD;y5;CGS&O_#N9uW*XETkW}?gpY!|<_4CuZLw>JKXT$u9~%ihhGMKRybc-0tpCZqYQ;zUrDkzp5Gk zqS=u0XM2&vCkYrb#lzuoe64XQ1y# z9(-Rj8mQn0|A>Nr*6+8&={Fd9w!yb%G%z{3_A?4Tihcu?Kd9g)d=z{X{RRVSMoG1; z9Y+Elpu0XETp;Q#DIz;&!FZz?4|Ui2T@{)t>Le*EJAc7;quUR4_57|2DT;bZj+LFV zV6l=n^Y zQ!FZ}5Y$dl+@4q_2(AV8zyHRY##N~~JJl|x*RQ@Rm7m_T`f8wa&Ml|n$>p2sYf?-Z zrfP1wID~jN%}v*k`$loot=}iUllx)+8~FampZJNmUG3ubL|viamhEbbg-f}wg;SAl z^=*zSUkmJd+IEb)Ic=eR^+3gTdcLzmq~LqAMjInOiMMk=jCZdTick;gGsht(~Wpxo#26I;RG$LQQs^ z5LYj?*ZiX(U{nq1hs~5bZmYyXdCl8SvBG@c0-XF#ycM08V9x!|)C9`_C&$7BW3|;U zH6NRY<$A#LvZWjQ+I*D=(v3~rH@q}=Jm0t3(%_$WzHiTExh8VbS6jtLfWIv`z~3x= z6B5rz5BX^rt&FYWYNb};&uAt1Vu<-{?w^gbVGrCc2xnY6VCG`5b$8F4-HzcTM~+le zEoYhNJR)^wx3ElzmHf<*gyrLd#cJLWvks1NoVrh~^h}=n{%G!N&-wTSjh9}s!7Yw> z6}55sgml`tErfK+xU2_$3E=ZZy5`eP8wfidnW5JI=?EYG-0&j|^m$4!XwE-8{HUXY zk-!;s^`j0y>geFzZ$XdEtcA?5utoh0QQn;tCX{UW_o z$~!JSUdlT@ohrqQNe_}@K2OI{M7vBGu$0r5P%sO~F(Og-r_I#qH zvRbJ+zNQA0wHuj7=XzigmM;dve|-2+M+c)beuUMJI{c`k|093?;QapZpV>9S=-__` zeLpt9?;o=@Jex*X{qHXx82r`Y`Hjw23I8hYASR2Z!HEH)D05RR(tA$hJfOYtEs zt~E|RwW?|t+LW^EJ;SJH4TQVYM;v~TfgCzI_`Ac8Iyx8$oKaUl>hPnE4tP$Ozn}Tr z(DyGM{58q`7&c%SUj7Tv_ahJZx-ve{lO6j=nNn4?U2BoPK{`{2wW2zEi6x>sX2dSh zv^~T;(KJ(Hi)h+jVufg$8Id81+C$70MVS&wqNu&ZQc;u{kt)jGL&S+@9b9xus%mb7 z)0sTa{m~#ep_1Sp7`Q)K8K`morl;laOaM1x9ITamA^G;ZUUsdQ`6O@ypz+BQr_5f87XE$x}g*^B^@foOiD*cG1Jl^Qp`l(gmc*r zcapQr)g1RC@_Qx*GZYYxj<(b~Ts;hv>j7AaW3AYzi~)%if1CbIi~e!P;H&xnw=xcOHZcFF;GCLO&(1M3pI)Ke=iG<+5*~w5;^RT<9qcOk z1PVVF9*>-V{`T-A=AXRL!QTw-e;@<|!>1;H8~Ty+&%Y0SKl0!&Cx2md?h`>`3Ce~b{2`~_^lUz6;p&=Y80=4?Q!KH1*kaYr+K17s|vLkPWy(jj!V-clqSOk(R4H9T*hQ2UA*?EeAp{mtNJ2GBMqTXh8%%;D$z(1)4 zzm?SfL|O<29!CDVsn4kApMNjw{FZcrA3do3OW1&a&Vm2Z@S~1C%=zcP0ewI6;0Mmg z{{S}F?D|ZOyW1TG$J?S&jZ!QG`6sCbKb_T5Fkov3c|n5{>zI8hw!xDX+1t{eb21aX zX^_&|6b^^A9?UM8h?073;9|>9#Lt*FPD%hf20@%#{HS10yi(Oc?TWZ z!^aJzP6NXw!7W(_y$|x~1_a-?0}dPNz_`_PmjA%xyw7zK?&@h&S?9!U<~b(6QjHqL z{{IgT1$Q_+q|N5sA_$#X)`SA8f77zYR8S|GHKYab=M^^v)iwC?S?B~_< z%26GZwNzS4ks|S)j5y8R&rpu$;)j!?dHX@-Xik0@Ihv;*LXPIV(m-^?gLeD*{Maw{4f^bq*f;w~u-ynI~0Y5`|nynvB zp0>{qDo;D=hmofp@DXn{^ve<9HXNM&0q_YsrvA_Z-pHU3rdSw67xNYTa3Auke+DD8c*XOm z1al>l_MbnFO6!p2Hg?C?IC+FoPjmDC-)-R>bkx|FW6V8duR5Do?}(p0_;!OKgdU;) zvHt*Lh&t9Q7;+nLkSc1yxgJ5k-!u*eHKqTX*z=$Vzt=wdTiEk#)kyb$@WCE-K97L^ zr+3-Cr(V#~jMyWJ-$N`A#hVh_MDcrxRibz^B1=?f4>40z$8^{>$uF(T;A`)4&u77s z^6C-Lpe_{CX=*x?<=>$YlIB;fFf_0oPNBa2WyYDj@ij}c%%dj-cjTC3CI#oIhx5XK z-R5dRT}qBetk_~X2w+7QJB1i7KpfGUE34_9&Kut!`f|HVwwbFD+|P2YiJ4=fR-qU7 z%07iDSidHPDQUws`0@xoO#PF)yRd|@Gu8C+>sLEY<#wE{c1-lHUBKHz%_5C~8^PmU+3ihaJ!Egd!wFSSZw|vyLlxvY;sGn?ve$Ju%F#bQ}&41pRf5rcgc=KUzr5M(saPj|x z-u&mV=LO?Gl>hxD?7zmJ|0C>q(1Sk~Ne#drom0j^zUEfK9Bm~uT<53jQgYbzb_Ddi`o95-TA`K@AU6q z#@@R&!V!2hHT-h}LL_z?@r9@*oOoUoZ%&L7#aj|@iQ+AYsiJr|@wljtIq{z8uwRwI zy{kS)g|j@HcY`kIZ?8i2mrL8d6H{EcdRrUJ|F)qY>%aM2A{=re{tNNW7x((*>~z5W zSAV*+^L^VGpXvfQp9ckOX0ALG<=$2SNn=$ZIJMbS;NH<32xB$jV2ofgn*n1%uLYyn z92C`tfTgiuZ05CKc69;wqd@M1M&&uVfLg(!_sT%=oL&ZuSpnF6Ho&vPi_-+<=V0VRm?aJ{!&>}E}a;HKlZO)O{s)sM-&(u!I zNpiK)RCvB;#_h+k`X^?+m@~P;r@6E{lRj5*bK%MvZE~+gS5F^D3R^b)2^D2B-+g_{ z{bCxbyhC$ zPrk6gsN`*VnZK9k^U!D&)z19-(`nnQ0^{Q1tNaZLbVD{XbQn$kYaY~-Bm>4#YNsl6 zhfVKhS{+)p5L4Q7+){nUI8W6$k>t1?R@2?DsVpQ^0=c)arK^IbtVsY1CCVp)NM}Y3=qYw~|WOvtB(uJ=tR+XQN9)9nn!k?Zm{a?c?`p zY?TOdt2?ze1d6cgKp=B4u-g+K>Qclu_NuF8t_AOIcCXrbA*mjAcCFFgCaPns zbgIdo+uO|NObCDQxU%WALrksr+Nr@B*Ymb2i7$*he@FA!(i+*!d$(RE;^*uQDA91z zI(Mn!t%=+nFG@Gf>D)?o?xPyD1#Rlam*{op)`R@D#!oYkKlZkBTI^{jyJXzQG54OV zP0rIG*ATZzNi)sH@2c`Qo~V`I0GWrq0I}%`E!MgrR1&G+4}oo4FVpeRKv<#M`m)*T zyRI!pZPyRcq$Y(QoDq8HV02w?(*&f@u26@^1a{G<1=+qz<+AIZPC^!91F0z+FOnzK z`I+9B2qwaJs+NV^UNBC{HXi$lhPF9aMTxo{Eq3R=yU;y9iw_4i#0YQw5#!&b+L#g} zHJWC0-@i+^sWVsN&?V!;8DiZRZ=J`n**Zw8#8>XN?Kn`Z4t@1D8Q=PP?Gq({^CBc5#!#(~{h-HwDEf>ssH9okM-B zbu&{gVGLoGY0O%z{?V7^`>bLL9=sN=e|PnoB-JeBZC>%dsU?TiGAQv*MdEI^^#e|A z$#_qZ+_veuPgeKXg+AX} zzQ5i|Ibn&;3Fy`CQu5e2MP|zLdTSniK{xRrcQ7WJ>q2dn>19 z>u9-FHL1LlN}e}|DJ4-6wcy2+;Jh1bSYcz@`|I*9hGMTwo)zy_s`h<4DJeJX*g@d1 zF(Ae0g)RO-$mRLY;goFMSoch$163Q(4T1412fvC;~eUjGJ-Hy}8 zal$5S&{G#5do6p~nO%h~uP^kuWtBTN_3WHpbwagug_lsRmXd1hM=@8;-8ql0>Snn` z?Od-p{r)Q*(iF8t8LKSzJz7RmZQJH)DWL%(J)*Ld9g}KowcLBwb#DW^Kc6gwdRif}VvID-*)+jya#e8V{F=wYe8FannS@kjZmsIHD<|QAMaXz?K z>UCV=^Z9E%;uc$+JNVW`*-B%BN1XGl1PzsEq6fvzUp8i~(@dk*;7>gS53LUpRvKop zoe%ezq#yC!^Dz)w)C3oc^s+&Z#Ng@9`7}n{}_y(mQ~(Z&ld1WaIAed5_%mCtldXxH!!c zCn>yo&*F0$pVp#p)~NHGi-fPQl9GX-fPhW>vJhc4K~QwPKvco%jG9;R+X=jOSm#Y8-Aubb=q!l20DW$)~|sd?Ax z^dHPvqdMjJ77S*e(K4eW?(cSuD{rvU+OXr)nbm8&jvYG{JHcyyqC}Y9Do3-X%Vx;; zn&!?OZ;-xvYvn+KNZ#D|=}29y(wW8+SNE;^2v2Gh++j8Uw#dP84+XPfmQqQ}fo0>h zGjaKLX35(k5{zHU9@j_;ng=<*wM3-gX;5{iG4rK|cY7o~vDs~|z=K%XEr*FO-!%zO zcdCy{U?1MEbpxrnC?QrMzTHl`Gn!?WdR6fSbjj^Co@#Omn^%QhEB(Y;Xm)S;oaLQw zq9BFKrp5M!UCQ>N(lHE+eCzGuOPL$)-!a@IH*x)}_4f0!md!ZdkzKkGD;Rv|rm(E! zIf8P~eJ-3aDIM>iRUV_C)Gjb-$FSwNth}x4pVOW8U?c z(;k|e57&wWYrJr-NU1u2U#Dzsps{Z9y7Ad3ZM5W^pz(ZEu7MBP#OBJo&<5+QC-q$qF&qxu>6KbHvmf>bNpyz ze!biiU1}MyM7p$e#r#9nmlB-ss`Oc=8YP}{P2P5StE!#A`@ShTo9>0c&8W34_vN9H zmPHW_u48ha; zem26pHn(j%rnb=Ob!5@y;QYDk0ybHt9JQZq{bsU}(|J_>v-56yykb_N9xhyGsnmNd zsXWr=9LX#?;=YB_tD6r9N4LRr^^>M(*dAa%CO%kxaT9r6YRug*WMW}?1M|UZ+p$`H zzO$Ckd{Q3#{>o0A__nTr5(zV;wO7A`tPu$yq{UC-# zR_>dbH(u|?z6~>^E?ryn&XXP&?sM6Lt?_ckO9Ib!h$zkx`*b%PZvyobA)8PAn!C+8eCUhRHic8cz4rp4*YW^L3A&SoMT@uBf)%|9Lk#4g5^NT={;`&8Xt#-=)Mx)*{4J7!)AX4dE|tp)R;3*{e8 zPkno1-Sb7$Yt~G>kQ+jJySXXq%%WY_E#>?-+SIMzJ9DKGS+sV|P3e94PcK&<+%{Fr z#&H^T{eo9dik$qKY**_N4)0e!v>+s;a>n&{jZYrpBr&V=6R*F1QaQIK>}{#W%e}Ei zf$wl1ZcNHQr56?wU*b_*vU+*o(Y%`n0ikYNl#1~+`sL)cYqO#;$r6bt^evQkx15(c z=X}VlRMPgqW@S0!{qZ-VWA_whUte1OOg?{iq)N?#$SeB^mqG)fmv&Ul(G2$76uxQk z^;cB5;eCa&b%C;v%bhB`b#3QIK7H4|JAxgW1(UQyX1+nU=Nobrg~JgR*lr*!A}er( zeRm89yi`ODem9Z}V$ahf+tf`#`#;^VN`&6#=*{T0kX#lNd+F_~ zdyWsMZm6}Ylz98-t;q5@bM9>KAv3nOt1ZM;=LmvccY->OiU)lV4k-xG8UTkLjAiGd zIo%ZqG@F4Wpt@SnC=LlQKoE?DA)vgx(QGUXFbd$D-eef7g3P9nU@UqCf*>N zNO?4HRqmm5cE@!n&I7O;^8!gW#+~$3BM-(K@>48l&a0?!p@v@huDW{e)9(^pn4ie` zYvZlE-w@DZ&3A%srxW~Aj=@gEJ-1N0_y(@PI&2Gv-7v@`Dwjf-b@Mh`dQlBTql0q# z@GH$dSsBO3Ag1mdZ0|g|*bNNBLvQN50t*`CVSBYt#@m2n9B^Q@4it3=VeSh#)nV8`T72PH==x7`AARFvsI?2; zX`hX%(ic%PocXrH%b;3khGn?k)x9ZIOyycEGvmGf!umZr`#!ET-0L~r4=%#e*KzZt z7d~5Y?p3_Ua#y2!RujjeA(a-m$QP$JzK5XaP1MZB+50o-Ucl?3U6#9i?-sqr5}a5E z^Nrzkbf2qwK&ElpilB<@L#FxihGL%XYRl$HtfM-5Wp;}P<}ckQGOouU(|}p2@m%rY zq1HKaM?*EF1ba#kaW{5;QzG+|+d)Wl)U0I@(AW-GU)s#msdL{lU*oPzY`qZc6Bn_u zVBUCD)RHHR5K14gd4{h)Y;;TM)Cp+FcC$1`OH=nY>(1lAmHDZLI&rI6?!?>6;-{@m+$&tf+WX-~EfySJHJhkL{SastPu@1GfCJ zmgwuCjdSOo$JTmL(=s*Y33xo)6Mlth=wHEH@W`rNb!r^#gk8d_^9CV4ehmA(h{un| z!rz)vk@$(F(`z`d!M3Q5d$N|6wd|ZFn-Ly1p;nYAooSzzp0RA>s4a=Uw

$%jdMw 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 z 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%0D87P#~Eyzv48b}knDxBvpiAlX{>&q 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 Qe0r$_t1erfD9}|50ALqE>i_@% delta 166394 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 z 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 ZA!bv0Ih^(}|- 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 Gpnn6zA$^?y diff --git a/src/client/spark_sdk/samples/MarketDataSample.cs b/src/client/spark_sdk/samples/MarketDataSample.cs index 11995514f..caeb3274c 100644 --- a/src/client/spark_sdk/samples/MarketDataSample.cs +++ b/src/client/spark_sdk/samples/MarketDataSample.cs @@ -23,10 +23,13 @@ namespace bts.sdk _md = client; } - void print_update(IMDData update) + void print_update(IEnumerable updates) { - Console.WriteLine(update.ToString()); - Console.WriteLine(); + foreach (var update in updates) + { + Console.WriteLine(update.ToString()); + Console.WriteLine(); + } } public static Venue parse_venue(string exch) @@ -52,7 +55,7 @@ namespace bts.sdk Product prod = new Product() { Exchange = ven, Type = st, Symbol = symbol }; Func where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == st); - _disps.Add(_md.subscribe_combined(where).Subscribe(x => + _disps.Add(_md.subscribe_book(where).Subscribe(x => { print_update(x); })); @@ -64,9 +67,9 @@ namespace bts.sdk SecurityType st = parse_security_type(sectype); Func where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == st && - x.HasGlbx && x.Glbx.SecurityDesc == security_desc); + x.Glbx.SecurityDesc == security_desc); - _disps.Add(_md.subscribe_combined(where).Subscribe(x => + _disps.Add(_md.subscribe_book(where).Subscribe(x => { print_update(x); })); diff --git a/src/client/spark_sdk/samples/OrderSample.cs b/src/client/spark_sdk/samples/OrderSample.cs index 0c6735ff2..d6df99265 100644 --- a/src/client/spark_sdk/samples/OrderSample.cs +++ b/src/client/spark_sdk/samples/OrderSample.cs @@ -36,8 +36,8 @@ namespace bts.sdk Console.WriteLine(); } - public async Task> send_order(string exch, string sectype, string symbol, string security_desc, string qty, - string price = null, string user = null, string account = null) + public async Task> send_order(string user, string account , + string exch, string sectype, string symbol, string security_desc, string qty, string price = null) { Venue ven = MarketDataSample.parse_venue(exch); SecurityType st = MarketDataSample.parse_security_type(sectype); diff --git a/src/client/spark_sdk/samples/SDKMain.cs b/src/client/spark_sdk/samples/SDKMain.cs index 0ec5087b5..78f26eae5 100644 --- a/src/client/spark_sdk/samples/SDKMain.cs +++ b/src/client/spark_sdk/samples/SDKMain.cs @@ -13,6 +13,10 @@ namespace bts.sdk public class SDKMain { + static async Task login(string user, string pass) + { + return await Locator.login(user, pass); + } private static void user_test() { var s = Locator.locate(); @@ -20,9 +24,22 @@ namespace bts.sdk var resp = s.get_users(r); Console.WriteLine("{0}", resp); } - public static void Main(string[] args) - { + public async static Task Main(string[] args) + { Log.ClientSdk.info("Welcome to the BTS Client Side SDK example"); + + string u = args.FirstOrDefault(x => x.Contains("--user=")); + string p = args.FirstOrDefault(x => x.Contains("--pass=")); + u = u?.Replace("--user=", string.Empty) ?? string.Empty; + p = p?.Replace("--pass=", string.Empty) ?? string.Empty; + + var lr = await login(u, p); + if (!lr.success) + { + Console.WriteLine("Login failure: " + lr.reason); + help(); + } + if (args.FirstOrDefault() == "users") { user_test(); @@ -30,25 +47,13 @@ namespace bts.sdk else { uint ms = 100; - string p = args.FirstOrDefault(x => x.Contains("--pump=")); - if (p != null) + string pu = args.FirstOrDefault(x => x.Contains("--pump=")); + if (pu != null) ms = uint.Parse(p.Replace("--pump=", string.Empty)); - MarketDataClient client = new MarketDataClient(ms); + MarketDataClient client = new MarketDataClient(ms, Locator.token); CompositeDisposable disp = new CompositeDisposable(client); - if (args.FirstOrDefault() == "ui") - { - if (args.Length >= 6) - { - using (var ui = new ui.UISample(client)) - { - ui.simple_price_ui(args[1], args[2], args[3], args[4], args[5]); - } - } - else - ui_help(); - } - else if (args.Length > 0 && args.FirstOrDefault().Contains("md")) + if (args.Length > 0 && args.FirstOrDefault().Contains("md")) { var s = new MarketDataSample(client); if (args.FirstOrDefault() == "md") @@ -71,7 +76,7 @@ namespace bts.sdk { OrderSample os = new OrderSample(client); disp.Add(os); - order_sample(os, args); + order_sample(os, u, args); } else help(); @@ -80,19 +85,15 @@ namespace bts.sdk } } - static async void order_sample(OrderSample os, string[] args) + static async void order_sample(OrderSample os, string user, string[] args) { - if (args.Length >= 9) + if (args.Length >= 10) //--user and --pass are in args[] { - await os.send_order(args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]); + await os.send_order(user, args[1], args[2], args[3], args[4], args[5], args[6], args[7]); } - else if (args.Length >= 7) + else if (args.Length >= 9) { - await os.send_order(args[1], args[2], args[3], args[4], args[5], args[6]); - } - else if (args.Length >= 6) - { - await os.send_order(args[1], args[2], args[3], args[4], args[5]); + await os.send_order(user, args[1], args[2], args[3], args[4], args[5], args[6]); } else order_help(); @@ -117,9 +118,10 @@ namespace bts.sdk Console.WriteLine(); Console.WriteLine("Commands:"); Console.WriteLine(" md []"); - Console.WriteLine(" ui "); - Console.WriteLine(" order []"); + Console.WriteLine(" order []"); Console.WriteLine("Arguments:"); + Console.WriteLine(" --user="); + Console.WriteLine(" --pass="); Console.WriteLine(" --pump="); Environment.Exit(1); } @@ -128,10 +130,9 @@ namespace bts.sdk { Console.WriteLine("order [] [] []"); Console.WriteLine("This command sends a limit or market DAY order for the specified security_desc. Leave off the price for a market order"); - Console.WriteLine(" example: order GLBX Future ES ESM8 -2 2650.25"); - Console.WriteLine(" order GLBX Future ES ESM8 -2"); - Console.WriteLine(" order GLBX Future ES ESM8 10 2650.0 bts \"ACC A1\""); - Console.WriteLine(" order GLBX Future ES ESM8 10 2650.0"); + Console.WriteLine(" example: order \"ACC A1\" GLBX Future ES ESM8 10 2650.0"); + Console.WriteLine(" order \"ACC A1\" SIM Future ES SIM:ESM8 -10 2650.0"); + Console.WriteLine(" order \"ACC A1\" GLBX Future ES ESM8 10 (this is a market order)"); Environment.Exit(1); } @@ -140,19 +141,11 @@ namespace bts.sdk Console.WriteLine("md "); Console.WriteLine("This command subscribes to market data for an exchange-type-symbol channel and writes to console."); Console.WriteLine("Marketdata is read off the wire on the same thread as is used to read and print"); - Console.WriteLine(" example: md GLBX Future ES"); - Console.WriteLine(" md GLBX Future ES ESZ8"); - Console.WriteLine(" md GLBX Spread ES"); + Console.WriteLine(" example: md GLBX Future ES --user=bts --pass=password"); + Console.WriteLine(" md GLBX Future ES ESZ8 --user=bts --pass=password"); + Console.WriteLine(" md GLBX Spread ES --user=bts --pass=password"); Environment.Exit(1); } - static void ui_help() - { - Console.WriteLine("ui "); - Console.WriteLine("This command subscribes to market data for a specific security and writes to a UI on a specified refresh interval (in ms)."); - Console.WriteLine("Marketdata is read off the wire on one thread and posted to the GUI on another through Observable.Timer()"); - Console.WriteLine(" example: ui GLBX Future ES ESZ8 25"); - Environment.Exit(1); - } } } diff --git a/src/client/spark_sdk/spark_sdk.csproj b/src/client/spark_sdk/spark_sdk.csproj index 2fd523f62..bf27ddb55 100644 --- a/src/client/spark_sdk/spark_sdk.csproj +++ b/src/client/spark_sdk/spark_sdk.csproj @@ -18,6 +18,7 @@ true 1.0.0 + 7.2 From 0c2593cb20f08442d5da503e3d2b8762b8fe7043 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 11 Dec 2018 12:20:41 -0500 Subject: [PATCH 40/45] PR feedback --- src/client/spark_api/md/MDCombined.cs | 6 +++--- src/client/spark_api/utils/APIExtensions.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/spark_api/md/MDCombined.cs b/src/client/spark_api/md/MDCombined.cs index 57cc5ac83..e8b6915a8 100644 --- a/src/client/spark_api/md/MDCombined.cs +++ b/src/client/spark_api/md/MDCombined.cs @@ -46,13 +46,13 @@ namespace bts.md { this.security = smd.security; var bl = last_update_time; - bool b = (_book as IMDUpdate).update(smd, ref bl); + bool b = ((IMDUpdate)_book).update(smd, ref bl); var ll = last_update_time; - bool l = (_last as IMDUpdate).update(smd, ref ll); + bool l = ((IMDUpdate)_last).update(smd, ref ll); var ml = last_update_time; - bool m = (_misc as IMDUpdate).update(smd, ref ml); + bool m = ((IMDUpdate)_misc).update(smd, ref ml); last_update_time = new[] { bl, ll, ml }.Max(); return b || l || m; diff --git a/src/client/spark_api/utils/APIExtensions.cs b/src/client/spark_api/utils/APIExtensions.cs index f5382b424..eaff460fc 100644 --- a/src/client/spark_api/utils/APIExtensions.cs +++ b/src/client/spark_api/utils/APIExtensions.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; namespace mbts { - public static class APIExtensions + static class APIExtensions { public static T? TryFirst(this IEnumerable src) where T : struct { From 59a88f76a8d7c75f99e7f63c7f6acda0e9323dc6 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 12 Dec 2018 13:04:11 -0500 Subject: [PATCH 41/45] Verification.md --- doc/dev/dev_process.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/dev/dev_process.md b/doc/dev/dev_process.md index 20e02e94d..2d7445a1f 100644 --- a/doc/dev/dev_process.md +++ b/doc/dev/dev_process.md @@ -53,6 +53,19 @@ implementation phase developers should reach out to Pedro for UI reviews, architecture and design concerns as well as specification trade off concerns. +* Verification. Once code is complete think carefully about the best way +to verify that it is good before it goes to production. We don't have a +dedicated QA cycle to flush out bugs so it's important that a change be +fully tested before it's marked "Ready to Merge." For any non-trivial +change consider enlisting a 'test buddy' to help review the code and +think of test cases that you may not have considered. Stability from +release to release is especially critical right now as we develop a +reputation in the futures world. + - Code Reviews + - Unit tests + - System tests + - Manual tests + * Merge. Once a project is considered complete by developers, a PR that includes Pedro should be created (unless, as mentioned above, an early PR was already created in the development phase). Whether the PR From 4d9bce82ab33ffe73f061be14429e04ba22e20cd Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 13 Dec 2018 14:43:29 -0500 Subject: [PATCH 42/45] Add 'md channels' tool --- src/server/sparkd/md/run_md.cpp | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/server/sparkd/md/run_md.cpp b/src/server/sparkd/md/run_md.cpp index 76e337de1..c3a9e04d4 100644 --- a/src/server/sparkd/md/run_md.cpp +++ b/src/server/sparkd/md/run_md.cpp @@ -9,11 +9,13 @@ #include "lib/md/UserSymbol.h" #include "lib/md/Diag/ShmDumper.h" #include "lib/md/Diag/MDPeriodicDumper.h" +#include "lib/md/cme/MDP3Utils.h" #include "platforms/mdp3_onixs/MDP3Main.h" #include "lib/md/SecurityDB.h" #include "server/sparkd/exchange_sim/ExchangeSim.h" #include "lib/utils/thread_manager.h" + #include #include #include @@ -260,10 +262,32 @@ void run_tail(const vector& args) { md::run_periodic_dumper(products, mod, fmt); } - +void run_channels() { + auto channels = md::get_configured_cme_channels(); + for (const auto& ch : channels) { + std::cout << ch.id << " - " ; + std::set symbols; + for (const auto& s : ch.symbols) { symbols.insert(s.symbol()); } + for (const auto& s : symbols) { + std::cout << s << " "; + } + std::cout << std::endl; + } +} string help() { - return "Coconut 2.0 market data tools:\n" ; + return "Market data tools:\n" + " record \t-- Record market data to a file.\n" + " rectool \t-- Manipulate recorded market data. \n" + " cleanup \t-- Remove all persisted market data shared memory sections\n" + " dump [exchange] [platform] [hot]\n" + " replay \t-- replay recorded market data.\n" + " run \t\t-- run market data publishers.\n" + " relay \t-- relay market data from another system.\n" + " dumpsecurity \t-- print information about a specific security or all securities.\n" + " tail [count] \t-- print out books when sequence%count==0.\n" + " channels \t-- list configured cme channels.\n" + ; } void printhelp() { cout << help() << endl; @@ -282,6 +306,7 @@ void md_tool(std::vector const &args) { else if (cmd == "test_relay") relay_everything(); else if (cmd == "dumpsecurity" || cmd == "dumpsecurities") dump_db(vector(args.begin()+1, args.end())); else if (cmd == "tail") run_tail(args); + else if (cmd == "channels") run_channels(); else printhelp(); } From 5e6a0799d23b6f5a905d1dc1656338301c7e09d5 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 14 Dec 2018 10:27:15 -0500 Subject: [PATCH 43/45] Some fixes for emumba --- src/lib/md/Shm/FixedSecurity.cpp | 1 + src/lib/md/cme/MDP3Utils.h | 24 +++++++++++++++++++ .../mdp3_onixs/MDP3ListenerHelpers.h | 24 ------------------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/lib/md/Shm/FixedSecurity.cpp b/src/lib/md/Shm/FixedSecurity.cpp index 55b020b89..7f7f78787 100644 --- a/src/lib/md/Shm/FixedSecurity.cpp +++ b/src/lib/md/Shm/FixedSecurity.cpp @@ -25,6 +25,7 @@ FixedSecurity::FixedSecurity() : price_break(0), low_tick(0), high_tick(0), + cash_per_point(0), cboe_class_key(0), cme_market_segment_id(0), cme_main_fraction(0), diff --git a/src/lib/md/cme/MDP3Utils.h b/src/lib/md/cme/MDP3Utils.h index ac5f19c9c..dab13ff8d 100644 --- a/src/lib/md/cme/MDP3Utils.h +++ b/src/lib/md/cme/MDP3Utils.h @@ -75,5 +75,29 @@ inline void decode_ticks(int vtt, double mintick, FixedSecurity& dest) { } } +inline int floorlog10(int64_t m) { + bts_assert(m >= 0); + if (m < 10) return 0; + if (m < 100) return 1; + if (m < 1000) return 2; + if (m < 10000) return 3; + if (m < 100000) return 4; + if (m < 1000000) return 5; + if (m < 10000000) return 6; + if (m < 100000000) return 7; + if (m < 1000000000) return 8; + if (m < 10000000000) return 9; + if (m < 100000000000) return 10; + if (m < 1000000000000) return 11; + if (m < 10000000000000) return 12; + if (m < 100000000000000) return 13; + if (m < 1000000000000000) return 14; + if (m < 10000000000000000) return 15; + if (m < 100000000000000000) return 16; + if (m < 1000000000000000000) return 17; + return 19; +} + + }}//namespace diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3ListenerHelpers.h b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3ListenerHelpers.h index 5d323c5db..79e69bec2 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3ListenerHelpers.h +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3ListenerHelpers.h @@ -27,30 +27,6 @@ IntPrice convert_price(const OnixsPrice& price, int8_t display_factor) { return IntPrice(price.mantissa(), price.exponent() + display_factor); } - -inline int floorlog10(int64_t m) { - bts_assert(m >= 0); - if (m < 10) return 0; - if (m < 100) return 1; - if (m < 1000) return 2; - if (m < 10000) return 3; - if (m < 100000) return 4; - if (m < 1000000) return 5; - if (m < 10000000) return 6; - if (m < 100000000) return 7; - if (m < 1000000000) return 8; - if (m < 10000000000) return 9; - if (m < 100000000000) return 10; - if (m < 1000000000000) return 11; - if (m < 10000000000000) return 12; - if (m < 100000000000000) return 13; - if (m < 1000000000000000) return 14; - if (m < 10000000000000000) return 15; - if (m < 100000000000000000) return 16; - if (m < 1000000000000000000) return 17; - return 19; -} - inline datetime::LLDateTime ll_of_timestamp(const onixs::Timestamp& ts) { return datetime::ll_from_parts(ts.year(), (int)ts.month(), ts.day(), ts.hour(), ts.minute(), ts.second(), ts.millisecond()); } From e45123fd76ce635013bcd35295e920f1170c2a2a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 14 Dec 2018 12:08:54 -0500 Subject: [PATCH 44/45] adding a couple nice auth accessors --- src/client/spark_api/utils/Locator.cs | 4 ++++ src/client/spark_core/admin/AdminModelWrapper.cs | 1 + 2 files changed, 5 insertions(+) diff --git a/src/client/spark_api/utils/Locator.cs b/src/client/spark_api/utils/Locator.cs index 64bbe1711..71108aee7 100644 --- a/src/client/spark_api/utils/Locator.cs +++ b/src/client/spark_api/utils/Locator.cs @@ -16,6 +16,10 @@ namespace bts.api { return await _context.Value.login(username, password); } + static public void login_with_token(AuthTokenImmutable token) + { + _context.Value.login(token); + } static public AuthTokenImmutable? token => _context.Value.token; } } diff --git a/src/client/spark_core/admin/AdminModelWrapper.cs b/src/client/spark_core/admin/AdminModelWrapper.cs index f52f016c5..25b88ddf5 100644 --- a/src/client/spark_core/admin/AdminModelWrapper.cs +++ b/src/client/spark_core/admin/AdminModelWrapper.cs @@ -9,6 +9,7 @@ namespace bts.api.core public class AdminModelWrapper { readonly AdminDataImmutable? _admin_data; + public AdminDataImmutable? admin_data => _admin_data; readonly string _user_name; readonly List _allowed_accounts; readonly Dictionary _allowed_account_dict = new Dictionary(); From 5bb064197ff3e3630c554e889804fb255dbe2ca6 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Dec 2018 15:00:33 +0000 Subject: [PATCH 45/45] Updated release notes --- doc/user/docs/release_notes.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index c4a49f9b5..57228870c 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -1,4 +1,10 @@ # Release Notes +## 1.4.3 + +### Software Development Kit (SDK) Improvements + - Added authentication to API calls + + ## 1.4.2 ### User Interface Improvements