diff --git a/src/client/spark_websocket/Core/WebsocketConnectionGateway.cs b/src/client/spark_websocket/Core/WebsocketConnectionGateway.cs index e4ffd828a..5e79426a5 100644 --- a/src/client/spark_websocket/Core/WebsocketConnectionGateway.cs +++ b/src/client/spark_websocket/Core/WebsocketConnectionGateway.cs @@ -3,7 +3,8 @@ using System.Text; using System.Collections.Concurrent; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using System.Diagnostics.CodeAnalysis; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; namespace bts.websocket_core { public enum MessageType { @@ -430,9 +431,27 @@ namespace bts.websocket_core { _server_params = server_params; var builder = WebApplication.CreateBuilder(); builder.WebHost.UseUrls(_server_params.Uri); + var MyAllowSpecificOrigins = "_myAllowSpecificOrigins"; + builder.Services.AddLogging(builder => { + builder.AddFilter("Microsoft", Microsoft.Extensions.Logging.LogLevel.Warning) + .AddFilter("System", Microsoft.Extensions.Logging.LogLevel.Warning) + .AddFilter("NToastNotify", Microsoft.Extensions.Logging.LogLevel.Warning) + .AddConsole(); + }); + builder.Services.AddCors(options => { + options.AddPolicy(MyAllowSpecificOrigins, + policy => policy + .WithOrigins("http://localhost:3000") + .AllowAnyHeader() + .AllowAnyMethod()); + }); app = builder.Build(); app.UseWebSockets(_server_params.get_ws_options()); - + app.Use(async (context, next) => { + context.Response.Headers.Add("Access-Control-Allow-Origin", "*"); + context.Response.Headers.Add("Access-Control-Allow-Headers", "*"); + await next(); + }); app.Map(_server_params.Default_end_point, async context => { if (context.WebSockets.IsWebSocketRequest) { using (var ws = await context.WebSockets.AcceptWebSocketAsync()) { diff --git a/src/client/spark_websocket/Core/WebsocketDataSync.cs b/src/client/spark_websocket/Core/WebsocketDataSync.cs index 43f0dcc41..5fb99ae3d 100644 --- a/src/client/spark_websocket/Core/WebsocketDataSync.cs +++ b/src/client/spark_websocket/Core/WebsocketDataSync.cs @@ -6,6 +6,13 @@ namespace bts.websocket_core { using Newtonsoft.Json.Linq; using Newtonsoft.Json; using System.Collections.Concurrent; + using bts.api.core; + using bts.api.orderman; + using bts.api.admin; + using bts.co2; + using Spark.Api.Reactive; + using Spark.Api.Orders; + using Spark.Api.Admin; /// @@ -95,6 +102,14 @@ namespace bts.websocket_core { return new ClientState(); } } + // ServiceContext? service_ctx; + // ServiceContext Service_Ctx{ + // get => Log.notnull(service_ctx); + // set { + // Log.isnull(service_ctx); + // service_ctx = value; + // } + // } MarketDataClient? mdClient; MarketDataClient MdClient { @@ -143,6 +158,17 @@ namespace bts.websocket_core { Gateway = gtwy; clients = new ClientsStore(); // broadcast = new Thread(() => BroadcastToClients()); + // var service_ctx = new ServiceContext(); + // var order_service = service_ctx.locate(); + // var admin_service = service_ctx.locate(); + // var admin_client = new AdminClient(admin_service, UserTuple.admin); + // var md_relay = service_ctx.locate(); + // var md_source = new MDSource(TimeSpan.FromSeconds(0.1)); + // var sec_resolver = new SecurityResolver(md_relay, md_source.subscribe_securities()); + // var orders_client = new OrdersClient( + // order_service, admin_client, sec_resolver, TimeSpan.FromSeconds(0.1)); + + TimeSpan md_throttle = new TimeSpan(10000); MD_Source = new MDSource(md_throttle); MdClient = new(MD_Source); diff --git a/src/client/spark_websocket/spark_websocket.csproj b/src/client/spark_websocket/spark_websocket.csproj index 4c1606f2f..f79105e6d 100644 --- a/src/client/spark_websocket/spark_websocket.csproj +++ b/src/client/spark_websocket/spark_websocket.csproj @@ -15,6 +15,7 @@ +