From 0ba0753c11810d83cb58680c74fdb5397c24e112 Mon Sep 17 00:00:00 2001 From: SondreB Date: Tue, 12 May 2020 03:00:46 +0200 Subject: [PATCH 01/14] Migrate SignalR feature into WebHost - Migrate the SignalR feature into WebHost. - Further refactor WebHost from "Api" to "WebHost. - Remove the versioning support from REST API. - Enable flags to enable/disable UI, API and WS. - Generate and include XML documentation in the REST API for all features. - Add a basic example on Web Socket listener. --- src/Blockcore.sln | 7 - src/Blockcore/Configuration/NodeSettings.cs | 7 - src/Directory.Build.props | 1 + src/External/NBitcoin/Network.cs | 1 + .../Blockcore.Features.ColdStaking.csproj | 4 - .../Blockcore.Features.SignalR.csproj | 18 - .../Controllers/SignalRController.cs | 51 - .../Blockcore.Features.SignalR/Program.cs | 60 - .../SignalRFeature.cs | 147 - .../SignalRSettings.cs | 80 - .../Blockcore.Features.SignalR/Startup.cs | 57 - .../Blockcore.Features.WebHost/ApiFeature.cs | 152 - .../Blockcore.Features.WebHost.csproj | 16 +- .../Broadcasters/BroadcasterBase.cs | 8 +- .../Broadcasters/StakingBroadcaster.cs | 7 +- .../Broadcasters/WalletInfoBroadcaster.cs | 8 +- .../ConfigureSwaggerOptions.cs | 90 - .../EventSubscriptionService.cs | 12 +- .../Events/BlockConnectedClientEvent.cs | 2 +- .../Events/StakingInfoClientEvent.cs | 2 +- .../Events/TransactionReceivedClientEvent.cs | 2 +- .../Events/WalletGeneralInfoClientEvent.cs | 2 +- .../Hubs}/EventsHub.cs | 2 +- .../Hubs/NodeHub.cs | 32 + .../IClientEvent.cs | 2 +- .../IClientEventBroadcaster.cs | 4 +- .../IEventsSubscriptionService.cs | 2 +- .../KeepAliveActionFilter.cs | 2 +- .../Options/ClientEventBroadcasterSettings.cs | 7 + .../Blockcore.Features.WebHost/Program.cs | 3 +- .../Blockcore.Features.WebHost/Startup.cs | 177 +- .../UI/Shared/MainLayout.razor | 3 +- .../UI/wwwroot/js/signalr.js | 4922 +++++++++++++++++ .../UI/wwwroot/js/signalr.min.js | 17 + .../UI/wwwroot/ws-events/index.html | 60 + .../UI/wwwroot/ws-events/node.html | 60 + .../WebHostFeature.cs | 225 + .../{ApiSettings.cs => WebHostSettings.cs} | 34 +- src/Networks/Bitcoin/Bitcoin.Cli/Program.cs | 2 +- src/Networks/Bitcoin/Bitcoind/Program.cs | 2 +- src/Networks/City/City.Node/City.Node.csproj | 1 - src/Networks/City/City.Node/Program.cs | 23 +- src/Networks/Stratis/StratisDns/Program.cs | 4 +- src/Networks/Stratis/Stratisd/Program.cs | 29 +- src/Networks/Stratis/Stratisd/StratisD.csproj | 1 - src/Networks/Xds/Xdsd/Program.cs | 2 +- src/Networks/Xds/Xdsd/XdsD.csproj | 1 - src/Networks/x42/x42.Node/Program.cs | 23 +- src/Networks/x42/x42.Node/x42.Node.csproj | 1 - src/Node/Blockcore.Node/Blockcore.Node.csproj | 1 - src/Node/Blockcore.Node/NodeBuilder.cs | 2 +- src/Node/Blockcore.Node/Program.cs | 21 - .../Properties/launchSettings.json | 4 +- .../ApiSettingsTest.cs | 36 +- .../ProgramTests.cs | 4 +- .../EnvironmentMockUpHelpers/NodeBuilder.cs | 2 +- .../Runners/StratisBitcoinPosRunner.cs | 2 +- .../Runners/StratisBitcoinPowRunner.cs | 2 +- .../API/ApiSteps.cs | 4 +- .../API/MultiCallTest.cs | 2 +- .../CustomNodeBuilderTests.cs | 4 +- .../ProvenHeaderTests.cs | 2 +- .../Wallet/ColdWalletTests.cs | 2 +- .../NodeConfiguration/NodeSettingsTest.cs | 4 +- 64 files changed, 5566 insertions(+), 901 deletions(-) delete mode 100644 src/Features/Blockcore.Features.SignalR/Blockcore.Features.SignalR.csproj delete mode 100644 src/Features/Blockcore.Features.SignalR/Controllers/SignalRController.cs delete mode 100644 src/Features/Blockcore.Features.SignalR/Program.cs delete mode 100644 src/Features/Blockcore.Features.SignalR/SignalRFeature.cs delete mode 100644 src/Features/Blockcore.Features.SignalR/SignalRSettings.cs delete mode 100644 src/Features/Blockcore.Features.SignalR/Startup.cs delete mode 100644 src/Features/Blockcore.Features.WebHost/ApiFeature.cs rename src/Features/{Blockcore.Features.SignalR => Blockcore.Features.WebHost}/Broadcasters/BroadcasterBase.cs (85%) rename src/Features/{Blockcore.Features.SignalR => Blockcore.Features.WebHost}/Broadcasters/StakingBroadcaster.cs (82%) rename src/Features/{Blockcore.Features.SignalR => Blockcore.Features.WebHost}/Broadcasters/WalletInfoBroadcaster.cs (96%) delete mode 100644 src/Features/Blockcore.Features.WebHost/ConfigureSwaggerOptions.cs rename src/Features/{Blockcore.Features.SignalR => Blockcore.Features.WebHost}/EventSubscriptionService.cs (88%) rename src/Features/{Blockcore.Features.SignalR => Blockcore.Features.WebHost}/Events/BlockConnectedClientEvent.cs (94%) rename src/Features/{Blockcore.Features.SignalR => Blockcore.Features.WebHost}/Events/StakingInfoClientEvent.cs (96%) rename src/Features/{Blockcore.Features.SignalR => Blockcore.Features.WebHost}/Events/TransactionReceivedClientEvent.cs (95%) rename src/Features/{Blockcore.Features.SignalR => Blockcore.Features.WebHost}/Events/WalletGeneralInfoClientEvent.cs (93%) rename src/Features/{Blockcore.Features.SignalR => Blockcore.Features.WebHost/Hubs}/EventsHub.cs (96%) create mode 100644 src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs rename src/Features/{Blockcore.Features.SignalR => Blockcore.Features.WebHost}/IClientEvent.cs (82%) rename src/Features/{Blockcore.Features.SignalR => Blockcore.Features.WebHost}/IClientEventBroadcaster.cs (62%) rename src/Features/{Blockcore.Features.SignalR => Blockcore.Features.WebHost}/IEventsSubscriptionService.cs (69%) create mode 100644 src/Features/Blockcore.Features.WebHost/Options/ClientEventBroadcasterSettings.cs create mode 100644 src/Features/Blockcore.Features.WebHost/UI/wwwroot/js/signalr.js create mode 100644 src/Features/Blockcore.Features.WebHost/UI/wwwroot/js/signalr.min.js create mode 100644 src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-events/index.html create mode 100644 src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-events/node.html create mode 100644 src/Features/Blockcore.Features.WebHost/WebHostFeature.cs rename src/Features/Blockcore.Features.WebHost/{ApiSettings.cs => WebHostSettings.cs} (78%) diff --git a/src/Blockcore.sln b/src/Blockcore.sln index 548be5c60..dd03e63c7 100644 --- a/src/Blockcore.sln +++ b/src/Blockcore.sln @@ -63,8 +63,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.ColdStak EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.ColdStaking.Tests", "Tests\Blockcore.Features.ColdStaking.Tests\Blockcore.Features.ColdStaking.Tests.csproj", "{0FE19EFE-98D7-4243-A8CC-30BCFFFC4499}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.SignalR", "Features\Blockcore.Features.SignalR\Blockcore.Features.SignalR.csproj", "{6BBFFE59-0597-4ADA-A592-CED25C05C01A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.Diagnostic", "Features\Blockcore.Features.Diagnostic\Blockcore.Features.Diagnostic.csproj", "{53209209-7239-4FEB-BE8D-B2DF6145BBDA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StratisD", "Networks\Stratis\Stratisd\StratisD.csproj", "{B69D6038-8731-4DF3-9D93-3045C77CBDE6}" @@ -235,10 +233,6 @@ Global {0FE19EFE-98D7-4243-A8CC-30BCFFFC4499}.Debug|Any CPU.Build.0 = Debug|Any CPU {0FE19EFE-98D7-4243-A8CC-30BCFFFC4499}.Release|Any CPU.ActiveCfg = Release|Any CPU {0FE19EFE-98D7-4243-A8CC-30BCFFFC4499}.Release|Any CPU.Build.0 = Release|Any CPU - {6BBFFE59-0597-4ADA-A592-CED25C05C01A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BBFFE59-0597-4ADA-A592-CED25C05C01A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BBFFE59-0597-4ADA-A592-CED25C05C01A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BBFFE59-0597-4ADA-A592-CED25C05C01A}.Release|Any CPU.Build.0 = Release|Any CPU {53209209-7239-4FEB-BE8D-B2DF6145BBDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {53209209-7239-4FEB-BE8D-B2DF6145BBDA}.Debug|Any CPU.Build.0 = Debug|Any CPU {53209209-7239-4FEB-BE8D-B2DF6145BBDA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -334,7 +328,6 @@ Global {A8EDFB26-17B5-48C0-BF38-E521EF5476E4} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2} {072C5F7C-4B75-46C9-A54D-774DA77ED1D1} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45} {0FE19EFE-98D7-4243-A8CC-30BCFFFC4499} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2} - {6BBFFE59-0597-4ADA-A592-CED25C05C01A} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45} {53209209-7239-4FEB-BE8D-B2DF6145BBDA} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45} {B69D6038-8731-4DF3-9D93-3045C77CBDE6} = {0F6F0DC5-EC62-465B-8FC7-F24449CD7359} {221FF9A3-4BE5-44CB-91C8-885EFE06CB2E} = {78DF115B-2471-41C3-8D9C-360720855CF5} diff --git a/src/Blockcore/Configuration/NodeSettings.cs b/src/Blockcore/Configuration/NodeSettings.cs index 55ff5e391..4716d29e4 100644 --- a/src/Blockcore/Configuration/NodeSettings.cs +++ b/src/Blockcore/Configuration/NodeSettings.cs @@ -109,11 +109,6 @@ public class NodeSettings : IDisposable /// public FeeRate MinRelayTxFeeRate { get; private set; } - /// - /// If true then the node will add and start the SignalR feature. - /// - public bool EnableSignalR { get; private set; } - /// /// Initializes a new instance of the object. /// @@ -233,8 +228,6 @@ public NodeSettings(Network network = null, ProtocolVersion protocolVersion = Su this.ReadConfigurationFile(); } - this.EnableSignalR = this.ConfigReader.GetOrDefault("enableSignalR", false, this.Logger); - // Create the custom logger factory. this.LoggerFactory.AddFilters(this.Log, this.DataFolder); diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e6f893300..9d93a5c1e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -13,6 +13,7 @@ https://www.blockcore.net/assets/blockcore-256x256.png blockchain;cryptocurrency;crypto;C#;.NET;bitcoin;blockcore + true diff --git a/src/External/NBitcoin/Network.cs b/src/External/NBitcoin/Network.cs index 3a59307b0..d4f875469 100644 --- a/src/External/NBitcoin/Network.cs +++ b/src/External/NBitcoin/Network.cs @@ -129,6 +129,7 @@ public abstract class Network /// /// The default port on which SignalR broadcasts for this network. /// + [Obsolete("SignalR has been migrated into WebHost and use same port as API.")] public int DefaultSignalRPort { get; protected set; } /// diff --git a/src/Features/Blockcore.Features.ColdStaking/Blockcore.Features.ColdStaking.csproj b/src/Features/Blockcore.Features.ColdStaking/Blockcore.Features.ColdStaking.csproj index 13f36d3d1..8c079284f 100644 --- a/src/Features/Blockcore.Features.ColdStaking/Blockcore.Features.ColdStaking.csproj +++ b/src/Features/Blockcore.Features.ColdStaking/Blockcore.Features.ColdStaking.csproj @@ -8,10 +8,6 @@ true - - - - diff --git a/src/Features/Blockcore.Features.SignalR/Blockcore.Features.SignalR.csproj b/src/Features/Blockcore.Features.SignalR/Blockcore.Features.SignalR.csproj deleted file mode 100644 index da7f6f47d..000000000 --- a/src/Features/Blockcore.Features.SignalR/Blockcore.Features.SignalR.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - true - - - - - - - - - - - - - - - diff --git a/src/Features/Blockcore.Features.SignalR/Controllers/SignalRController.cs b/src/Features/Blockcore.Features.SignalR/Controllers/SignalRController.cs deleted file mode 100644 index 804a923eb..000000000 --- a/src/Features/Blockcore.Features.SignalR/Controllers/SignalRController.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Net; -using Blockcore.Utilities; -using Blockcore.Utilities.JsonErrors; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; - -namespace Blockcore.Features.SignalR.Controllers -{ - /// - /// Controller for connecting to SignalR. - /// - [Route("api/[controller]")] - public class SignalRController : Controller - { - private readonly SignalRSettings signalRSettings; - private readonly ILogger logger; - - public SignalRController(SignalRSettings signalRSettings, ILoggerFactory loggerFactory) - { - Guard.NotNull(loggerFactory, nameof(loggerFactory)); - Guard.NotNull(signalRSettings, nameof(signalRSettings)); - - this.signalRSettings = signalRSettings; - this.logger = loggerFactory.CreateLogger(); - } - - /// - /// Returns SignalR Connection Info. - /// - /// Returns SignalR Connection Info as Json {SignalRUri,SignalPort} - [Route("getConnectionInfo")] - [HttpGet] - public IActionResult GetConnectionInfo() - { - try - { - return this.Json(new - { - this.signalRSettings.SignalRUri, - this.signalRSettings.SignalPort - }); - } - catch (Exception e) - { - this.logger.LogError("Exception occurred: {0}", e.ToString()); - return ErrorHelpers.BuildErrorResponse(HttpStatusCode.BadRequest, e.Message, e.ToString()); - } - } - } -} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.SignalR/Program.cs b/src/Features/Blockcore.Features.SignalR/Program.cs deleted file mode 100644 index e4b093302..000000000 --- a/src/Features/Blockcore.Features.SignalR/Program.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using Blockcore.Utilities; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; - -namespace Blockcore.Features.SignalR -{ - public class Program - { - public static IWebHost Initialize(IEnumerable services, FullNode fullNode, - SignalRSettings settings, IWebHostBuilder webHostBuilder) - { - Guard.NotNull(fullNode, nameof(fullNode)); - Guard.NotNull(webHostBuilder, nameof(webHostBuilder)); - - Uri uri = settings.SignalRUri; - - webHostBuilder - .UseKestrel(o => o.AllowSynchronousIO = true) - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseUrls(uri.ToString()) - .ConfigureServices(collection => - { - if (services == null) return; - - // copies all the services defined for the full node to the Api. - // also copies over singleton instances already defined - foreach (ServiceDescriptor service in services) - { - // open types can't be singletons - if (service.ServiceType.IsGenericType || service.Lifetime == ServiceLifetime.Scoped) - { - collection.Add(service); - continue; - } - - object obj = fullNode.Services.ServiceProvider.GetService(service.ServiceType); - if (obj != null && service.Lifetime == ServiceLifetime.Singleton && service.ImplementationInstance == null) - { - collection.AddSingleton(service.ServiceType, obj); - } - else - { - collection.Add(service); - } - } - }) - .UseStartup(); - - IWebHost host = webHostBuilder.Build(); - - host.Start(); - - return host; - } - } -} diff --git a/src/Features/Blockcore.Features.SignalR/SignalRFeature.cs b/src/Features/Blockcore.Features.SignalR/SignalRFeature.cs deleted file mode 100644 index 487b9e568..000000000 --- a/src/Features/Blockcore.Features.SignalR/SignalRFeature.cs +++ /dev/null @@ -1,147 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Blockcore.Builder; -using Blockcore.Builder.Feature; -using Blockcore.Configuration.Logging; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using NBitcoin; - -namespace Blockcore.Features.SignalR -{ - public class SignalRFeature : FullNodeFeature - { - internal static Dictionary eventBroadcasterSettings; - private const int SignalRStopTimeoutSeconds = 10; - private readonly FullNode fullNode; - private readonly IFullNodeBuilder fullNodeBuilder; - private readonly SignalRSettings settings; - private readonly IEnumerable eventBroadcasters; - private readonly IEventsSubscriptionService eventsSubscriptionService; - private IWebHost webHost; - private readonly ILogger logger; - - public SignalRFeature( - FullNode fullNode, - IFullNodeBuilder fullNodeBuilder, - SignalRSettings settings, - ILoggerFactory loggerFactory, - IEnumerable eventBroadcasters, - IEventsSubscriptionService eventsSubscriptionService) - { - this.fullNode = fullNode; - this.fullNodeBuilder = fullNodeBuilder; - this.settings = settings; - this.eventBroadcasters = eventBroadcasters; - this.eventsSubscriptionService = eventsSubscriptionService; - this.logger = loggerFactory.CreateLogger(); - } - - public override Task InitializeAsync() - { - this.webHost = Program.Initialize(this.fullNodeBuilder.Services, this.fullNode, this.settings, new WebHostBuilder()); - - this.eventsSubscriptionService.Init(); - foreach (IClientEventBroadcaster clientEventBroadcaster in this.eventBroadcasters) - { - // Intialise with specified settings - clientEventBroadcaster.Init(eventBroadcasterSettings[clientEventBroadcaster.GetType()]); - } - - this.logger.LogInformation($"WS listening on: {Environment.NewLine}{this.settings.SignalRUri}"); - - return Task.CompletedTask; - } - - /// - /// Prints command-line help. - /// - /// The network to extract values from. - public static void PrintHelp(Network network) - { - SignalRSettings.PrintHelp(network); - } - - /// - /// Get the default configuration. - /// - /// The string builder to add the settings to. - /// The network to base the defaults off. - public static void BuildDefaultConfigurationFile(StringBuilder builder, Network network) - { - SignalRSettings.BuildDefaultConfigurationFile(builder, network); - } - - /// - public override void Dispose() - { - // Make sure we are releasing the listening ip address / port. - if (this.webHost == null) return; - this.logger.LogInformation("WS stopping on URL '{0}'.", this.settings.SignalRUri); - this.webHost.StopAsync(TimeSpan.FromSeconds(SignalRStopTimeoutSeconds)).Wait(); - this.webHost = null; - } - } - - public class SignalROptions - { - public IClientEvent[] EventsToHandle { get; set; } - - public (Type Broadcaster, ClientEventBroadcasterSettings clientEventBroadcasterSettings)[] ClientEventBroadcasters { get; set; } - } - - public class ClientEventBroadcasterSettings - { - public int BroadcastFrequencySeconds { get; set; } - } - - public static partial class IFullNodeBuilderExtensions - { - public static IFullNodeBuilder AddSignalR(this IFullNodeBuilder fullNodeBuilder, Action optionsAction = null) - { - LoggingConfiguration.RegisterFeatureNamespace("signalr"); - - var options = new SignalROptions(); - optionsAction?.Invoke(options); - - SignalRFeature.eventBroadcasterSettings = - options.ClientEventBroadcasters.ToDictionary( - pair => pair.Broadcaster, pair => pair.clientEventBroadcasterSettings); - - fullNodeBuilder.ConfigureFeature(features => - { - features - .AddFeature() - .FeatureServices(services => - { - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(fullNodeBuilder); - services.AddSingleton(options); - services.AddSingleton(); - - if (null != options.ClientEventBroadcasters) - { - foreach ((Type Broadcaster, ClientEventBroadcasterSettings clientEventBroadcasterSettings) in options.ClientEventBroadcasters) - { - if (typeof(IClientEventBroadcaster).IsAssignableFrom(Broadcaster)) - { - services.AddSingleton(typeof(IClientEventBroadcaster), Broadcaster); - } - else - { - Console.WriteLine($"Warning {Broadcaster.Name} is not of type {typeof(IClientEventBroadcaster).Name}"); - } - } - } - }); - }); - - return fullNodeBuilder; - } - } -} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.SignalR/SignalRSettings.cs b/src/Features/Blockcore.Features.SignalR/SignalRSettings.cs deleted file mode 100644 index cf63fb4fa..000000000 --- a/src/Features/Blockcore.Features.SignalR/SignalRSettings.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.Text; -using Blockcore.Configuration; -using Blockcore.Utilities; -using Microsoft.Extensions.Logging; -using NBitcoin; - -namespace Blockcore.Features.SignalR -{ - /// - /// Configuration related to the API interface. - /// - public class SignalRSettings - { - /// The default host used by the signalR when the node runs on the Stratis network. - public const string DefaultSignalRHost = "http://localhost"; - - /// Instance logger. - private readonly ILogger logger; - - /// URI to node's signal r interface. - public Uri SignalRUri { get; set; } - - /// Port of node's Signal interface. - public int SignalPort { get; set; } - - public SignalRSettings(NodeSettings nodeSettings) - { - Guard.NotNull(nodeSettings, nameof(nodeSettings)); - - this.logger = nodeSettings.LoggerFactory.CreateLogger(typeof(SignalRSettings).FullName); - - TextFileConfiguration config = nodeSettings.ConfigReader; - - string host = config.GetOrDefault("signalruri", DefaultSignalRHost, this.logger); - var uri = new Uri(host); - - // Find out which port should be used for the API. - int port = config.GetOrDefault("signalrport", nodeSettings.Network.DefaultSignalRPort, this.logger); - - // If no port is set in the API URI. - if (uri.IsDefaultPort) - { - this.SignalRUri = new Uri($"{host}:{port}"); - this.SignalPort = port; - } - else - { - this.SignalRUri = uri; - this.SignalPort = uri.Port; - } - } - - /// Prints the help information on how to configure the API settings to the logger. - /// The network to use. - public static void PrintHelp(Network network) - { - var builder = new StringBuilder(); - - builder.AppendLine($"-signalruri= URI to node's SignalR interface. Defaults to '{DefaultSignalRHost}'."); - builder.AppendLine($"-signalrport=<0-65535> Port of node's SignalR interface. Defaults to {network.DefaultAPIPort}."); - - NodeSettings.Default(network).Logger.LogInformation(builder.ToString()); - } - - /// - /// Get the default configuration. - /// - /// The string builder to add the settings to. - /// The network to base the defaults off. - public static void BuildDefaultConfigurationFile(StringBuilder builder, Network network) - { - builder.AppendLine("####API Settings####"); - builder.AppendLine($"#URI to node's API interface. Defaults to '{ DefaultSignalRHost }'."); - builder.AppendLine($"#signalruri={ DefaultSignalRHost }"); - builder.AppendLine($"#Port of node's API interface. Defaults to { network.DefaultAPIPort }."); - builder.AppendLine($"#signalrport={ network.DefaultAPIPort }"); - } - } -} diff --git a/src/Features/Blockcore.Features.SignalR/Startup.cs b/src/Features/Blockcore.Features.SignalR/Startup.cs deleted file mode 100644 index dad87f581..000000000 --- a/src/Features/Blockcore.Features.SignalR/Startup.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using Blockcore.Utilities.JsonConverters; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; - -namespace Blockcore.Features.SignalR -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddCors( - options => - { - options.AddPolicy( - "CorsPolicy", - builder => - { - var allowedDomains = new[] {"http://localhost", "http://localhost:4200"}; - - builder - .WithOrigins(allowedDomains) - .AllowAnyMethod() - .AllowAnyHeader() - .AllowCredentials(); - }); - }); - services.AddSignalR().AddNewtonsoftJsonProtocol(options => - { - var settings = new JsonSerializerSettings(); - Serializer.RegisterFrontConverters(settings); - options.PayloadSerializerSettings = settings; - }); - } - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory, - IServiceProvider serviceProvider) - { - app.UseRouting(); - - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - app.UseCors("CorsPolicy"); - app.UseEndpoints(endpoints => - { - endpoints.MapHub("/events-hub"); - }); - } - } -} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/ApiFeature.cs b/src/Features/Blockcore.Features.WebHost/ApiFeature.cs deleted file mode 100644 index 35b3a48b8..000000000 --- a/src/Features/Blockcore.Features.WebHost/ApiFeature.cs +++ /dev/null @@ -1,152 +0,0 @@ -using System; -using System.Text; -using System.Threading.Tasks; -using Blockcore.Builder; -using Blockcore.Builder.Feature; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using NBitcoin; - -namespace Blockcore.Features.WebHost -{ - /// - /// Provides an Api to the full node - /// - public sealed class ApiFeature : FullNodeFeature - { - /// How long we are willing to wait for the API to stop. - private const int ApiStopTimeoutSeconds = 10; - - private readonly IFullNodeBuilder fullNodeBuilder; - - private readonly FullNode fullNode; - - private readonly ApiSettings apiSettings; - - private readonly ApiFeatureOptions apiFeatureOptions; - - private readonly ILogger logger; - - private IWebHost webHost; - - private readonly ICertificateStore certificateStore; - - public ApiFeature( - IFullNodeBuilder fullNodeBuilder, - FullNode fullNode, - ApiFeatureOptions apiFeatureOptions, - ApiSettings apiSettings, - ILoggerFactory loggerFactory, - ICertificateStore certificateStore) - { - this.fullNodeBuilder = fullNodeBuilder; - this.fullNode = fullNode; - this.apiFeatureOptions = apiFeatureOptions; - this.apiSettings = apiSettings; - this.certificateStore = certificateStore; - this.logger = loggerFactory.CreateLogger(this.GetType().FullName); - - this.InitializeBeforeBase = true; - } - - public override Task InitializeAsync() - { - this.logger.LogInformation($"API listening on: {Environment.NewLine}{this.apiSettings.ApiUri}"); - - this.webHost = Program.Initialize(this.fullNodeBuilder.Services, this.fullNode, this.apiSettings, this.certificateStore, new WebHostBuilder()); - - if (this.apiSettings.KeepaliveTimer == null) - { - this.logger.LogTrace("(-)[KEEPALIVE_DISABLED]"); - return Task.CompletedTask; - } - - // Start the keepalive timer, if set. - // If the timer expires, the node will shut down. - this.apiSettings.KeepaliveTimer.Elapsed += (sender, args) => - { - this.logger.LogInformation($"The application will shut down because the keepalive timer has elapsed."); - - this.apiSettings.KeepaliveTimer.Stop(); - this.apiSettings.KeepaliveTimer.Enabled = false; - this.fullNode.NodeLifetime.StopApplication(); - }; - - this.apiSettings.KeepaliveTimer.Start(); - - return Task.CompletedTask; - } - - /// - /// Prints command-line help. - /// - /// The network to extract values from. - public static void PrintHelp(Network network) - { - ApiSettings.PrintHelp(network); - } - - /// - /// Get the default configuration. - /// - /// The string builder to add the settings to. - /// The network to base the defaults off. - public static void BuildDefaultConfigurationFile(StringBuilder builder, Network network) - { - ApiSettings.BuildDefaultConfigurationFile(builder, network); - } - - /// - public override void Dispose() - { - // Make sure the timer is stopped and disposed. - if (this.apiSettings.KeepaliveTimer != null) - { - this.apiSettings.KeepaliveTimer.Stop(); - this.apiSettings.KeepaliveTimer.Enabled = false; - this.apiSettings.KeepaliveTimer.Dispose(); - } - - // Make sure we are releasing the listening ip address / port. - if (this.webHost != null) - { - this.logger.LogInformation("API stopping on URL '{0}'.", this.apiSettings.ApiUri); - this.webHost.StopAsync(TimeSpan.FromSeconds(ApiStopTimeoutSeconds)).Wait(); - this.webHost = null; - } - } - } - - public sealed class ApiFeatureOptions - { - } - - /// - /// A class providing extension methods for . - /// - public static class ApiFeatureExtension - { - public static IFullNodeBuilder UseApi(this IFullNodeBuilder fullNodeBuilder, Action optionsAction = null) - { - // TODO: move the options in to the feature builder - var options = new ApiFeatureOptions(); - optionsAction?.Invoke(options); - - fullNodeBuilder.ConfigureFeature(features => - { - features - .AddFeature() - .FeatureServices(services => - { - services.AddSingleton(fullNodeBuilder); - services.AddSingleton(options); - services.AddSingleton(); - services.AddSingleton(); - }); - }); - - return fullNodeBuilder; - } - } -} diff --git a/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj b/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj index 40ddc3b9d..f4451462c 100644 --- a/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj +++ b/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj @@ -19,19 +19,31 @@ - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Features/Blockcore.Features.SignalR/Broadcasters/BroadcasterBase.cs b/src/Features/Blockcore.Features.WebHost/Broadcasters/BroadcasterBase.cs similarity index 85% rename from src/Features/Blockcore.Features.SignalR/Broadcasters/BroadcasterBase.cs rename to src/Features/Blockcore.Features.WebHost/Broadcasters/BroadcasterBase.cs index e333fd107..742e756ff 100644 --- a/src/Features/Blockcore.Features.SignalR/Broadcasters/BroadcasterBase.cs +++ b/src/Features/Blockcore.Features.WebHost/Broadcasters/BroadcasterBase.cs @@ -1,13 +1,15 @@ using System; using System.Collections.Generic; using Blockcore.AsyncWork; +using Blockcore.Features.WebHost.Hubs; +using Blockcore.Features.WebHost.Options; using Blockcore.Utilities; using Microsoft.Extensions.Logging; -namespace Blockcore.Features.SignalR.Broadcasters +namespace Blockcore.Features.WebHost.Broadcasters { /// - /// Base class for all SignalR Broadcasters + /// Base class for all Web Socket Broadcasters /// public abstract class ClientBroadcasterBase : IClientEventBroadcaster { @@ -31,7 +33,7 @@ protected ClientBroadcasterBase( public void Init(ClientEventBroadcasterSettings broadcasterSettings) { - this.logger.LogDebug($"Initialising SignalR Broadcaster {this.GetType().Name}"); + this.logger.LogDebug($"Initialising Web Socket Broadcaster {this.GetType().Name}"); this.asyncLoop = this.asyncProvider.CreateAndRunAsyncLoop( $"Broadcast {this.GetType().Name}", async token => diff --git a/src/Features/Blockcore.Features.SignalR/Broadcasters/StakingBroadcaster.cs b/src/Features/Blockcore.Features.WebHost/Broadcasters/StakingBroadcaster.cs similarity index 82% rename from src/Features/Blockcore.Features.SignalR/Broadcasters/StakingBroadcaster.cs rename to src/Features/Blockcore.Features.WebHost/Broadcasters/StakingBroadcaster.cs index e39593e19..3086c5766 100644 --- a/src/Features/Blockcore.Features.SignalR/Broadcasters/StakingBroadcaster.cs +++ b/src/Features/Blockcore.Features.WebHost/Broadcasters/StakingBroadcaster.cs @@ -1,14 +1,15 @@ using System.Collections.Generic; using Blockcore.AsyncWork; using Blockcore.Features.Miner.Interfaces; -using Blockcore.Features.SignalR.Events; +using Blockcore.Features.WebHost.Events; +using Blockcore.Features.WebHost.Hubs; using Blockcore.Utilities; using Microsoft.Extensions.Logging; -namespace Blockcore.Features.SignalR.Broadcasters +namespace Blockcore.Features.WebHost.Broadcasters { /// - /// Broadcasts current staking information to SignalR clients + /// Broadcasts current staking information to Web Socket clients /// public class StakingBroadcaster : ClientBroadcasterBase { diff --git a/src/Features/Blockcore.Features.SignalR/Broadcasters/WalletInfoBroadcaster.cs b/src/Features/Blockcore.Features.WebHost/Broadcasters/WalletInfoBroadcaster.cs similarity index 96% rename from src/Features/Blockcore.Features.SignalR/Broadcasters/WalletInfoBroadcaster.cs rename to src/Features/Blockcore.Features.WebHost/Broadcasters/WalletInfoBroadcaster.cs index 19cf3b04a..11b9f0a55 100644 --- a/src/Features/Blockcore.Features.SignalR/Broadcasters/WalletInfoBroadcaster.cs +++ b/src/Features/Blockcore.Features.WebHost/Broadcasters/WalletInfoBroadcaster.cs @@ -4,20 +4,20 @@ using System.Linq; using Blockcore.AsyncWork; using Blockcore.Connection; -using Blockcore.Features.SignalR.Events; using Blockcore.Features.Wallet; using Blockcore.Features.Wallet.Api.Models; -using Blockcore.Features.Wallet.Exceptions; using Blockcore.Features.Wallet.Interfaces; using Blockcore.Features.Wallet.Types; +using Blockcore.Features.WebHost.Events; +using Blockcore.Features.WebHost.Hubs; using Blockcore.Utilities; using Microsoft.Extensions.Logging; using NBitcoin; -namespace Blockcore.Features.SignalR.Broadcasters +namespace Blockcore.Features.WebHost.Broadcasters { /// - /// Broadcasts current staking information to SignalR clients + /// Broadcasts current staking information to Web Socket clients /// public class WalletInfoBroadcaster : ClientBroadcasterBase { diff --git a/src/Features/Blockcore.Features.WebHost/ConfigureSwaggerOptions.cs b/src/Features/Blockcore.Features.WebHost/ConfigureSwaggerOptions.cs deleted file mode 100644 index db3869d6e..000000000 --- a/src/Features/Blockcore.Features.WebHost/ConfigureSwaggerOptions.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System; -using System.IO; -using Microsoft.AspNetCore.Mvc.ApiExplorer; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; -using Microsoft.OpenApi.Models; -using Swashbuckle.AspNetCore.SwaggerGen; - -namespace Blockcore.Features.WebHost -{ - /// - /// Configures the Swagger generation options. - /// - /// This allows API versioning to define a Swagger document per API version after the - /// service has been resolved from the service container. - /// Adapted from https://github.com/microsoft/aspnet-api-versioning/blob/master/samples/aspnetcore/SwaggerSample/ConfigureSwaggerOptions.cs. - /// - public class ConfigureSwaggerOptions : IConfigureOptions - { - private const string ApiXmlFilename = "Blockcore.Api.xml"; - private const string WalletXmlFilename = "Blockcore.LightWallet.xml"; - - private readonly IApiVersionDescriptionProvider provider; - - /// - /// Initializes a new instance of the class. - /// - /// The provider used to generate Swagger documents. - public ConfigureSwaggerOptions(IApiVersionDescriptionProvider provider) - { - this.provider = provider; - } - - /// - public void Configure(SwaggerGenOptions options) - { - // Add a swagger document for each discovered API version - foreach (ApiVersionDescription description in this.provider.ApiVersionDescriptions) - { - options.SwaggerDoc(description.GroupName, CreateInfoForApiVersion(description)); - } - - //Set the comments path for the swagger json and ui. - string basePath = AppContext.BaseDirectory; - string apiXmlPath = Path.Combine(basePath, ApiXmlFilename); - string walletXmlPath = Path.Combine(basePath, WalletXmlFilename); - - if (File.Exists(apiXmlPath)) - { - options.IncludeXmlComments(apiXmlPath); - } - - if (File.Exists(walletXmlPath)) - { - options.IncludeXmlComments(walletXmlPath); - } - -#pragma warning disable CS0618 // Type or member is obsolete - options.DescribeAllEnumsAsStrings(); -#pragma warning restore CS0618 // Type or member is obsolete - } - - private static OpenApiInfo CreateInfoForApiVersion(ApiVersionDescription description) - { - var info = new OpenApiInfo() - { - Title = "Blockcore Node API", - Version = description.ApiVersion.ToString(), - Description = "Access to the Blockcore Node features.", - Contact = new OpenApiContact - { - Name = "Blockcore", - Url = new Uri("https://www.blockcore.net/") - } - }; - - if (info.Version.Contains("dev")) - { - info.Description += " This version of the API is in development and subject to change. Use an earlier version for production applications."; - } - - if (description.IsDeprecated) - { - info.Description += " This API version has been deprecated."; - } - - return info; - } - } -} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.SignalR/EventSubscriptionService.cs b/src/Features/Blockcore.Features.WebHost/EventSubscriptionService.cs similarity index 88% rename from src/Features/Blockcore.Features.SignalR/EventSubscriptionService.cs rename to src/Features/Blockcore.Features.WebHost/EventSubscriptionService.cs index 37bb78f69..1f71d294c 100644 --- a/src/Features/Blockcore.Features.SignalR/EventSubscriptionService.cs +++ b/src/Features/Blockcore.Features.WebHost/EventSubscriptionService.cs @@ -3,10 +3,12 @@ using System.Linq; using System.Reflection; using Blockcore.EventBus; +using Blockcore.Features.WebHost.Hubs; +using Blockcore.Features.WebHost.Options; using Blockcore.Signals; using Microsoft.Extensions.Logging; -namespace Blockcore.Features.SignalR +namespace Blockcore.Features.WebHost { /// /// This class subscribes to Stratis.Bitcoin.EventBus messages and proxy's them @@ -14,14 +16,14 @@ namespace Blockcore.Features.SignalR /// public class EventSubscriptionService : IEventsSubscriptionService, IDisposable { - private readonly SignalROptions options; + private readonly WebHostFeatureOptions options; private readonly ISignals signals; private readonly EventsHub eventsHub; - private readonly ILogger logger; + private readonly ILogger logger; private readonly List subscriptions = new List(); public EventSubscriptionService( - SignalROptions options, + WebHostFeatureOptions options, ILoggerFactory loggerFactory, ISignals signals, EventsHub eventsHub) @@ -29,7 +31,7 @@ public EventSubscriptionService( this.options = options; this.signals = signals; this.eventsHub = eventsHub; - this.logger = loggerFactory.CreateLogger(); + this.logger = loggerFactory.CreateLogger(); } public void Init() diff --git a/src/Features/Blockcore.Features.SignalR/Events/BlockConnectedClientEvent.cs b/src/Features/Blockcore.Features.WebHost/Events/BlockConnectedClientEvent.cs similarity index 94% rename from src/Features/Blockcore.Features.SignalR/Events/BlockConnectedClientEvent.cs rename to src/Features/Blockcore.Features.WebHost/Events/BlockConnectedClientEvent.cs index 9fc76501e..c1b4026ee 100644 --- a/src/Features/Blockcore.Features.SignalR/Events/BlockConnectedClientEvent.cs +++ b/src/Features/Blockcore.Features.WebHost/Events/BlockConnectedClientEvent.cs @@ -2,7 +2,7 @@ using Blockcore.EventBus; using Blockcore.EventBus.CoreEvents; -namespace Blockcore.Features.SignalR.Events +namespace Blockcore.Features.WebHost.Events { public class BlockConnectedClientEvent : IClientEvent { diff --git a/src/Features/Blockcore.Features.SignalR/Events/StakingInfoClientEvent.cs b/src/Features/Blockcore.Features.WebHost/Events/StakingInfoClientEvent.cs similarity index 96% rename from src/Features/Blockcore.Features.SignalR/Events/StakingInfoClientEvent.cs rename to src/Features/Blockcore.Features.WebHost/Events/StakingInfoClientEvent.cs index 285b9c859..96766d8fc 100644 --- a/src/Features/Blockcore.Features.SignalR/Events/StakingInfoClientEvent.cs +++ b/src/Features/Blockcore.Features.WebHost/Events/StakingInfoClientEvent.cs @@ -2,7 +2,7 @@ using Blockcore.EventBus; using Blockcore.Features.Miner.Api.Models; -namespace Blockcore.Features.SignalR.Events +namespace Blockcore.Features.WebHost.Events { /// /// Marker type for Client diff --git a/src/Features/Blockcore.Features.SignalR/Events/TransactionReceivedClientEvent.cs b/src/Features/Blockcore.Features.WebHost/Events/TransactionReceivedClientEvent.cs similarity index 95% rename from src/Features/Blockcore.Features.SignalR/Events/TransactionReceivedClientEvent.cs rename to src/Features/Blockcore.Features.WebHost/Events/TransactionReceivedClientEvent.cs index fc74d5b23..665d9ec2e 100644 --- a/src/Features/Blockcore.Features.SignalR/Events/TransactionReceivedClientEvent.cs +++ b/src/Features/Blockcore.Features.WebHost/Events/TransactionReceivedClientEvent.cs @@ -2,7 +2,7 @@ using Blockcore.EventBus; using Blockcore.EventBus.CoreEvents; -namespace Blockcore.Features.SignalR.Events +namespace Blockcore.Features.WebHost.Events { public class TransactionReceivedClientEvent : IClientEvent { diff --git a/src/Features/Blockcore.Features.SignalR/Events/WalletGeneralInfoClientEvent.cs b/src/Features/Blockcore.Features.WebHost/Events/WalletGeneralInfoClientEvent.cs similarity index 93% rename from src/Features/Blockcore.Features.SignalR/Events/WalletGeneralInfoClientEvent.cs rename to src/Features/Blockcore.Features.WebHost/Events/WalletGeneralInfoClientEvent.cs index 4a61ac877..c82baa7fa 100644 --- a/src/Features/Blockcore.Features.SignalR/Events/WalletGeneralInfoClientEvent.cs +++ b/src/Features/Blockcore.Features.WebHost/Events/WalletGeneralInfoClientEvent.cs @@ -3,7 +3,7 @@ using Blockcore.EventBus; using Blockcore.Features.Wallet.Api.Models; -namespace Blockcore.Features.SignalR.Events +namespace Blockcore.Features.WebHost.Events { /// /// Marker type for Client diff --git a/src/Features/Blockcore.Features.SignalR/EventsHub.cs b/src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs similarity index 96% rename from src/Features/Blockcore.Features.SignalR/EventsHub.cs rename to src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs index bf876e7e1..a64904fd9 100644 --- a/src/Features/Blockcore.Features.SignalR/EventsHub.cs +++ b/src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; -namespace Blockcore.Features.SignalR +namespace Blockcore.Features.WebHost.Hubs { public class EventsHub : Hub { diff --git a/src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs b/src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs new file mode 100644 index 000000000..e1c5b6dc7 --- /dev/null +++ b/src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR; +using Microsoft.Extensions.Logging; + +namespace Blockcore.Features.WebHost.Hubs +{ + /// + /// Node Hub can be used to perform many tasks on the node, including the majority of features available in the REST API. + /// + public class NodeHub : Hub + { + private readonly ILogger logger; + + public NodeHub(ILoggerFactory loggerFactory) + { + this.logger = loggerFactory.CreateLogger(); + } + + /// + /// Basic echo method that can be used to verify connection. + /// + /// Any message to echo back. + /// Returns the same message supplied. + public Task Message(string message) + { + return this.Clients.Caller.SendAsync("Message", message); + } + } +} diff --git a/src/Features/Blockcore.Features.SignalR/IClientEvent.cs b/src/Features/Blockcore.Features.WebHost/IClientEvent.cs similarity index 82% rename from src/Features/Blockcore.Features.SignalR/IClientEvent.cs rename to src/Features/Blockcore.Features.WebHost/IClientEvent.cs index 4d1dfa777..18b17e24a 100644 --- a/src/Features/Blockcore.Features.SignalR/IClientEvent.cs +++ b/src/Features/Blockcore.Features.WebHost/IClientEvent.cs @@ -1,7 +1,7 @@ using System; using Blockcore.EventBus; -namespace Blockcore.Features.SignalR +namespace Blockcore.Features.WebHost { public interface IClientEvent { diff --git a/src/Features/Blockcore.Features.SignalR/IClientEventBroadcaster.cs b/src/Features/Blockcore.Features.WebHost/IClientEventBroadcaster.cs similarity index 62% rename from src/Features/Blockcore.Features.SignalR/IClientEventBroadcaster.cs rename to src/Features/Blockcore.Features.WebHost/IClientEventBroadcaster.cs index 1067d5f37..a12c2ef15 100644 --- a/src/Features/Blockcore.Features.SignalR/IClientEventBroadcaster.cs +++ b/src/Features/Blockcore.Features.WebHost/IClientEventBroadcaster.cs @@ -1,4 +1,6 @@ -namespace Blockcore.Features.SignalR +using Blockcore.Features.WebHost.Options; + +namespace Blockcore.Features.WebHost { public interface IClientEventBroadcaster { diff --git a/src/Features/Blockcore.Features.SignalR/IEventsSubscriptionService.cs b/src/Features/Blockcore.Features.WebHost/IEventsSubscriptionService.cs similarity index 69% rename from src/Features/Blockcore.Features.SignalR/IEventsSubscriptionService.cs rename to src/Features/Blockcore.Features.WebHost/IEventsSubscriptionService.cs index d44da2c48..7dc668745 100644 --- a/src/Features/Blockcore.Features.SignalR/IEventsSubscriptionService.cs +++ b/src/Features/Blockcore.Features.WebHost/IEventsSubscriptionService.cs @@ -1,4 +1,4 @@ -namespace Blockcore.Features.SignalR +namespace Blockcore.Features.WebHost { public interface IEventsSubscriptionService { diff --git a/src/Features/Blockcore.Features.WebHost/KeepAliveActionFilter.cs b/src/Features/Blockcore.Features.WebHost/KeepAliveActionFilter.cs index bc83f0f5a..27518c852 100644 --- a/src/Features/Blockcore.Features.WebHost/KeepAliveActionFilter.cs +++ b/src/Features/Blockcore.Features.WebHost/KeepAliveActionFilter.cs @@ -18,7 +18,7 @@ public class KeepaliveActionFilter : IAsyncActionFilter /// Initializes a new instance of the class. /// /// The API settings. - public KeepaliveActionFilter(ApiSettings apiSettings) + public KeepaliveActionFilter(WebHostSettings apiSettings) { if (apiSettings == null) { diff --git a/src/Features/Blockcore.Features.WebHost/Options/ClientEventBroadcasterSettings.cs b/src/Features/Blockcore.Features.WebHost/Options/ClientEventBroadcasterSettings.cs new file mode 100644 index 000000000..63633670a --- /dev/null +++ b/src/Features/Blockcore.Features.WebHost/Options/ClientEventBroadcasterSettings.cs @@ -0,0 +1,7 @@ +namespace Blockcore.Features.WebHost.Options +{ + public class ClientEventBroadcasterSettings + { + public int BroadcastFrequencySeconds { get; set; } + } +} diff --git a/src/Features/Blockcore.Features.WebHost/Program.cs b/src/Features/Blockcore.Features.WebHost/Program.cs index ba9d16e22..e289d441a 100644 --- a/src/Features/Blockcore.Features.WebHost/Program.cs +++ b/src/Features/Blockcore.Features.WebHost/Program.cs @@ -17,7 +17,7 @@ namespace Blockcore.Features.WebHost public class Program { public static IWebHost Initialize(IEnumerable services, FullNode fullNode, - ApiSettings apiSettings, ICertificateStore store, IWebHostBuilder webHostBuilder) + WebHostSettings apiSettings, ICertificateStore store, IWebHostBuilder webHostBuilder) { Guard.NotNull(fullNode, nameof(fullNode)); Guard.NotNull(webHostBuilder, nameof(webHostBuilder)); @@ -43,7 +43,6 @@ public static IWebHost Initialize(IEnumerable services, FullN } }) .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() .UseUrls(apiUri.ToString()) .ConfigureServices(collection => { diff --git a/src/Features/Blockcore.Features.WebHost/Startup.cs b/src/Features/Blockcore.Features.WebHost/Startup.cs index 86da2b421..d39ed2807 100644 --- a/src/Features/Blockcore.Features.WebHost/Startup.cs +++ b/src/Features/Blockcore.Features.WebHost/Startup.cs @@ -1,14 +1,16 @@ -using Blockcore.Utilities.JsonConverters; +using System; +using System.IO; +using System.Linq; +using Blockcore.Features.WebHost.Hubs; +using Blockcore.Utilities.JsonConverters; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Mvc.ApiExplorer; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.AspNetCore.Mvc.Versioning; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Swashbuckle.AspNetCore.SwaggerGen; +using Microsoft.OpenApi.Models; +using Newtonsoft.Json; using Swashbuckle.AspNetCore.SwaggerUI; namespace Blockcore.Features.WebHost @@ -35,6 +37,8 @@ public Startup(IWebHostEnvironment env, IFullNode fullNode) // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { + WebHostSettings webHostSettings = fullNode.Services.ServiceProvider.GetService(); + services.AddLogging(loggingBuilder => { loggingBuilder.AddConfiguration(this.Configuration.GetSection("Logging")); @@ -42,15 +46,6 @@ public void ConfigureServices(IServiceCollection services) loggingBuilder.AddDebug(); }); - services.AddRazorPages(); - services.AddServerSideBlazor(); - - services.Configure(options => - { - // The UI elements moved nder the UI folder - options.RootDirectory = "/UI/Pages"; - }); - // Add service and create Policy to allow Cross-Origin Requests services.AddCors ( @@ -62,7 +57,7 @@ public void ConfigureServices(IServiceCollection services) builder => { - var allowedDomains = new[] { "http://localhost", "http://localhost:4200" }; + var allowedDomains = new[] { "http://localhost", "http://localhost:4200", "http://localhost:8080" }; builder .WithOrigins(allowedDomains) @@ -73,15 +68,40 @@ public void ConfigureServices(IServiceCollection services) ); }); - // Add framework services. - services.AddMvc(options => + if (webHostSettings.EnableUI) + { + services.AddRazorPages(); + + services.AddServerSideBlazor(); + + services.Configure(options => + { + // The UI elements moved under the UI folder + options.RootDirectory = "/UI/Pages"; + }); + } + + if (webHostSettings.EnableWS) + { + services.AddSignalR().AddNewtonsoftJsonProtocol(options => + { + var settings = new JsonSerializerSettings(); + Serializer.RegisterFrontConverters(settings); + options.PayloadSerializerSettings = settings; + }); + } + + if (webHostSettings.EnableAPI) + { + services.AddMvc(options => { options.Filters.Add(typeof(LoggingActionFilter)); #pragma warning disable ASP0000 // Do not call 'IServiceCollection.BuildServiceProvider' in 'ConfigureServices' ServiceProvider serviceProvider = services.BuildServiceProvider(); #pragma warning restore ASP0000 // Do not call 'IServiceCollection.BuildServiceProvider' in 'ConfigureServices' - var apiSettings = (ApiSettings)serviceProvider.GetRequiredService(typeof(ApiSettings)); + + var apiSettings = (WebHostSettings)serviceProvider.GetRequiredService(typeof(WebHostSettings)); if (apiSettings.KeepaliveTimer != null) { options.Filters.Add(typeof(KeepaliveActionFilter)); @@ -91,39 +111,67 @@ public void ConfigureServices(IServiceCollection services) .AddNewtonsoftJson(options => Serializer.RegisterFrontConverters(options.SerializerSettings)) .AddControllers(this.fullNode.Services.Features, services); - // Enable API versioning. - // Note much of this is borrowed from https://github.com/microsoft/aspnet-api-versioning/blob/master/samples/aspnetcore/SwaggerSample/Startup.cs - services.AddApiVersioning(options => - { - // Our versions are configured to be set via URL path, no need to read from querystring etc. - options.ApiVersionReader = new UrlSegmentApiVersionReader(); - - // When no API version is specified, redirect to version 1. - options.AssumeDefaultVersionWhenUnspecified = true; - }); - - // Add the versioned API explorer, which adds the IApiVersionDescriptionProvider service and allows Swagger integration. - services.AddVersionedApiExplorer( + services.AddSwaggerGen( options => { - // Format the version as "'v'major[.minor][-status]" - options.GroupNameFormat = "'v'VVV"; + string assemblyVersion = typeof(Startup).Assembly.GetName().Version.ToString(); + + options.SwaggerDoc("node", + new OpenApiInfo + { + Title = "Blockcore Node API", + Version = assemblyVersion, + Description = "Access to the Blockcore Node features.", + Contact = new OpenApiContact + { + Name = "Blockcore", + Url = new Uri("https://www.blockcore.net/") + } + }); + + string[] ApiXmlDocuments = new string[] + { + "Blockcore.xml", + "Blockcore.NBitcoin.xml", + "Blockcore.Features.WebHost.xml", + "Blockcore.Features.Wallet.xml", + "Blockcore.Features.RPC.xml", + "Blockcore.Features.Miner.xml", + "Blockcore.Features.MemoryPool.xml", + "Blockcore.Features.Consensus.xml", + "Blockcore.Features.BlockStore.xml", + "Blockcore.Features.ColdStaking.xml" + }; + + // Include XML documentation files. + string basePath = AppContext.BaseDirectory; + + foreach (string xmlPath in ApiXmlDocuments.Select(xmlDocument => Path.Combine(basePath, xmlDocument))) + { + if (File.Exists(xmlPath)) + { + options.IncludeXmlComments(xmlPath); + } + } - // Substitute the version into the URLs in the swagger interface where we would otherwise see {version:apiVersion} - options.SubstituteApiVersionInUrl = true; - }); +#pragma warning disable CS0618 // Type or member is obsolete + options.DescribeAllEnumsAsStrings(); +#pragma warning restore CS0618 // Type or member is obsolete - // Add custom Options injectable for Swagger. This is injected with the IApiVersionDescriptionProvider service from above. - services.AddTransient, ConfigureSwaggerOptions>(); + // options.DescribeStringEnumsInCamelCase(); + }); - // Register the Swagger generator. This will use the options we injected just above. - services.AddSwaggerGen(); + services.AddSwaggerGenNewtonsoftSupport(); // explicit opt-in - needs to be placed after AddSwaggerGen() + } } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory, IApiVersionDescriptionProvider provider) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { + WebHostSettings webHostSettings = fullNode.Services.ServiceProvider.GetService(); + app.UseStaticFiles(); + app.UseRouting(); app.UseCors("CorsPolicy"); @@ -133,29 +181,42 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF app.UseEndpoints(endpoints => { - endpoints.MapControllers(); - }); + if (webHostSettings.EnableAPI) + { + endpoints.MapControllers(); + } - app.UseEndpoints(endpoints => - { - endpoints.MapBlazorHub(); - endpoints.MapFallbackToPage("/_Host"); - }); + if (webHostSettings.EnableWS) + { + endpoints.MapHub("/events-hub"); + endpoints.MapHub("/ws"); + } - // Enable middleware to serve generated Swagger as a JSON endpoint. - app.UseSwagger(); + if (webHostSettings.EnableUI) + { + endpoints.MapBlazorHub(); + endpoints.MapFallbackToPage("/_Host"); + } + }); - // Enable middleware to serve swagger-ui (HTML, JS, CSS etc.) - app.UseSwaggerUI(c => + if (webHostSettings.EnableAPI) { - c.DefaultModelRendering(ModelRendering.Model); + app.UseSwagger(c => + { + c.RouteTemplate = "docs/{documentName}/openapi.json"; + }); - // Build a swagger endpoint for each discovered API version - foreach (ApiVersionDescription description in provider.ApiVersionDescriptions) + app.UseSwaggerUI(c => { - c.SwaggerEndpoint($"/swagger/{description.GroupName}/swagger.json", description.GroupName.ToUpperInvariant()); - } - }); + c.DefaultModelRendering(ModelRendering.Model); + + app.UseSwaggerUI(c => + { + c.RoutePrefix = "docs"; + c.SwaggerEndpoint("/docs/node/openapi.json", "Blockcore Node API"); + }); + }); + } } } } \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/UI/Shared/MainLayout.razor b/src/Features/Blockcore.Features.WebHost/UI/Shared/MainLayout.razor index a4d6ee6b0..3427970b3 100644 --- a/src/Features/Blockcore.Features.WebHost/UI/Shared/MainLayout.razor +++ b/src/Features/Blockcore.Features.WebHost/UI/Shared/MainLayout.razor @@ -6,7 +6,8 @@
- Swagger + Open API + Web Socket Blockcore
diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/js/signalr.js b/src/Features/Blockcore.Features.WebHost/UI/wwwroot/js/signalr.js new file mode 100644 index 000000000..d8ed4db9d --- /dev/null +++ b/src/Features/Blockcore.Features.WebHost/UI/wwwroot/js/signalr.js @@ -0,0 +1,4922 @@ +(function webpackUniversalModuleDefinition(root, factory) { + if(typeof exports === 'object' && typeof module === 'object') + module.exports = factory(); + else if(typeof define === 'function' && define.amd) + define([], factory); + else if(typeof exports === 'object') + exports["signalR"] = factory(); + else + root["signalR"] = factory(); +})(window, function() { +return /******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) { +/******/ return installedModules[moduleId].exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); +/******/ } +/******/ }; +/******/ +/******/ // define __esModule on exports +/******/ __webpack_require__.r = function(exports) { +/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { +/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); +/******/ } +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; +/******/ +/******/ // create a fake namespace object +/******/ // mode & 1: value is a module id, require it +/******/ // mode & 2: merge all properties of value into the ns +/******/ // mode & 4: return value when already ns object +/******/ // mode & 8|1: behave like require +/******/ __webpack_require__.t = function(value, mode) { +/******/ if(mode & 1) value = __webpack_require__(value); +/******/ if(mode & 8) return value; +/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; +/******/ var ns = Object.create(null); +/******/ __webpack_require__.r(ns); +/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); +/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); +/******/ return ns; +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 0); +/******/ }) +/************************************************************************/ +/******/ ([ +/* 0 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony import */ var es6_promise_dist_es6_promise_auto_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1); +/* harmony import */ var es6_promise_dist_es6_promise_auto_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(es6_promise_dist_es6_promise_auto_js__WEBPACK_IMPORTED_MODULE_0__); +/* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VERSION", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["VERSION"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AbortError", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["AbortError"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HttpError", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["HttpError"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["TimeoutError"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HttpClient", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["HttpClient"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HttpResponse", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["HttpResponse"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "DefaultHttpClient", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["DefaultHttpClient"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HubConnection", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["HubConnection"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HubConnectionState", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["HubConnectionState"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HubConnectionBuilder", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["HubConnectionBuilder"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MessageType", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["MessageType"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "LogLevel", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["LogLevel"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HttpTransportType", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["HttpTransportType"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TransferFormat", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["TransferFormat"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NullLogger", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["NullLogger"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "JsonHubProtocol", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["JsonHubProtocol"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _index__WEBPACK_IMPORTED_MODULE_1__["Subject"]; }); + +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// This is where we add any polyfills we'll need for the browser. It is the entry module for browser-specific builds. + +// Copy from Array.prototype into Uint8Array to polyfill on IE. It's OK because the implementations of indexOf and slice use properties +// that exist on Uint8Array with the same name, and JavaScript is magic. +// We make them 'writable' because the Buffer polyfill messes with it as well. +if (!Uint8Array.prototype.indexOf) { + Object.defineProperty(Uint8Array.prototype, "indexOf", { + value: Array.prototype.indexOf, + writable: true, + }); +} +if (!Uint8Array.prototype.slice) { + Object.defineProperty(Uint8Array.prototype, "slice", { + // wrap the slice in Uint8Array so it looks like a Uint8Array.slice call + // tslint:disable-next-line:object-literal-shorthand + value: function (start, end) { return new Uint8Array(Array.prototype.slice.call(this, start, end)); }, + writable: true, + }); +} +if (!Uint8Array.prototype.forEach) { + Object.defineProperty(Uint8Array.prototype, "forEach", { + value: Array.prototype.forEach, + writable: true, + }); +} + + + +/***/ }), +/* 1 */ +/***/ (function(module, exports, __webpack_require__) { + +/* WEBPACK VAR INJECTION */(function(global) {var require;/*! + * @overview es6-promise - a tiny implementation of Promises/A+. + * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald) + * @license Licensed under MIT license + * See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE + * @version v4.2.2+97478eb6 + */ + +(function (global, factory) { + true ? module.exports = factory() : + undefined; +}(this, (function () { 'use strict'; + +function objectOrFunction(x) { + var type = typeof x; + return x !== null && (type === 'object' || type === 'function'); +} + +function isFunction(x) { + return typeof x === 'function'; +} + + + +var _isArray = void 0; +if (Array.isArray) { + _isArray = Array.isArray; +} else { + _isArray = function (x) { + return Object.prototype.toString.call(x) === '[object Array]'; + }; +} + +var isArray = _isArray; + +var len = 0; +var vertxNext = void 0; +var customSchedulerFn = void 0; + +var asap = function asap(callback, arg) { + queue[len] = callback; + queue[len + 1] = arg; + len += 2; + if (len === 2) { + // If len is 2, that means that we need to schedule an async flush. + // If additional callbacks are queued before the queue is flushed, they + // will be processed by this flush that we are scheduling. + if (customSchedulerFn) { + customSchedulerFn(flush); + } else { + scheduleFlush(); + } + } +}; + +function setScheduler(scheduleFn) { + customSchedulerFn = scheduleFn; +} + +function setAsap(asapFn) { + asap = asapFn; +} + +var browserWindow = typeof window !== 'undefined' ? window : undefined; +var browserGlobal = browserWindow || {}; +var BrowserMutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver; +var isNode = typeof self === 'undefined' && typeof process !== 'undefined' && {}.toString.call(process) === '[object process]'; + +// test for web worker but not in IE10 +var isWorker = typeof Uint8ClampedArray !== 'undefined' && typeof importScripts !== 'undefined' && typeof MessageChannel !== 'undefined'; + +// node +function useNextTick() { + // node version 0.10.x displays a deprecation warning when nextTick is used recursively + // see https://github.com/cujojs/when/issues/410 for details + return function () { + return process.nextTick(flush); + }; +} + +// vertx +function useVertxTimer() { + if (typeof vertxNext !== 'undefined') { + return function () { + vertxNext(flush); + }; + } + + return useSetTimeout(); +} + +function useMutationObserver() { + var iterations = 0; + var observer = new BrowserMutationObserver(flush); + var node = document.createTextNode(''); + observer.observe(node, { characterData: true }); + + return function () { + node.data = iterations = ++iterations % 2; + }; +} + +// web worker +function useMessageChannel() { + var channel = new MessageChannel(); + channel.port1.onmessage = flush; + return function () { + return channel.port2.postMessage(0); + }; +} + +function useSetTimeout() { + // Store setTimeout reference so es6-promise will be unaffected by + // other code modifying setTimeout (like sinon.useFakeTimers()) + var globalSetTimeout = setTimeout; + return function () { + return globalSetTimeout(flush, 1); + }; +} + +var queue = new Array(1000); +function flush() { + for (var i = 0; i < len; i += 2) { + var callback = queue[i]; + var arg = queue[i + 1]; + + callback(arg); + + queue[i] = undefined; + queue[i + 1] = undefined; + } + + len = 0; +} + +function attemptVertx() { + try { + var r = require; + var vertx = __webpack_require__(!(function webpackMissingModule() { var e = new Error("Cannot find module 'vertx'"); e.code = 'MODULE_NOT_FOUND'; throw e; }())); + vertxNext = vertx.runOnLoop || vertx.runOnContext; + return useVertxTimer(); + } catch (e) { + return useSetTimeout(); + } +} + +var scheduleFlush = void 0; +// Decide what async method to use to triggering processing of queued callbacks: +if (isNode) { + scheduleFlush = useNextTick(); +} else if (BrowserMutationObserver) { + scheduleFlush = useMutationObserver(); +} else if (isWorker) { + scheduleFlush = useMessageChannel(); +} else if (browserWindow === undefined && "function" === 'function') { + scheduleFlush = attemptVertx(); +} else { + scheduleFlush = useSetTimeout(); +} + +function then(onFulfillment, onRejection) { + var parent = this; + + var child = new this.constructor(noop); + + if (child[PROMISE_ID] === undefined) { + makePromise(child); + } + + var _state = parent._state; + + + if (_state) { + var callback = arguments[_state - 1]; + asap(function () { + return invokeCallback(_state, child, callback, parent._result); + }); + } else { + subscribe(parent, child, onFulfillment, onRejection); + } + + return child; +} + +/** + `Promise.resolve` returns a promise that will become resolved with the + passed `value`. It is shorthand for the following: + + ```javascript + let promise = new Promise(function(resolve, reject){ + resolve(1); + }); + + promise.then(function(value){ + // value === 1 + }); + ``` + + Instead of writing the above, your code now simply becomes the following: + + ```javascript + let promise = Promise.resolve(1); + + promise.then(function(value){ + // value === 1 + }); + ``` + + @method resolve + @static + @param {Any} value value that the returned promise will be resolved with + Useful for tooling. + @return {Promise} a promise that will become fulfilled with the given + `value` +*/ +function resolve$1(object) { + /*jshint validthis:true */ + var Constructor = this; + + if (object && typeof object === 'object' && object.constructor === Constructor) { + return object; + } + + var promise = new Constructor(noop); + resolve(promise, object); + return promise; +} + +var PROMISE_ID = Math.random().toString(36).substring(16); + +function noop() {} + +var PENDING = void 0; +var FULFILLED = 1; +var REJECTED = 2; + +var GET_THEN_ERROR = new ErrorObject(); + +function selfFulfillment() { + return new TypeError("You cannot resolve a promise with itself"); +} + +function cannotReturnOwn() { + return new TypeError('A promises callback cannot return that same promise.'); +} + +function getThen(promise) { + try { + return promise.then; + } catch (error) { + GET_THEN_ERROR.error = error; + return GET_THEN_ERROR; + } +} + +function tryThen(then$$1, value, fulfillmentHandler, rejectionHandler) { + try { + then$$1.call(value, fulfillmentHandler, rejectionHandler); + } catch (e) { + return e; + } +} + +function handleForeignThenable(promise, thenable, then$$1) { + asap(function (promise) { + var sealed = false; + var error = tryThen(then$$1, thenable, function (value) { + if (sealed) { + return; + } + sealed = true; + if (thenable !== value) { + resolve(promise, value); + } else { + fulfill(promise, value); + } + }, function (reason) { + if (sealed) { + return; + } + sealed = true; + + reject(promise, reason); + }, 'Settle: ' + (promise._label || ' unknown promise')); + + if (!sealed && error) { + sealed = true; + reject(promise, error); + } + }, promise); +} + +function handleOwnThenable(promise, thenable) { + if (thenable._state === FULFILLED) { + fulfill(promise, thenable._result); + } else if (thenable._state === REJECTED) { + reject(promise, thenable._result); + } else { + subscribe(thenable, undefined, function (value) { + return resolve(promise, value); + }, function (reason) { + return reject(promise, reason); + }); + } +} + +function handleMaybeThenable(promise, maybeThenable, then$$1) { + if (maybeThenable.constructor === promise.constructor && then$$1 === then && maybeThenable.constructor.resolve === resolve$1) { + handleOwnThenable(promise, maybeThenable); + } else { + if (then$$1 === GET_THEN_ERROR) { + reject(promise, GET_THEN_ERROR.error); + GET_THEN_ERROR.error = null; + } else if (then$$1 === undefined) { + fulfill(promise, maybeThenable); + } else if (isFunction(then$$1)) { + handleForeignThenable(promise, maybeThenable, then$$1); + } else { + fulfill(promise, maybeThenable); + } + } +} + +function resolve(promise, value) { + if (promise === value) { + reject(promise, selfFulfillment()); + } else if (objectOrFunction(value)) { + handleMaybeThenable(promise, value, getThen(value)); + } else { + fulfill(promise, value); + } +} + +function publishRejection(promise) { + if (promise._onerror) { + promise._onerror(promise._result); + } + + publish(promise); +} + +function fulfill(promise, value) { + if (promise._state !== PENDING) { + return; + } + + promise._result = value; + promise._state = FULFILLED; + + if (promise._subscribers.length !== 0) { + asap(publish, promise); + } +} + +function reject(promise, reason) { + if (promise._state !== PENDING) { + return; + } + promise._state = REJECTED; + promise._result = reason; + + asap(publishRejection, promise); +} + +function subscribe(parent, child, onFulfillment, onRejection) { + var _subscribers = parent._subscribers; + var length = _subscribers.length; + + + parent._onerror = null; + + _subscribers[length] = child; + _subscribers[length + FULFILLED] = onFulfillment; + _subscribers[length + REJECTED] = onRejection; + + if (length === 0 && parent._state) { + asap(publish, parent); + } +} + +function publish(promise) { + var subscribers = promise._subscribers; + var settled = promise._state; + + if (subscribers.length === 0) { + return; + } + + var child = void 0, + callback = void 0, + detail = promise._result; + + for (var i = 0; i < subscribers.length; i += 3) { + child = subscribers[i]; + callback = subscribers[i + settled]; + + if (child) { + invokeCallback(settled, child, callback, detail); + } else { + callback(detail); + } + } + + promise._subscribers.length = 0; +} + +function ErrorObject() { + this.error = null; +} + +var TRY_CATCH_ERROR = new ErrorObject(); + +function tryCatch(callback, detail) { + try { + return callback(detail); + } catch (e) { + TRY_CATCH_ERROR.error = e; + return TRY_CATCH_ERROR; + } +} + +function invokeCallback(settled, promise, callback, detail) { + var hasCallback = isFunction(callback), + value = void 0, + error = void 0, + succeeded = void 0, + failed = void 0; + + if (hasCallback) { + value = tryCatch(callback, detail); + + if (value === TRY_CATCH_ERROR) { + failed = true; + error = value.error; + value.error = null; + } else { + succeeded = true; + } + + if (promise === value) { + reject(promise, cannotReturnOwn()); + return; + } + } else { + value = detail; + succeeded = true; + } + + if (promise._state !== PENDING) { + // noop + } else if (hasCallback && succeeded) { + resolve(promise, value); + } else if (failed) { + reject(promise, error); + } else if (settled === FULFILLED) { + fulfill(promise, value); + } else if (settled === REJECTED) { + reject(promise, value); + } +} + +function initializePromise(promise, resolver) { + try { + resolver(function resolvePromise(value) { + resolve(promise, value); + }, function rejectPromise(reason) { + reject(promise, reason); + }); + } catch (e) { + reject(promise, e); + } +} + +var id = 0; +function nextId() { + return id++; +} + +function makePromise(promise) { + promise[PROMISE_ID] = id++; + promise._state = undefined; + promise._result = undefined; + promise._subscribers = []; +} + +function validationError() { + return new Error('Array Methods must be provided an Array'); +} + +function validationError() { + return new Error('Array Methods must be provided an Array'); +} + +var Enumerator = function () { + function Enumerator(Constructor, input) { + this._instanceConstructor = Constructor; + this.promise = new Constructor(noop); + + if (!this.promise[PROMISE_ID]) { + makePromise(this.promise); + } + + if (isArray(input)) { + this.length = input.length; + this._remaining = input.length; + + this._result = new Array(this.length); + + if (this.length === 0) { + fulfill(this.promise, this._result); + } else { + this.length = this.length || 0; + this._enumerate(input); + if (this._remaining === 0) { + fulfill(this.promise, this._result); + } + } + } else { + reject(this.promise, validationError()); + } + } + + Enumerator.prototype._enumerate = function _enumerate(input) { + for (var i = 0; this._state === PENDING && i < input.length; i++) { + this._eachEntry(input[i], i); + } + }; + + Enumerator.prototype._eachEntry = function _eachEntry(entry, i) { + var c = this._instanceConstructor; + var resolve$$1 = c.resolve; + + + if (resolve$$1 === resolve$1) { + var _then = getThen(entry); + + if (_then === then && entry._state !== PENDING) { + this._settledAt(entry._state, i, entry._result); + } else if (typeof _then !== 'function') { + this._remaining--; + this._result[i] = entry; + } else if (c === Promise$2) { + var promise = new c(noop); + handleMaybeThenable(promise, entry, _then); + this._willSettleAt(promise, i); + } else { + this._willSettleAt(new c(function (resolve$$1) { + return resolve$$1(entry); + }), i); + } + } else { + this._willSettleAt(resolve$$1(entry), i); + } + }; + + Enumerator.prototype._settledAt = function _settledAt(state, i, value) { + var promise = this.promise; + + + if (promise._state === PENDING) { + this._remaining--; + + if (state === REJECTED) { + reject(promise, value); + } else { + this._result[i] = value; + } + } + + if (this._remaining === 0) { + fulfill(promise, this._result); + } + }; + + Enumerator.prototype._willSettleAt = function _willSettleAt(promise, i) { + var enumerator = this; + + subscribe(promise, undefined, function (value) { + return enumerator._settledAt(FULFILLED, i, value); + }, function (reason) { + return enumerator._settledAt(REJECTED, i, reason); + }); + }; + + return Enumerator; +}(); + +/** + `Promise.all` accepts an array of promises, and returns a new promise which + is fulfilled with an array of fulfillment values for the passed promises, or + rejected with the reason of the first passed promise to be rejected. It casts all + elements of the passed iterable to promises as it runs this algorithm. + + Example: + + ```javascript + let promise1 = resolve(1); + let promise2 = resolve(2); + let promise3 = resolve(3); + let promises = [ promise1, promise2, promise3 ]; + + Promise.all(promises).then(function(array){ + // The array here would be [ 1, 2, 3 ]; + }); + ``` + + If any of the `promises` given to `all` are rejected, the first promise + that is rejected will be given as an argument to the returned promises's + rejection handler. For example: + + Example: + + ```javascript + let promise1 = resolve(1); + let promise2 = reject(new Error("2")); + let promise3 = reject(new Error("3")); + let promises = [ promise1, promise2, promise3 ]; + + Promise.all(promises).then(function(array){ + // Code here never runs because there are rejected promises! + }, function(error) { + // error.message === "2" + }); + ``` + + @method all + @static + @param {Array} entries array of promises + @param {String} label optional string for labeling the promise. + Useful for tooling. + @return {Promise} promise that is fulfilled when all `promises` have been + fulfilled, or rejected if any of them become rejected. + @static +*/ +function all(entries) { + return new Enumerator(this, entries).promise; +} + +/** + `Promise.race` returns a new promise which is settled in the same way as the + first passed promise to settle. + + Example: + + ```javascript + let promise1 = new Promise(function(resolve, reject){ + setTimeout(function(){ + resolve('promise 1'); + }, 200); + }); + + let promise2 = new Promise(function(resolve, reject){ + setTimeout(function(){ + resolve('promise 2'); + }, 100); + }); + + Promise.race([promise1, promise2]).then(function(result){ + // result === 'promise 2' because it was resolved before promise1 + // was resolved. + }); + ``` + + `Promise.race` is deterministic in that only the state of the first + settled promise matters. For example, even if other promises given to the + `promises` array argument are resolved, but the first settled promise has + become rejected before the other promises became fulfilled, the returned + promise will become rejected: + + ```javascript + let promise1 = new Promise(function(resolve, reject){ + setTimeout(function(){ + resolve('promise 1'); + }, 200); + }); + + let promise2 = new Promise(function(resolve, reject){ + setTimeout(function(){ + reject(new Error('promise 2')); + }, 100); + }); + + Promise.race([promise1, promise2]).then(function(result){ + // Code here never runs + }, function(reason){ + // reason.message === 'promise 2' because promise 2 became rejected before + // promise 1 became fulfilled + }); + ``` + + An example real-world use case is implementing timeouts: + + ```javascript + Promise.race([ajax('foo.json'), timeout(5000)]) + ``` + + @method race + @static + @param {Array} promises array of promises to observe + Useful for tooling. + @return {Promise} a promise which settles in the same way as the first passed + promise to settle. +*/ +function race(entries) { + /*jshint validthis:true */ + var Constructor = this; + + if (!isArray(entries)) { + return new Constructor(function (_, reject) { + return reject(new TypeError('You must pass an array to race.')); + }); + } else { + return new Constructor(function (resolve, reject) { + var length = entries.length; + for (var i = 0; i < length; i++) { + Constructor.resolve(entries[i]).then(resolve, reject); + } + }); + } +} + +/** + `Promise.reject` returns a promise rejected with the passed `reason`. + It is shorthand for the following: + + ```javascript + let promise = new Promise(function(resolve, reject){ + reject(new Error('WHOOPS')); + }); + + promise.then(function(value){ + // Code here doesn't run because the promise is rejected! + }, function(reason){ + // reason.message === 'WHOOPS' + }); + ``` + + Instead of writing the above, your code now simply becomes the following: + + ```javascript + let promise = Promise.reject(new Error('WHOOPS')); + + promise.then(function(value){ + // Code here doesn't run because the promise is rejected! + }, function(reason){ + // reason.message === 'WHOOPS' + }); + ``` + + @method reject + @static + @param {Any} reason value that the returned promise will be rejected with. + Useful for tooling. + @return {Promise} a promise rejected with the given `reason`. +*/ +function reject$1(reason) { + /*jshint validthis:true */ + var Constructor = this; + var promise = new Constructor(noop); + reject(promise, reason); + return promise; +} + +function needsResolver() { + throw new TypeError('You must pass a resolver function as the first argument to the promise constructor'); +} + +function needsNew() { + throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function."); +} + +/** + Promise objects represent the eventual result of an asynchronous operation. The + primary way of interacting with a promise is through its `then` method, which + registers callbacks to receive either a promise's eventual value or the reason + why the promise cannot be fulfilled. + + Terminology + ----------- + + - `promise` is an object or function with a `then` method whose behavior conforms to this specification. + - `thenable` is an object or function that defines a `then` method. + - `value` is any legal JavaScript value (including undefined, a thenable, or a promise). + - `exception` is a value that is thrown using the throw statement. + - `reason` is a value that indicates why a promise was rejected. + - `settled` the final resting state of a promise, fulfilled or rejected. + + A promise can be in one of three states: pending, fulfilled, or rejected. + + Promises that are fulfilled have a fulfillment value and are in the fulfilled + state. Promises that are rejected have a rejection reason and are in the + rejected state. A fulfillment value is never a thenable. + + Promises can also be said to *resolve* a value. If this value is also a + promise, then the original promise's settled state will match the value's + settled state. So a promise that *resolves* a promise that rejects will + itself reject, and a promise that *resolves* a promise that fulfills will + itself fulfill. + + + Basic Usage: + ------------ + + ```js + let promise = new Promise(function(resolve, reject) { + // on success + resolve(value); + + // on failure + reject(reason); + }); + + promise.then(function(value) { + // on fulfillment + }, function(reason) { + // on rejection + }); + ``` + + Advanced Usage: + --------------- + + Promises shine when abstracting away asynchronous interactions such as + `XMLHttpRequest`s. + + ```js + function getJSON(url) { + return new Promise(function(resolve, reject){ + let xhr = new XMLHttpRequest(); + + xhr.open('GET', url); + xhr.onreadystatechange = handler; + xhr.responseType = 'json'; + xhr.setRequestHeader('Accept', 'application/json'); + xhr.send(); + + function handler() { + if (this.readyState === this.DONE) { + if (this.status === 200) { + resolve(this.response); + } else { + reject(new Error('getJSON: `' + url + '` failed with status: [' + this.status + ']')); + } + } + }; + }); + } + + getJSON('/posts.json').then(function(json) { + // on fulfillment + }, function(reason) { + // on rejection + }); + ``` + + Unlike callbacks, promises are great composable primitives. + + ```js + Promise.all([ + getJSON('/posts'), + getJSON('/comments') + ]).then(function(values){ + values[0] // => postsJSON + values[1] // => commentsJSON + + return values; + }); + ``` + + @class Promise + @param {Function} resolver + Useful for tooling. + @constructor +*/ + +var Promise$2 = function () { + function Promise(resolver) { + this[PROMISE_ID] = nextId(); + this._result = this._state = undefined; + this._subscribers = []; + + if (noop !== resolver) { + typeof resolver !== 'function' && needsResolver(); + this instanceof Promise ? initializePromise(this, resolver) : needsNew(); + } + } + + /** + The primary way of interacting with a promise is through its `then` method, + which registers callbacks to receive either a promise's eventual value or the + reason why the promise cannot be fulfilled. + ```js + findUser().then(function(user){ + // user is available + }, function(reason){ + // user is unavailable, and you are given the reason why + }); + ``` + Chaining + -------- + The return value of `then` is itself a promise. This second, 'downstream' + promise is resolved with the return value of the first promise's fulfillment + or rejection handler, or rejected if the handler throws an exception. + ```js + findUser().then(function (user) { + return user.name; + }, function (reason) { + return 'default name'; + }).then(function (userName) { + // If `findUser` fulfilled, `userName` will be the user's name, otherwise it + // will be `'default name'` + }); + findUser().then(function (user) { + throw new Error('Found user, but still unhappy'); + }, function (reason) { + throw new Error('`findUser` rejected and we're unhappy'); + }).then(function (value) { + // never reached + }, function (reason) { + // if `findUser` fulfilled, `reason` will be 'Found user, but still unhappy'. + // If `findUser` rejected, `reason` will be '`findUser` rejected and we're unhappy'. + }); + ``` + If the downstream promise does not specify a rejection handler, rejection reasons will be propagated further downstream. + ```js + findUser().then(function (user) { + throw new PedagogicalException('Upstream error'); + }).then(function (value) { + // never reached + }).then(function (value) { + // never reached + }, function (reason) { + // The `PedgagocialException` is propagated all the way down to here + }); + ``` + Assimilation + ------------ + Sometimes the value you want to propagate to a downstream promise can only be + retrieved asynchronously. This can be achieved by returning a promise in the + fulfillment or rejection handler. The downstream promise will then be pending + until the returned promise is settled. This is called *assimilation*. + ```js + findUser().then(function (user) { + return findCommentsByAuthor(user); + }).then(function (comments) { + // The user's comments are now available + }); + ``` + If the assimliated promise rejects, then the downstream promise will also reject. + ```js + findUser().then(function (user) { + return findCommentsByAuthor(user); + }).then(function (comments) { + // If `findCommentsByAuthor` fulfills, we'll have the value here + }, function (reason) { + // If `findCommentsByAuthor` rejects, we'll have the reason here + }); + ``` + Simple Example + -------------- + Synchronous Example + ```javascript + let result; + try { + result = findResult(); + // success + } catch(reason) { + // failure + } + ``` + Errback Example + ```js + findResult(function(result, err){ + if (err) { + // failure + } else { + // success + } + }); + ``` + Promise Example; + ```javascript + findResult().then(function(result){ + // success + }, function(reason){ + // failure + }); + ``` + Advanced Example + -------------- + Synchronous Example + ```javascript + let author, books; + try { + author = findAuthor(); + books = findBooksByAuthor(author); + // success + } catch(reason) { + // failure + } + ``` + Errback Example + ```js + function foundBooks(books) { + } + function failure(reason) { + } + findAuthor(function(author, err){ + if (err) { + failure(err); + // failure + } else { + try { + findBoooksByAuthor(author, function(books, err) { + if (err) { + failure(err); + } else { + try { + foundBooks(books); + } catch(reason) { + failure(reason); + } + } + }); + } catch(error) { + failure(err); + } + // success + } + }); + ``` + Promise Example; + ```javascript + findAuthor(). + then(findBooksByAuthor). + then(function(books){ + // found books + }).catch(function(reason){ + // something went wrong + }); + ``` + @method then + @param {Function} onFulfilled + @param {Function} onRejected + Useful for tooling. + @return {Promise} + */ + + /** + `catch` is simply sugar for `then(undefined, onRejection)` which makes it the same + as the catch block of a try/catch statement. + ```js + function findAuthor(){ + throw new Error('couldn't find that author'); + } + // synchronous + try { + findAuthor(); + } catch(reason) { + // something went wrong + } + // async with promises + findAuthor().catch(function(reason){ + // something went wrong + }); + ``` + @method catch + @param {Function} onRejection + Useful for tooling. + @return {Promise} + */ + + + Promise.prototype.catch = function _catch(onRejection) { + return this.then(null, onRejection); + }; + + /** + `finally` will be invoked regardless of the promise's fate just as native + try/catch/finally behaves + + Synchronous example: + + ```js + findAuthor() { + if (Math.random() > 0.5) { + throw new Error(); + } + return new Author(); + } + + try { + return findAuthor(); // succeed or fail + } catch(error) { + return findOtherAuther(); + } finally { + // always runs + // doesn't affect the return value + } + ``` + + Asynchronous example: + + ```js + findAuthor().catch(function(reason){ + return findOtherAuther(); + }).finally(function(){ + // author was either found, or not + }); + ``` + + @method finally + @param {Function} callback + @return {Promise} + */ + + + Promise.prototype.finally = function _finally(callback) { + var promise = this; + var constructor = promise.constructor; + + return promise.then(function (value) { + return constructor.resolve(callback()).then(function () { + return value; + }); + }, function (reason) { + return constructor.resolve(callback()).then(function () { + throw reason; + }); + }); + }; + + return Promise; +}(); + +Promise$2.prototype.then = then; +Promise$2.all = all; +Promise$2.race = race; +Promise$2.resolve = resolve$1; +Promise$2.reject = reject$1; +Promise$2._setScheduler = setScheduler; +Promise$2._setAsap = setAsap; +Promise$2._asap = asap; + +/*global self*/ +function polyfill() { + var local = void 0; + + if (typeof global !== 'undefined') { + local = global; + } else if (typeof self !== 'undefined') { + local = self; + } else { + try { + local = Function('return this')(); + } catch (e) { + throw new Error('polyfill failed because global object is unavailable in this environment'); + } + } + + var P = local.Promise; + + if (P) { + var promiseToString = null; + try { + promiseToString = Object.prototype.toString.call(P.resolve()); + } catch (e) { + // silently ignored + } + + if (promiseToString === '[object Promise]' && !P.cast) { + return; + } + } + + local.Promise = Promise$2; +} + +// Strange compat.. +Promise$2.polyfill = polyfill; +Promise$2.Promise = Promise$2; + +Promise$2.polyfill(); + +return Promise$2; + +}))); + + + +//# sourceMappingURL=es6-promise.auto.map + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(2))) + +/***/ }), +/* 2 */ +/***/ (function(module, exports) { + +var g; + +// This works in non-strict mode +g = (function() { + return this; +})(); + +try { + // This works if eval is allowed (see CSP) + g = g || new Function("return this")(); +} catch (e) { + // This works if the window reference is available + if (typeof window === "object") g = window; +} + +// g can still be undefined, but nothing to do about it... +// We return undefined, instead of nothing here, so it's +// easier to handle this case. if(!global) { ...} + +module.exports = g; + + +/***/ }), +/* 3 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VERSION", function() { return VERSION; }); +/* harmony import */ var _Errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AbortError", function() { return _Errors__WEBPACK_IMPORTED_MODULE_0__["AbortError"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HttpError", function() { return _Errors__WEBPACK_IMPORTED_MODULE_0__["HttpError"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return _Errors__WEBPACK_IMPORTED_MODULE_0__["TimeoutError"]; }); + +/* harmony import */ var _HttpClient__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HttpClient", function() { return _HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpClient"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HttpResponse", function() { return _HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpResponse"]; }); + +/* harmony import */ var _DefaultHttpClient__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(6); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "DefaultHttpClient", function() { return _DefaultHttpClient__WEBPACK_IMPORTED_MODULE_2__["DefaultHttpClient"]; }); + +/* harmony import */ var _HubConnection__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(10); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HubConnection", function() { return _HubConnection__WEBPACK_IMPORTED_MODULE_3__["HubConnection"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HubConnectionState", function() { return _HubConnection__WEBPACK_IMPORTED_MODULE_3__["HubConnectionState"]; }); + +/* harmony import */ var _HubConnectionBuilder__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(17); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HubConnectionBuilder", function() { return _HubConnectionBuilder__WEBPACK_IMPORTED_MODULE_4__["HubConnectionBuilder"]; }); + +/* harmony import */ var _IHubProtocol__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(15); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MessageType", function() { return _IHubProtocol__WEBPACK_IMPORTED_MODULE_5__["MessageType"]; }); + +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(9); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "LogLevel", function() { return _ILogger__WEBPACK_IMPORTED_MODULE_6__["LogLevel"]; }); + +/* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(20); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HttpTransportType", function() { return _ITransport__WEBPACK_IMPORTED_MODULE_7__["HttpTransportType"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TransferFormat", function() { return _ITransport__WEBPACK_IMPORTED_MODULE_7__["TransferFormat"]; }); + +/* harmony import */ var _Loggers__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(14); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NullLogger", function() { return _Loggers__WEBPACK_IMPORTED_MODULE_8__["NullLogger"]; }); + +/* harmony import */ var _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(25); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "JsonHubProtocol", function() { return _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_9__["JsonHubProtocol"]; }); + +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(16); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _Subject__WEBPACK_IMPORTED_MODULE_10__["Subject"]; }); + +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Version token that will be replaced by the prepack command +/** The version of the SignalR client. */ +var VERSION = "3.1.3"; + + + + + + + + + + + + + +/***/ }), +/* 4 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HttpError", function() { return HttpError; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return TimeoutError; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AbortError", function() { return AbortError; }); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +var __extends = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +/** Error thrown when an HTTP request fails. */ +var HttpError = /** @class */ (function (_super) { + __extends(HttpError, _super); + /** Constructs a new instance of {@link @microsoft/signalr.HttpError}. + * + * @param {string} errorMessage A descriptive error message. + * @param {number} statusCode The HTTP status code represented by this error. + */ + function HttpError(errorMessage, statusCode) { + var _newTarget = this.constructor; + var _this = this; + var trueProto = _newTarget.prototype; + _this = _super.call(this, errorMessage) || this; + _this.statusCode = statusCode; + // Workaround issue in Typescript compiler + // https://github.com/Microsoft/TypeScript/issues/13965#issuecomment-278570200 + _this.__proto__ = trueProto; + return _this; + } + return HttpError; +}(Error)); + +/** Error thrown when a timeout elapses. */ +var TimeoutError = /** @class */ (function (_super) { + __extends(TimeoutError, _super); + /** Constructs a new instance of {@link @microsoft/signalr.TimeoutError}. + * + * @param {string} errorMessage A descriptive error message. + */ + function TimeoutError(errorMessage) { + var _newTarget = this.constructor; + if (errorMessage === void 0) { errorMessage = "A timeout occurred."; } + var _this = this; + var trueProto = _newTarget.prototype; + _this = _super.call(this, errorMessage) || this; + // Workaround issue in Typescript compiler + // https://github.com/Microsoft/TypeScript/issues/13965#issuecomment-278570200 + _this.__proto__ = trueProto; + return _this; + } + return TimeoutError; +}(Error)); + +/** Error thrown when an action is aborted. */ +var AbortError = /** @class */ (function (_super) { + __extends(AbortError, _super); + /** Constructs a new instance of {@link AbortError}. + * + * @param {string} errorMessage A descriptive error message. + */ + function AbortError(errorMessage) { + var _newTarget = this.constructor; + if (errorMessage === void 0) { errorMessage = "An abort occurred."; } + var _this = this; + var trueProto = _newTarget.prototype; + _this = _super.call(this, errorMessage) || this; + // Workaround issue in Typescript compiler + // https://github.com/Microsoft/TypeScript/issues/13965#issuecomment-278570200 + _this.__proto__ = trueProto; + return _this; + } + return AbortError; +}(Error)); + + + +/***/ }), +/* 5 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HttpResponse", function() { return HttpResponse; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HttpClient", function() { return HttpClient; }); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +var __assign = (undefined && undefined.__assign) || Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; +}; +/** Represents an HTTP response. */ +var HttpResponse = /** @class */ (function () { + function HttpResponse(statusCode, statusText, content) { + this.statusCode = statusCode; + this.statusText = statusText; + this.content = content; + } + return HttpResponse; +}()); + +/** Abstraction over an HTTP client. + * + * This class provides an abstraction over an HTTP client so that a different implementation can be provided on different platforms. + */ +var HttpClient = /** @class */ (function () { + function HttpClient() { + } + HttpClient.prototype.get = function (url, options) { + return this.send(__assign({}, options, { method: "GET", url: url })); + }; + HttpClient.prototype.post = function (url, options) { + return this.send(__assign({}, options, { method: "POST", url: url })); + }; + HttpClient.prototype.delete = function (url, options) { + return this.send(__assign({}, options, { method: "DELETE", url: url })); + }; + /** Gets all cookies that apply to the specified URL. + * + * @param url The URL that the cookies are valid for. + * @returns {string} A string containing all the key-value cookie pairs for the specified URL. + */ + // @ts-ignore + HttpClient.prototype.getCookieString = function (url) { + return ""; + }; + return HttpClient; +}()); + + + +/***/ }), +/* 6 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DefaultHttpClient", function() { return DefaultHttpClient; }); +/* harmony import */ var _Errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4); +/* harmony import */ var _HttpClient__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5); +/* harmony import */ var _NodeHttpClient__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7); +/* harmony import */ var _XhrHttpClient__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +var __extends = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); + + + + +/** Default implementation of {@link @microsoft/signalr.HttpClient}. */ +var DefaultHttpClient = /** @class */ (function (_super) { + __extends(DefaultHttpClient, _super); + /** Creates a new instance of the {@link @microsoft/signalr.DefaultHttpClient}, using the provided {@link @microsoft/signalr.ILogger} to log messages. */ + function DefaultHttpClient(logger) { + var _this = _super.call(this) || this; + if (typeof XMLHttpRequest !== "undefined") { + _this.httpClient = new _XhrHttpClient__WEBPACK_IMPORTED_MODULE_3__["XhrHttpClient"](logger); + } + else { + _this.httpClient = new _NodeHttpClient__WEBPACK_IMPORTED_MODULE_2__["NodeHttpClient"](logger); + } + return _this; + } + /** @inheritDoc */ + DefaultHttpClient.prototype.send = function (request) { + // Check that abort was not signaled before calling send + if (request.abortSignal && request.abortSignal.aborted) { + return Promise.reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["AbortError"]()); + } + if (!request.method) { + return Promise.reject(new Error("No method defined.")); + } + if (!request.url) { + return Promise.reject(new Error("No url defined.")); + } + return this.httpClient.send(request); + }; + DefaultHttpClient.prototype.getCookieString = function (url) { + return this.httpClient.getCookieString(url); + }; + return DefaultHttpClient; +}(_HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpClient"])); + + + +/***/ }), +/* 7 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NodeHttpClient", function() { return NodeHttpClient; }); +/* harmony import */ var _HttpClient__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(5); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +var __extends = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +// This is an empty implementation of the NodeHttpClient that will be included in browser builds so the output file will be smaller + +/** @private */ +var NodeHttpClient = /** @class */ (function (_super) { + __extends(NodeHttpClient, _super); + // @ts-ignore: Need ILogger to compile, but unused variables generate errors + function NodeHttpClient(logger) { + return _super.call(this) || this; + } + NodeHttpClient.prototype.send = function () { + return Promise.reject(new Error("If using Node either provide an XmlHttpRequest polyfill or consume the cjs or esm script instead of the browser/signalr.js one.")); + }; + return NodeHttpClient; +}(_HttpClient__WEBPACK_IMPORTED_MODULE_0__["HttpClient"])); + + + +/***/ }), +/* 8 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "XhrHttpClient", function() { return XhrHttpClient; }); +/* harmony import */ var _Errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4); +/* harmony import */ var _HttpClient__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +var __extends = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); + + + +var XhrHttpClient = /** @class */ (function (_super) { + __extends(XhrHttpClient, _super); + function XhrHttpClient(logger) { + var _this = _super.call(this) || this; + _this.logger = logger; + return _this; + } + /** @inheritDoc */ + XhrHttpClient.prototype.send = function (request) { + var _this = this; + // Check that abort was not signaled before calling send + if (request.abortSignal && request.abortSignal.aborted) { + return Promise.reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["AbortError"]()); + } + if (!request.method) { + return Promise.reject(new Error("No method defined.")); + } + if (!request.url) { + return Promise.reject(new Error("No url defined.")); + } + return new Promise(function (resolve, reject) { + var xhr = new XMLHttpRequest(); + xhr.open(request.method, request.url, true); + xhr.withCredentials = true; + xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest"); + // Explicitly setting the Content-Type header for React Native on Android platform. + xhr.setRequestHeader("Content-Type", "text/plain;charset=UTF-8"); + var headers = request.headers; + if (headers) { + Object.keys(headers) + .forEach(function (header) { + xhr.setRequestHeader(header, headers[header]); + }); + } + if (request.responseType) { + xhr.responseType = request.responseType; + } + if (request.abortSignal) { + request.abortSignal.onabort = function () { + xhr.abort(); + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["AbortError"]()); + }; + } + if (request.timeout) { + xhr.timeout = request.timeout; + } + xhr.onload = function () { + if (request.abortSignal) { + request.abortSignal.onabort = null; + } + if (xhr.status >= 200 && xhr.status < 300) { + resolve(new _HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpResponse"](xhr.status, xhr.statusText, xhr.response || xhr.responseText)); + } + else { + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["HttpError"](xhr.statusText, xhr.status)); + } + }; + xhr.onerror = function () { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "Error from HTTP request. " + xhr.status + ": " + xhr.statusText + "."); + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["HttpError"](xhr.statusText, xhr.status)); + }; + xhr.ontimeout = function () { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "Timeout from HTTP request."); + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["TimeoutError"]()); + }; + xhr.send(request.content || ""); + }); + }; + return XhrHttpClient; +}(_HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpClient"])); + + + +/***/ }), +/* 9 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LogLevel", function() { return LogLevel; }); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// These values are designed to match the ASP.NET Log Levels since that's the pattern we're emulating here. +/** Indicates the severity of a log message. + * + * Log Levels are ordered in increasing severity. So `Debug` is more severe than `Trace`, etc. + */ +var LogLevel; +(function (LogLevel) { + /** Log level for very low severity diagnostic messages. */ + LogLevel[LogLevel["Trace"] = 0] = "Trace"; + /** Log level for low severity diagnostic messages. */ + LogLevel[LogLevel["Debug"] = 1] = "Debug"; + /** Log level for informational diagnostic messages. */ + LogLevel[LogLevel["Information"] = 2] = "Information"; + /** Log level for diagnostic messages that indicate a non-fatal problem. */ + LogLevel[LogLevel["Warning"] = 3] = "Warning"; + /** Log level for diagnostic messages that indicate a failure in the current operation. */ + LogLevel[LogLevel["Error"] = 4] = "Error"; + /** Log level for diagnostic messages that indicate a failure that will terminate the entire application. */ + LogLevel[LogLevel["Critical"] = 5] = "Critical"; + /** The highest possible log level. Used when configuring logging to indicate that no log messages should be emitted. */ + LogLevel[LogLevel["None"] = 6] = "None"; +})(LogLevel || (LogLevel = {})); + + +/***/ }), +/* 10 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HubConnectionState", function() { return HubConnectionState; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HubConnection", function() { return HubConnection; }); +/* harmony import */ var _HandshakeProtocol__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(11); +/* harmony import */ var _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(15); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(13); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (undefined && undefined.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; + + + + + +var DEFAULT_TIMEOUT_IN_MS = 30 * 1000; +var DEFAULT_PING_INTERVAL_IN_MS = 15 * 1000; +/** Describes the current state of the {@link HubConnection} to the server. */ +var HubConnectionState; +(function (HubConnectionState) { + /** The hub connection is disconnected. */ + HubConnectionState["Disconnected"] = "Disconnected"; + /** The hub connection is connecting. */ + HubConnectionState["Connecting"] = "Connecting"; + /** The hub connection is connected. */ + HubConnectionState["Connected"] = "Connected"; + /** The hub connection is disconnecting. */ + HubConnectionState["Disconnecting"] = "Disconnecting"; + /** The hub connection is reconnecting. */ + HubConnectionState["Reconnecting"] = "Reconnecting"; +})(HubConnectionState || (HubConnectionState = {})); +/** Represents a connection to a SignalR Hub. */ +var HubConnection = /** @class */ (function () { + function HubConnection(connection, logger, protocol, reconnectPolicy) { + var _this = this; + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(connection, "connection"); + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(logger, "logger"); + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(protocol, "protocol"); + this.serverTimeoutInMilliseconds = DEFAULT_TIMEOUT_IN_MS; + this.keepAliveIntervalInMilliseconds = DEFAULT_PING_INTERVAL_IN_MS; + this.logger = logger; + this.protocol = protocol; + this.connection = connection; + this.reconnectPolicy = reconnectPolicy; + this.handshakeProtocol = new _HandshakeProtocol__WEBPACK_IMPORTED_MODULE_0__["HandshakeProtocol"](); + this.connection.onreceive = function (data) { return _this.processIncomingData(data); }; + this.connection.onclose = function (error) { return _this.connectionClosed(error); }; + this.callbacks = {}; + this.methods = {}; + this.closedCallbacks = []; + this.reconnectingCallbacks = []; + this.reconnectedCallbacks = []; + this.invocationId = 0; + this.receivedHandshakeResponse = false; + this.connectionState = HubConnectionState.Disconnected; + this.connectionStarted = false; + this.cachedPingMessage = this.protocol.writeMessage({ type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Ping }); + } + /** @internal */ + // Using a public static factory method means we can have a private constructor and an _internal_ + // create method that can be used by HubConnectionBuilder. An "internal" constructor would just + // be stripped away and the '.d.ts' file would have no constructor, which is interpreted as a + // public parameter-less constructor. + HubConnection.create = function (connection, logger, protocol, reconnectPolicy) { + return new HubConnection(connection, logger, protocol, reconnectPolicy); + }; + Object.defineProperty(HubConnection.prototype, "state", { + /** Indicates the state of the {@link HubConnection} to the server. */ + get: function () { + return this.connectionState; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(HubConnection.prototype, "connectionId", { + /** Represents the connection id of the {@link HubConnection} on the server. The connection id will be null when the connection is either + * in the disconnected state or if the negotiation step was skipped. + */ + get: function () { + return this.connection ? (this.connection.connectionId || null) : null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(HubConnection.prototype, "baseUrl", { + /** Indicates the url of the {@link HubConnection} to the server. */ + get: function () { + return this.connection.baseUrl || ""; + }, + /** + * Sets a new url for the HubConnection. Note that the url can only be changed when the connection is in either the Disconnected or + * Reconnecting states. + * @param {string} url The url to connect to. + */ + set: function (url) { + if (this.connectionState !== HubConnectionState.Disconnected && this.connectionState !== HubConnectionState.Reconnecting) { + throw new Error("The HubConnection must be in the Disconnected or Reconnecting state to change the url."); + } + if (!url) { + throw new Error("The HubConnection url must be a valid url."); + } + this.connection.baseUrl = url; + }, + enumerable: true, + configurable: true + }); + /** Starts the connection. + * + * @returns {Promise} A Promise that resolves when the connection has been successfully established, or rejects with an error. + */ + HubConnection.prototype.start = function () { + this.startPromise = this.startWithStateTransitions(); + return this.startPromise; + }; + HubConnection.prototype.startWithStateTransitions = function () { + return __awaiter(this, void 0, void 0, function () { + var e_1; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + if (this.connectionState !== HubConnectionState.Disconnected) { + return [2 /*return*/, Promise.reject(new Error("Cannot start a HubConnection that is not in the 'Disconnected' state."))]; + } + this.connectionState = HubConnectionState.Connecting; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Starting HubConnection."); + _a.label = 1; + case 1: + _a.trys.push([1, 3, , 4]); + return [4 /*yield*/, this.startInternal()]; + case 2: + _a.sent(); + this.connectionState = HubConnectionState.Connected; + this.connectionStarted = true; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "HubConnection connected successfully."); + return [3 /*break*/, 4]; + case 3: + e_1 = _a.sent(); + this.connectionState = HubConnectionState.Disconnected; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "HubConnection failed to start successfully because of error '" + e_1 + "'."); + return [2 /*return*/, Promise.reject(e_1)]; + case 4: return [2 /*return*/]; + } + }); + }); + }; + HubConnection.prototype.startInternal = function () { + return __awaiter(this, void 0, void 0, function () { + var handshakePromise, handshakeRequest, e_2; + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + this.stopDuringStartError = undefined; + this.receivedHandshakeResponse = false; + handshakePromise = new Promise(function (resolve, reject) { + _this.handshakeResolver = resolve; + _this.handshakeRejecter = reject; + }); + return [4 /*yield*/, this.connection.start(this.protocol.transferFormat)]; + case 1: + _a.sent(); + _a.label = 2; + case 2: + _a.trys.push([2, 5, , 7]); + handshakeRequest = { + protocol: this.protocol.name, + version: this.protocol.version, + }; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Sending handshake request."); + return [4 /*yield*/, this.sendMessage(this.handshakeProtocol.writeHandshakeRequest(handshakeRequest))]; + case 3: + _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Using HubProtocol '" + this.protocol.name + "'."); + // defensively cleanup timeout in case we receive a message from the server before we finish start + this.cleanupTimeout(); + this.resetTimeoutPeriod(); + this.resetKeepAliveInterval(); + return [4 /*yield*/, handshakePromise]; + case 4: + _a.sent(); + // It's important to check the stopDuringStartError instead of just relying on the handshakePromise + // being rejected on close, because this continuation can run after both the handshake completed successfully + // and the connection was closed. + if (this.stopDuringStartError) { + // It's important to throw instead of returning a rejected promise, because we don't want to allow any state + // transitions to occur between now and the calling code observing the exceptions. Returning a rejected promise + // will cause the calling continuation to get scheduled to run later. + throw this.stopDuringStartError; + } + return [3 /*break*/, 7]; + case 5: + e_2 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Hub handshake failed with error '" + e_2 + "' during start(). Stopping HubConnection."); + this.cleanupTimeout(); + this.cleanupPingTimer(); + // HttpConnection.stop() should not complete until after the onclose callback is invoked. + // This will transition the HubConnection to the disconnected state before HttpConnection.stop() completes. + return [4 /*yield*/, this.connection.stop(e_2)]; + case 6: + // HttpConnection.stop() should not complete until after the onclose callback is invoked. + // This will transition the HubConnection to the disconnected state before HttpConnection.stop() completes. + _a.sent(); + throw e_2; + case 7: return [2 /*return*/]; + } + }); + }); + }; + /** Stops the connection. + * + * @returns {Promise} A Promise that resolves when the connection has been successfully terminated, or rejects with an error. + */ + HubConnection.prototype.stop = function () { + return __awaiter(this, void 0, void 0, function () { + var startPromise, e_3; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + startPromise = this.startPromise; + this.stopPromise = this.stopInternal(); + return [4 /*yield*/, this.stopPromise]; + case 1: + _a.sent(); + _a.label = 2; + case 2: + _a.trys.push([2, 4, , 5]); + // Awaiting undefined continues immediately + return [4 /*yield*/, startPromise]; + case 3: + // Awaiting undefined continues immediately + _a.sent(); + return [3 /*break*/, 5]; + case 4: + e_3 = _a.sent(); + return [3 /*break*/, 5]; + case 5: return [2 /*return*/]; + } + }); + }); + }; + HubConnection.prototype.stopInternal = function (error) { + if (this.connectionState === HubConnectionState.Disconnected) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Call to HubConnection.stop(" + error + ") ignored because it is already in the disconnected state."); + return Promise.resolve(); + } + if (this.connectionState === HubConnectionState.Disconnecting) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Call to HttpConnection.stop(" + error + ") ignored because the connection is already in the disconnecting state."); + return this.stopPromise; + } + this.connectionState = HubConnectionState.Disconnecting; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Stopping HubConnection."); + if (this.reconnectDelayHandle) { + // We're in a reconnect delay which means the underlying connection is currently already stopped. + // Just clear the handle to stop the reconnect loop (which no one is waiting on thankfully) and + // fire the onclose callbacks. + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection stopped during reconnect delay. Done reconnecting."); + clearTimeout(this.reconnectDelayHandle); + this.reconnectDelayHandle = undefined; + this.completeClose(); + return Promise.resolve(); + } + this.cleanupTimeout(); + this.cleanupPingTimer(); + this.stopDuringStartError = error || new Error("The connection was stopped before the hub handshake could complete."); + // HttpConnection.stop() should not complete until after either HttpConnection.start() fails + // or the onclose callback is invoked. The onclose callback will transition the HubConnection + // to the disconnected state if need be before HttpConnection.stop() completes. + return this.connection.stop(error); + }; + /** Invokes a streaming hub method on the server using the specified name and arguments. + * + * @typeparam T The type of the items returned by the server. + * @param {string} methodName The name of the server method to invoke. + * @param {any[]} args The arguments used to invoke the server method. + * @returns {IStreamResult} An object that yields results from the server as they are received. + */ + HubConnection.prototype.stream = function (methodName) { + var _this = this; + var args = []; + for (var _i = 1; _i < arguments.length; _i++) { + args[_i - 1] = arguments[_i]; + } + var _a = this.replaceStreamingParams(args), streams = _a[0], streamIds = _a[1]; + var invocationDescriptor = this.createStreamInvocation(methodName, args, streamIds); + var promiseQueue; + var subject = new _Subject__WEBPACK_IMPORTED_MODULE_3__["Subject"](); + subject.cancelCallback = function () { + var cancelInvocation = _this.createCancelInvocation(invocationDescriptor.invocationId); + delete _this.callbacks[invocationDescriptor.invocationId]; + return promiseQueue.then(function () { + return _this.sendWithProtocol(cancelInvocation); + }); + }; + this.callbacks[invocationDescriptor.invocationId] = function (invocationEvent, error) { + if (error) { + subject.error(error); + return; + } + else if (invocationEvent) { + // invocationEvent will not be null when an error is not passed to the callback + if (invocationEvent.type === _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion) { + if (invocationEvent.error) { + subject.error(new Error(invocationEvent.error)); + } + else { + subject.complete(); + } + } + else { + subject.next((invocationEvent.item)); + } + } + }; + promiseQueue = this.sendWithProtocol(invocationDescriptor) + .catch(function (e) { + subject.error(e); + delete _this.callbacks[invocationDescriptor.invocationId]; + }); + this.launchStreams(streams, promiseQueue); + return subject; + }; + HubConnection.prototype.sendMessage = function (message) { + this.resetKeepAliveInterval(); + return this.connection.send(message); + }; + /** + * Sends a js object to the server. + * @param message The js object to serialize and send. + */ + HubConnection.prototype.sendWithProtocol = function (message) { + return this.sendMessage(this.protocol.writeMessage(message)); + }; + /** Invokes a hub method on the server using the specified name and arguments. Does not wait for a response from the receiver. + * + * The Promise returned by this method resolves when the client has sent the invocation to the server. The server may still + * be processing the invocation. + * + * @param {string} methodName The name of the server method to invoke. + * @param {any[]} args The arguments used to invoke the server method. + * @returns {Promise} A Promise that resolves when the invocation has been successfully sent, or rejects with an error. + */ + HubConnection.prototype.send = function (methodName) { + var args = []; + for (var _i = 1; _i < arguments.length; _i++) { + args[_i - 1] = arguments[_i]; + } + var _a = this.replaceStreamingParams(args), streams = _a[0], streamIds = _a[1]; + var sendPromise = this.sendWithProtocol(this.createInvocation(methodName, args, true, streamIds)); + this.launchStreams(streams, sendPromise); + return sendPromise; + }; + /** Invokes a hub method on the server using the specified name and arguments. + * + * The Promise returned by this method resolves when the server indicates it has finished invoking the method. When the promise + * resolves, the server has finished invoking the method. If the server method returns a result, it is produced as the result of + * resolving the Promise. + * + * @typeparam T The expected return type. + * @param {string} methodName The name of the server method to invoke. + * @param {any[]} args The arguments used to invoke the server method. + * @returns {Promise} A Promise that resolves with the result of the server method (if any), or rejects with an error. + */ + HubConnection.prototype.invoke = function (methodName) { + var _this = this; + var args = []; + for (var _i = 1; _i < arguments.length; _i++) { + args[_i - 1] = arguments[_i]; + } + var _a = this.replaceStreamingParams(args), streams = _a[0], streamIds = _a[1]; + var invocationDescriptor = this.createInvocation(methodName, args, false, streamIds); + var p = new Promise(function (resolve, reject) { + // invocationId will always have a value for a non-blocking invocation + _this.callbacks[invocationDescriptor.invocationId] = function (invocationEvent, error) { + if (error) { + reject(error); + return; + } + else if (invocationEvent) { + // invocationEvent will not be null when an error is not passed to the callback + if (invocationEvent.type === _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion) { + if (invocationEvent.error) { + reject(new Error(invocationEvent.error)); + } + else { + resolve(invocationEvent.result); + } + } + else { + reject(new Error("Unexpected message type: " + invocationEvent.type)); + } + } + }; + var promiseQueue = _this.sendWithProtocol(invocationDescriptor) + .catch(function (e) { + reject(e); + // invocationId will always have a value for a non-blocking invocation + delete _this.callbacks[invocationDescriptor.invocationId]; + }); + _this.launchStreams(streams, promiseQueue); + }); + return p; + }; + /** Registers a handler that will be invoked when the hub method with the specified method name is invoked. + * + * @param {string} methodName The name of the hub method to define. + * @param {Function} newMethod The handler that will be raised when the hub method is invoked. + */ + HubConnection.prototype.on = function (methodName, newMethod) { + if (!methodName || !newMethod) { + return; + } + methodName = methodName.toLowerCase(); + if (!this.methods[methodName]) { + this.methods[methodName] = []; + } + // Preventing adding the same handler multiple times. + if (this.methods[methodName].indexOf(newMethod) !== -1) { + return; + } + this.methods[methodName].push(newMethod); + }; + HubConnection.prototype.off = function (methodName, method) { + if (!methodName) { + return; + } + methodName = methodName.toLowerCase(); + var handlers = this.methods[methodName]; + if (!handlers) { + return; + } + if (method) { + var removeIdx = handlers.indexOf(method); + if (removeIdx !== -1) { + handlers.splice(removeIdx, 1); + if (handlers.length === 0) { + delete this.methods[methodName]; + } + } + } + else { + delete this.methods[methodName]; + } + }; + /** Registers a handler that will be invoked when the connection is closed. + * + * @param {Function} callback The handler that will be invoked when the connection is closed. Optionally receives a single argument containing the error that caused the connection to close (if any). + */ + HubConnection.prototype.onclose = function (callback) { + if (callback) { + this.closedCallbacks.push(callback); + } + }; + /** Registers a handler that will be invoked when the connection starts reconnecting. + * + * @param {Function} callback The handler that will be invoked when the connection starts reconnecting. Optionally receives a single argument containing the error that caused the connection to start reconnecting (if any). + */ + HubConnection.prototype.onreconnecting = function (callback) { + if (callback) { + this.reconnectingCallbacks.push(callback); + } + }; + /** Registers a handler that will be invoked when the connection successfully reconnects. + * + * @param {Function} callback The handler that will be invoked when the connection successfully reconnects. + */ + HubConnection.prototype.onreconnected = function (callback) { + if (callback) { + this.reconnectedCallbacks.push(callback); + } + }; + HubConnection.prototype.processIncomingData = function (data) { + this.cleanupTimeout(); + if (!this.receivedHandshakeResponse) { + data = this.processHandshakeResponse(data); + this.receivedHandshakeResponse = true; + } + // Data may have all been read when processing handshake response + if (data) { + // Parse the messages + var messages = this.protocol.parseMessages(data, this.logger); + for (var _i = 0, messages_1 = messages; _i < messages_1.length; _i++) { + var message = messages_1[_i]; + switch (message.type) { + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Invocation: + this.invokeClientMethod(message); + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].StreamItem: + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion: + var callback = this.callbacks[message.invocationId]; + if (callback) { + if (message.type === _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion) { + delete this.callbacks[message.invocationId]; + } + callback(message); + } + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Ping: + // Don't care about pings + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Close: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Close message received from server."); + var error = message.error ? new Error("Server returned an error on close: " + message.error) : undefined; + if (message.allowReconnect === true) { + // It feels wrong not to await connection.stop() here, but processIncomingData is called as part of an onreceive callback which is not async, + // this is already the behavior for serverTimeout(), and HttpConnection.Stop() should catch and log all possible exceptions. + // tslint:disable-next-line:no-floating-promises + this.connection.stop(error); + } + else { + // We cannot await stopInternal() here, but subsequent calls to stop() will await this if stopInternal() is still ongoing. + this.stopPromise = this.stopInternal(error); + } + break; + default: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "Invalid message type: " + message.type + "."); + break; + } + } + } + this.resetTimeoutPeriod(); + }; + HubConnection.prototype.processHandshakeResponse = function (data) { + var _a; + var responseMessage; + var remainingData; + try { + _a = this.handshakeProtocol.parseHandshakeResponse(data), remainingData = _a[0], responseMessage = _a[1]; + } + catch (e) { + var message = "Error parsing handshake response: " + e; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, message); + var error = new Error(message); + this.handshakeRejecter(error); + throw error; + } + if (responseMessage.error) { + var message = "Server returned handshake error: " + responseMessage.error; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, message); + var error = new Error(message); + this.handshakeRejecter(error); + throw error; + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Server handshake complete."); + } + this.handshakeResolver(); + return remainingData; + }; + HubConnection.prototype.resetKeepAliveInterval = function () { + var _this = this; + this.cleanupPingTimer(); + this.pingServerHandle = setTimeout(function () { return __awaiter(_this, void 0, void 0, function () { + var _a; + return __generator(this, function (_b) { + switch (_b.label) { + case 0: + if (!(this.connectionState === HubConnectionState.Connected)) return [3 /*break*/, 4]; + _b.label = 1; + case 1: + _b.trys.push([1, 3, , 4]); + return [4 /*yield*/, this.sendMessage(this.cachedPingMessage)]; + case 2: + _b.sent(); + return [3 /*break*/, 4]; + case 3: + _a = _b.sent(); + // We don't care about the error. It should be seen elsewhere in the client. + // The connection is probably in a bad or closed state now, cleanup the timer so it stops triggering + this.cleanupPingTimer(); + return [3 /*break*/, 4]; + case 4: return [2 /*return*/]; + } + }); + }); }, this.keepAliveIntervalInMilliseconds); + }; + HubConnection.prototype.resetTimeoutPeriod = function () { + var _this = this; + if (!this.connection.features || !this.connection.features.inherentKeepAlive) { + // Set the timeout timer + this.timeoutHandle = setTimeout(function () { return _this.serverTimeout(); }, this.serverTimeoutInMilliseconds); + } + }; + HubConnection.prototype.serverTimeout = function () { + // The server hasn't talked to us in a while. It doesn't like us anymore ... :( + // Terminate the connection, but we don't need to wait on the promise. This could trigger reconnecting. + // tslint:disable-next-line:no-floating-promises + this.connection.stop(new Error("Server timeout elapsed without receiving a message from the server.")); + }; + HubConnection.prototype.invokeClientMethod = function (invocationMessage) { + var _this = this; + var methods = this.methods[invocationMessage.target.toLowerCase()]; + if (methods) { + try { + methods.forEach(function (m) { return m.apply(_this, invocationMessage.arguments); }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "A callback for the method " + invocationMessage.target.toLowerCase() + " threw error '" + e + "'."); + } + if (invocationMessage.invocationId) { + // This is not supported in v1. So we return an error to avoid blocking the server waiting for the response. + var message = "Server requested a response, which is not supported in this version of the client."; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, message); + // We don't want to wait on the stop itself. + this.stopPromise = this.stopInternal(new Error(message)); + } + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "No client method with the name '" + invocationMessage.target + "' found."); + } + }; + HubConnection.prototype.connectionClosed = function (error) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "HubConnection.connectionClosed(" + error + ") called while in state " + this.connectionState + "."); + // Triggering this.handshakeRejecter is insufficient because it could already be resolved without the continuation having run yet. + this.stopDuringStartError = this.stopDuringStartError || error || new Error("The underlying connection was closed before the hub handshake could complete."); + // If the handshake is in progress, start will be waiting for the handshake promise, so we complete it. + // If it has already completed, this should just noop. + if (this.handshakeResolver) { + this.handshakeResolver(); + } + this.cancelCallbacksWithError(error || new Error("Invocation canceled due to the underlying connection being closed.")); + this.cleanupTimeout(); + this.cleanupPingTimer(); + if (this.connectionState === HubConnectionState.Disconnecting) { + this.completeClose(error); + } + else if (this.connectionState === HubConnectionState.Connected && this.reconnectPolicy) { + // tslint:disable-next-line:no-floating-promises + this.reconnect(error); + } + else if (this.connectionState === HubConnectionState.Connected) { + this.completeClose(error); + } + // If none of the above if conditions were true were called the HubConnection must be in either: + // 1. The Connecting state in which case the handshakeResolver will complete it and stopDuringStartError will fail it. + // 2. The Reconnecting state in which case the handshakeResolver will complete it and stopDuringStartError will fail the current reconnect attempt + // and potentially continue the reconnect() loop. + // 3. The Disconnected state in which case we're already done. + }; + HubConnection.prototype.completeClose = function (error) { + var _this = this; + if (this.connectionStarted) { + this.connectionState = HubConnectionState.Disconnected; + this.connectionStarted = false; + try { + this.closedCallbacks.forEach(function (c) { return c.apply(_this, [error]); }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "An onclose callback called with error '" + error + "' threw error '" + e + "'."); + } + } + }; + HubConnection.prototype.reconnect = function (error) { + return __awaiter(this, void 0, void 0, function () { + var reconnectStartTime, previousReconnectAttempts, retryError, nextRetryDelay, e_4; + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + reconnectStartTime = Date.now(); + previousReconnectAttempts = 0; + retryError = error !== undefined ? error : new Error("Attempting to reconnect due to a unknown error."); + nextRetryDelay = this.getNextRetryDelay(previousReconnectAttempts++, 0, retryError); + if (nextRetryDelay === null) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection not reconnecting because the IRetryPolicy returned null on the first reconnect attempt."); + this.completeClose(error); + return [2 /*return*/]; + } + this.connectionState = HubConnectionState.Reconnecting; + if (error) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Connection reconnecting because of error '" + error + "'."); + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Connection reconnecting."); + } + if (this.onreconnecting) { + try { + this.reconnectingCallbacks.forEach(function (c) { return c.apply(_this, [error]); }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "An onreconnecting callback called with error '" + error + "' threw error '" + e + "'."); + } + // Exit early if an onreconnecting callback called connection.stop(). + if (this.connectionState !== HubConnectionState.Reconnecting) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection left the reconnecting state in onreconnecting callback. Done reconnecting."); + return [2 /*return*/]; + } + } + _a.label = 1; + case 1: + if (!(nextRetryDelay !== null)) return [3 /*break*/, 7]; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Reconnect attempt number " + previousReconnectAttempts + " will start in " + nextRetryDelay + " ms."); + return [4 /*yield*/, new Promise(function (resolve) { + _this.reconnectDelayHandle = setTimeout(resolve, nextRetryDelay); + })]; + case 2: + _a.sent(); + this.reconnectDelayHandle = undefined; + if (this.connectionState !== HubConnectionState.Reconnecting) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection left the reconnecting state during reconnect delay. Done reconnecting."); + return [2 /*return*/]; + } + _a.label = 3; + case 3: + _a.trys.push([3, 5, , 6]); + return [4 /*yield*/, this.startInternal()]; + case 4: + _a.sent(); + this.connectionState = HubConnectionState.Connected; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "HubConnection reconnected successfully."); + if (this.onreconnected) { + try { + this.reconnectedCallbacks.forEach(function (c) { return c.apply(_this, [_this.connection.connectionId]); }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "An onreconnected callback called with connectionId '" + this.connection.connectionId + "; threw error '" + e + "'."); + } + } + return [2 /*return*/]; + case 5: + e_4 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Reconnect attempt failed because of error '" + e_4 + "'."); + if (this.connectionState !== HubConnectionState.Reconnecting) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection left the reconnecting state during reconnect attempt. Done reconnecting."); + return [2 /*return*/]; + } + retryError = e_4 instanceof Error ? e_4 : new Error(e_4.toString()); + nextRetryDelay = this.getNextRetryDelay(previousReconnectAttempts++, Date.now() - reconnectStartTime, retryError); + return [3 /*break*/, 6]; + case 6: return [3 /*break*/, 1]; + case 7: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Reconnect retries have been exhausted after " + (Date.now() - reconnectStartTime) + " ms and " + previousReconnectAttempts + " failed attempts. Connection disconnecting."); + this.completeClose(); + return [2 /*return*/]; + } + }); + }); + }; + HubConnection.prototype.getNextRetryDelay = function (previousRetryCount, elapsedMilliseconds, retryReason) { + try { + return this.reconnectPolicy.nextRetryDelayInMilliseconds({ + elapsedMilliseconds: elapsedMilliseconds, + previousRetryCount: previousRetryCount, + retryReason: retryReason, + }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "IRetryPolicy.nextRetryDelayInMilliseconds(" + previousRetryCount + ", " + elapsedMilliseconds + ") threw error '" + e + "'."); + return null; + } + }; + HubConnection.prototype.cancelCallbacksWithError = function (error) { + var callbacks = this.callbacks; + this.callbacks = {}; + Object.keys(callbacks) + .forEach(function (key) { + var callback = callbacks[key]; + callback(null, error); + }); + }; + HubConnection.prototype.cleanupPingTimer = function () { + if (this.pingServerHandle) { + clearTimeout(this.pingServerHandle); + } + }; + HubConnection.prototype.cleanupTimeout = function () { + if (this.timeoutHandle) { + clearTimeout(this.timeoutHandle); + } + }; + HubConnection.prototype.createInvocation = function (methodName, args, nonblocking, streamIds) { + if (nonblocking) { + return { + arguments: args, + streamIds: streamIds, + target: methodName, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Invocation, + }; + } + else { + var invocationId = this.invocationId; + this.invocationId++; + return { + arguments: args, + invocationId: invocationId.toString(), + streamIds: streamIds, + target: methodName, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Invocation, + }; + } + }; + HubConnection.prototype.launchStreams = function (streams, promiseQueue) { + var _this = this; + if (streams.length === 0) { + return; + } + // Synchronize stream data so they arrive in-order on the server + if (!promiseQueue) { + promiseQueue = Promise.resolve(); + } + var _loop_1 = function (streamId) { + streams[streamId].subscribe({ + complete: function () { + promiseQueue = promiseQueue.then(function () { return _this.sendWithProtocol(_this.createCompletionMessage(streamId)); }); + }, + error: function (err) { + var message; + if (err instanceof Error) { + message = err.message; + } + else if (err && err.toString) { + message = err.toString(); + } + else { + message = "Unknown error"; + } + promiseQueue = promiseQueue.then(function () { return _this.sendWithProtocol(_this.createCompletionMessage(streamId, message)); }); + }, + next: function (item) { + promiseQueue = promiseQueue.then(function () { return _this.sendWithProtocol(_this.createStreamItemMessage(streamId, item)); }); + }, + }); + }; + // We want to iterate over the keys, since the keys are the stream ids + // tslint:disable-next-line:forin + for (var streamId in streams) { + _loop_1(streamId); + } + }; + HubConnection.prototype.replaceStreamingParams = function (args) { + var streams = []; + var streamIds = []; + for (var i = 0; i < args.length; i++) { + var argument = args[i]; + if (this.isObservable(argument)) { + var streamId = this.invocationId; + this.invocationId++; + // Store the stream for later use + streams[streamId] = argument; + streamIds.push(streamId.toString()); + // remove stream from args + args.splice(i, 1); + } + } + return [streams, streamIds]; + }; + HubConnection.prototype.isObservable = function (arg) { + // This allows other stream implementations to just work (like rxjs) + return arg && arg.subscribe && typeof arg.subscribe === "function"; + }; + HubConnection.prototype.createStreamInvocation = function (methodName, args, streamIds) { + var invocationId = this.invocationId; + this.invocationId++; + return { + arguments: args, + invocationId: invocationId.toString(), + streamIds: streamIds, + target: methodName, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].StreamInvocation, + }; + }; + HubConnection.prototype.createCancelInvocation = function (id) { + return { + invocationId: id, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].CancelInvocation, + }; + }; + HubConnection.prototype.createStreamItemMessage = function (id, item) { + return { + invocationId: id, + item: item, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].StreamItem, + }; + }; + HubConnection.prototype.createCompletionMessage = function (id, error, result) { + if (error) { + return { + error: error, + invocationId: id, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion, + }; + } + return { + invocationId: id, + result: result, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion, + }; + }; + return HubConnection; +}()); + + + +/***/ }), +/* 11 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HandshakeProtocol", function() { return HandshakeProtocol; }); +/* harmony import */ var _TextMessageFormat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + + +/** @private */ +var HandshakeProtocol = /** @class */ (function () { + function HandshakeProtocol() { + } + // Handshake request is always JSON + HandshakeProtocol.prototype.writeHandshakeRequest = function (handshakeRequest) { + return _TextMessageFormat__WEBPACK_IMPORTED_MODULE_0__["TextMessageFormat"].write(JSON.stringify(handshakeRequest)); + }; + HandshakeProtocol.prototype.parseHandshakeResponse = function (data) { + var responseMessage; + var messageData; + var remainingData; + if (Object(_Utils__WEBPACK_IMPORTED_MODULE_1__["isArrayBuffer"])(data) || (typeof Buffer !== "undefined" && data instanceof Buffer)) { + // Format is binary but still need to read JSON text from handshake response + var binaryData = new Uint8Array(data); + var separatorIndex = binaryData.indexOf(_TextMessageFormat__WEBPACK_IMPORTED_MODULE_0__["TextMessageFormat"].RecordSeparatorCode); + if (separatorIndex === -1) { + throw new Error("Message is incomplete."); + } + // content before separator is handshake response + // optional content after is additional messages + var responseLength = separatorIndex + 1; + messageData = String.fromCharCode.apply(null, binaryData.slice(0, responseLength)); + remainingData = (binaryData.byteLength > responseLength) ? binaryData.slice(responseLength).buffer : null; + } + else { + var textData = data; + var separatorIndex = textData.indexOf(_TextMessageFormat__WEBPACK_IMPORTED_MODULE_0__["TextMessageFormat"].RecordSeparator); + if (separatorIndex === -1) { + throw new Error("Message is incomplete."); + } + // content before separator is handshake response + // optional content after is additional messages + var responseLength = separatorIndex + 1; + messageData = textData.substring(0, responseLength); + remainingData = (textData.length > responseLength) ? textData.substring(responseLength) : null; + } + // At this point we should have just the single handshake message + var messages = _TextMessageFormat__WEBPACK_IMPORTED_MODULE_0__["TextMessageFormat"].parse(messageData); + var response = JSON.parse(messages[0]); + if (response.type) { + throw new Error("Expected a handshake response from the server."); + } + responseMessage = response; + // multiple messages could have arrived with handshake + // return additional data to be parsed as usual, or null if all parsed + return [remainingData, responseMessage]; + }; + return HandshakeProtocol; +}()); + + + +/***/ }), +/* 12 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TextMessageFormat", function() { return TextMessageFormat; }); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Not exported from index +/** @private */ +var TextMessageFormat = /** @class */ (function () { + function TextMessageFormat() { + } + TextMessageFormat.write = function (output) { + return "" + output + TextMessageFormat.RecordSeparator; + }; + TextMessageFormat.parse = function (input) { + if (input[input.length - 1] !== TextMessageFormat.RecordSeparator) { + throw new Error("Message is incomplete."); + } + var messages = input.split(TextMessageFormat.RecordSeparator); + messages.pop(); + return messages; + }; + TextMessageFormat.RecordSeparatorCode = 0x1e; + TextMessageFormat.RecordSeparator = String.fromCharCode(TextMessageFormat.RecordSeparatorCode); + return TextMessageFormat; +}()); + + + +/***/ }), +/* 13 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Arg", function() { return Arg; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Platform", function() { return Platform; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getDataDetail", function() { return getDataDetail; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "formatArrayBuffer", function() { return formatArrayBuffer; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isArrayBuffer", function() { return isArrayBuffer; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sendMessage", function() { return sendMessage; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createLogger", function() { return createLogger; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubjectSubscription", function() { return SubjectSubscription; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ConsoleLogger", function() { return ConsoleLogger; }); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9); +/* harmony import */ var _Loggers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (undefined && undefined.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; + + +/** @private */ +var Arg = /** @class */ (function () { + function Arg() { + } + Arg.isRequired = function (val, name) { + if (val === null || val === undefined) { + throw new Error("The '" + name + "' argument is required."); + } + }; + Arg.isIn = function (val, values, name) { + // TypeScript enums have keys for **both** the name and the value of each enum member on the type itself. + if (!(val in values)) { + throw new Error("Unknown " + name + " value: " + val + "."); + } + }; + return Arg; +}()); + +/** @private */ +var Platform = /** @class */ (function () { + function Platform() { + } + Object.defineProperty(Platform, "isBrowser", { + get: function () { + return typeof window === "object"; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Platform, "isWebWorker", { + get: function () { + return typeof self === "object" && "importScripts" in self; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Platform, "isNode", { + get: function () { + return !this.isBrowser && !this.isWebWorker; + }, + enumerable: true, + configurable: true + }); + return Platform; +}()); + +/** @private */ +function getDataDetail(data, includeContent) { + var detail = ""; + if (isArrayBuffer(data)) { + detail = "Binary data of length " + data.byteLength; + if (includeContent) { + detail += ". Content: '" + formatArrayBuffer(data) + "'"; + } + } + else if (typeof data === "string") { + detail = "String data of length " + data.length; + if (includeContent) { + detail += ". Content: '" + data + "'"; + } + } + return detail; +} +/** @private */ +function formatArrayBuffer(data) { + var view = new Uint8Array(data); + // Uint8Array.map only supports returning another Uint8Array? + var str = ""; + view.forEach(function (num) { + var pad = num < 16 ? "0" : ""; + str += "0x" + pad + num.toString(16) + " "; + }); + // Trim of trailing space. + return str.substr(0, str.length - 1); +} +// Also in signalr-protocol-msgpack/Utils.ts +/** @private */ +function isArrayBuffer(val) { + return val && typeof ArrayBuffer !== "undefined" && + (val instanceof ArrayBuffer || + // Sometimes we get an ArrayBuffer that doesn't satisfy instanceof + (val.constructor && val.constructor.name === "ArrayBuffer")); +} +/** @private */ +function sendMessage(logger, transportName, httpClient, url, accessTokenFactory, content, logMessageContent) { + return __awaiter(this, void 0, void 0, function () { + var _a, headers, token, responseType, response; + return __generator(this, function (_b) { + switch (_b.label) { + case 0: + if (!accessTokenFactory) return [3 /*break*/, 2]; + return [4 /*yield*/, accessTokenFactory()]; + case 1: + token = _b.sent(); + if (token) { + headers = (_a = {}, + _a["Authorization"] = "Bearer " + token, + _a); + } + _b.label = 2; + case 2: + logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(" + transportName + " transport) sending data. " + getDataDetail(content, logMessageContent) + "."); + responseType = isArrayBuffer(content) ? "arraybuffer" : "text"; + return [4 /*yield*/, httpClient.post(url, { + content: content, + headers: headers, + responseType: responseType, + })]; + case 3: + response = _b.sent(); + logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(" + transportName + " transport) request complete. Response status: " + response.statusCode + "."); + return [2 /*return*/]; + } + }); + }); +} +/** @private */ +function createLogger(logger) { + if (logger === undefined) { + return new ConsoleLogger(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Information); + } + if (logger === null) { + return _Loggers__WEBPACK_IMPORTED_MODULE_1__["NullLogger"].instance; + } + if (logger.log) { + return logger; + } + return new ConsoleLogger(logger); +} +/** @private */ +var SubjectSubscription = /** @class */ (function () { + function SubjectSubscription(subject, observer) { + this.subject = subject; + this.observer = observer; + } + SubjectSubscription.prototype.dispose = function () { + var index = this.subject.observers.indexOf(this.observer); + if (index > -1) { + this.subject.observers.splice(index, 1); + } + if (this.subject.observers.length === 0 && this.subject.cancelCallback) { + this.subject.cancelCallback().catch(function (_) { }); + } + }; + return SubjectSubscription; +}()); + +/** @private */ +var ConsoleLogger = /** @class */ (function () { + function ConsoleLogger(minimumLogLevel) { + this.minimumLogLevel = minimumLogLevel; + this.outputConsole = console; + } + ConsoleLogger.prototype.log = function (logLevel, message) { + if (logLevel >= this.minimumLogLevel) { + switch (logLevel) { + case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Critical: + case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Error: + this.outputConsole.error("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); + break; + case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Warning: + this.outputConsole.warn("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); + break; + case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Information: + this.outputConsole.info("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); + break; + default: + // console.debug only goes to attached debuggers in Node, so we use console.log for Trace and Debug + this.outputConsole.log("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); + break; + } + } + }; + return ConsoleLogger; +}()); + + + +/***/ }), +/* 14 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NullLogger", function() { return NullLogger; }); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +/** A logger that does nothing when log messages are sent to it. */ +var NullLogger = /** @class */ (function () { + function NullLogger() { + } + /** @inheritDoc */ + // tslint:disable-next-line + NullLogger.prototype.log = function (_logLevel, _message) { + }; + /** The singleton instance of the {@link @microsoft/signalr.NullLogger}. */ + NullLogger.instance = new NullLogger(); + return NullLogger; +}()); + + + +/***/ }), +/* 15 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MessageType", function() { return MessageType; }); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +/** Defines the type of a Hub Message. */ +var MessageType; +(function (MessageType) { + /** Indicates the message is an Invocation message and implements the {@link @microsoft/signalr.InvocationMessage} interface. */ + MessageType[MessageType["Invocation"] = 1] = "Invocation"; + /** Indicates the message is a StreamItem message and implements the {@link @microsoft/signalr.StreamItemMessage} interface. */ + MessageType[MessageType["StreamItem"] = 2] = "StreamItem"; + /** Indicates the message is a Completion message and implements the {@link @microsoft/signalr.CompletionMessage} interface. */ + MessageType[MessageType["Completion"] = 3] = "Completion"; + /** Indicates the message is a Stream Invocation message and implements the {@link @microsoft/signalr.StreamInvocationMessage} interface. */ + MessageType[MessageType["StreamInvocation"] = 4] = "StreamInvocation"; + /** Indicates the message is a Cancel Invocation message and implements the {@link @microsoft/signalr.CancelInvocationMessage} interface. */ + MessageType[MessageType["CancelInvocation"] = 5] = "CancelInvocation"; + /** Indicates the message is a Ping message and implements the {@link @microsoft/signalr.PingMessage} interface. */ + MessageType[MessageType["Ping"] = 6] = "Ping"; + /** Indicates the message is a Close message and implements the {@link @microsoft/signalr.CloseMessage} interface. */ + MessageType[MessageType["Close"] = 7] = "Close"; +})(MessageType || (MessageType = {})); + + +/***/ }), +/* 16 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return Subject; }); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +/** Stream implementation to stream items to the server. */ +var Subject = /** @class */ (function () { + function Subject() { + this.observers = []; + } + Subject.prototype.next = function (item) { + for (var _i = 0, _a = this.observers; _i < _a.length; _i++) { + var observer = _a[_i]; + observer.next(item); + } + }; + Subject.prototype.error = function (err) { + for (var _i = 0, _a = this.observers; _i < _a.length; _i++) { + var observer = _a[_i]; + if (observer.error) { + observer.error(err); + } + } + }; + Subject.prototype.complete = function () { + for (var _i = 0, _a = this.observers; _i < _a.length; _i++) { + var observer = _a[_i]; + if (observer.complete) { + observer.complete(); + } + } + }; + Subject.prototype.subscribe = function (observer) { + this.observers.push(observer); + return new _Utils__WEBPACK_IMPORTED_MODULE_0__["SubjectSubscription"](this, observer); + }; + return Subject; +}()); + + + +/***/ }), +/* 17 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HubConnectionBuilder", function() { return HubConnectionBuilder; }); +/* harmony import */ var _DefaultReconnectPolicy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18); +/* harmony import */ var _HttpConnection__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(19); +/* harmony import */ var _HubConnection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(10); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9); +/* harmony import */ var _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(25); +/* harmony import */ var _Loggers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(14); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(13); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +var __assign = (undefined && undefined.__assign) || Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; +}; + + + + + + + +// tslint:disable:object-literal-sort-keys +var LogLevelNameMapping = { + trace: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Trace, + debug: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Debug, + info: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Information, + information: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Information, + warn: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Warning, + warning: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Warning, + error: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Error, + critical: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Critical, + none: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].None, +}; +function parseLogLevel(name) { + // Case-insensitive matching via lower-casing + // Yes, I know case-folding is a complicated problem in Unicode, but we only support + // the ASCII strings defined in LogLevelNameMapping anyway, so it's fine -anurse. + var mapping = LogLevelNameMapping[name.toLowerCase()]; + if (typeof mapping !== "undefined") { + return mapping; + } + else { + throw new Error("Unknown log level: " + name); + } +} +/** A builder for configuring {@link @microsoft/signalr.HubConnection} instances. */ +var HubConnectionBuilder = /** @class */ (function () { + function HubConnectionBuilder() { + } + HubConnectionBuilder.prototype.configureLogging = function (logging) { + _Utils__WEBPACK_IMPORTED_MODULE_6__["Arg"].isRequired(logging, "logging"); + if (isLogger(logging)) { + this.logger = logging; + } + else if (typeof logging === "string") { + var logLevel = parseLogLevel(logging); + this.logger = new _Utils__WEBPACK_IMPORTED_MODULE_6__["ConsoleLogger"](logLevel); + } + else { + this.logger = new _Utils__WEBPACK_IMPORTED_MODULE_6__["ConsoleLogger"](logging); + } + return this; + }; + HubConnectionBuilder.prototype.withUrl = function (url, transportTypeOrOptions) { + _Utils__WEBPACK_IMPORTED_MODULE_6__["Arg"].isRequired(url, "url"); + this.url = url; + // Flow-typing knows where it's at. Since HttpTransportType is a number and IHttpConnectionOptions is guaranteed + // to be an object, we know (as does TypeScript) this comparison is all we need to figure out which overload was called. + if (typeof transportTypeOrOptions === "object") { + this.httpConnectionOptions = __assign({}, this.httpConnectionOptions, transportTypeOrOptions); + } + else { + this.httpConnectionOptions = __assign({}, this.httpConnectionOptions, { transport: transportTypeOrOptions }); + } + return this; + }; + /** Configures the {@link @microsoft/signalr.HubConnection} to use the specified Hub Protocol. + * + * @param {IHubProtocol} protocol The {@link @microsoft/signalr.IHubProtocol} implementation to use. + */ + HubConnectionBuilder.prototype.withHubProtocol = function (protocol) { + _Utils__WEBPACK_IMPORTED_MODULE_6__["Arg"].isRequired(protocol, "protocol"); + this.protocol = protocol; + return this; + }; + HubConnectionBuilder.prototype.withAutomaticReconnect = function (retryDelaysOrReconnectPolicy) { + if (this.reconnectPolicy) { + throw new Error("A reconnectPolicy has already been set."); + } + if (!retryDelaysOrReconnectPolicy) { + this.reconnectPolicy = new _DefaultReconnectPolicy__WEBPACK_IMPORTED_MODULE_0__["DefaultReconnectPolicy"](); + } + else if (Array.isArray(retryDelaysOrReconnectPolicy)) { + this.reconnectPolicy = new _DefaultReconnectPolicy__WEBPACK_IMPORTED_MODULE_0__["DefaultReconnectPolicy"](retryDelaysOrReconnectPolicy); + } + else { + this.reconnectPolicy = retryDelaysOrReconnectPolicy; + } + return this; + }; + /** Creates a {@link @microsoft/signalr.HubConnection} from the configuration options specified in this builder. + * + * @returns {HubConnection} The configured {@link @microsoft/signalr.HubConnection}. + */ + HubConnectionBuilder.prototype.build = function () { + // If httpConnectionOptions has a logger, use it. Otherwise, override it with the one + // provided to configureLogger + var httpConnectionOptions = this.httpConnectionOptions || {}; + // If it's 'null', the user **explicitly** asked for null, don't mess with it. + if (httpConnectionOptions.logger === undefined) { + // If our logger is undefined or null, that's OK, the HttpConnection constructor will handle it. + httpConnectionOptions.logger = this.logger; + } + // Now create the connection + if (!this.url) { + throw new Error("The 'HubConnectionBuilder.withUrl' method must be called before building the connection."); + } + var connection = new _HttpConnection__WEBPACK_IMPORTED_MODULE_1__["HttpConnection"](this.url, httpConnectionOptions); + return _HubConnection__WEBPACK_IMPORTED_MODULE_2__["HubConnection"].create(connection, this.logger || _Loggers__WEBPACK_IMPORTED_MODULE_5__["NullLogger"].instance, this.protocol || new _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_4__["JsonHubProtocol"](), this.reconnectPolicy); + }; + return HubConnectionBuilder; +}()); + +function isLogger(logger) { + return logger.log !== undefined; +} + + +/***/ }), +/* 18 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DefaultReconnectPolicy", function() { return DefaultReconnectPolicy; }); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// 0, 2, 10, 30 second delays before reconnect attempts. +var DEFAULT_RETRY_DELAYS_IN_MILLISECONDS = [0, 2000, 10000, 30000, null]; +/** @private */ +var DefaultReconnectPolicy = /** @class */ (function () { + function DefaultReconnectPolicy(retryDelays) { + this.retryDelays = retryDelays !== undefined ? retryDelays.concat([null]) : DEFAULT_RETRY_DELAYS_IN_MILLISECONDS; + } + DefaultReconnectPolicy.prototype.nextRetryDelayInMilliseconds = function (retryContext) { + return this.retryDelays[retryContext.previousRetryCount]; + }; + return DefaultReconnectPolicy; +}()); + + + +/***/ }), +/* 19 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HttpConnection", function() { return HttpConnection; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransportSendQueue", function() { return TransportSendQueue; }); +/* harmony import */ var _DefaultHttpClient__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(6); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9); +/* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(20); +/* harmony import */ var _LongPollingTransport__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(21); +/* harmony import */ var _ServerSentEventsTransport__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(13); +/* harmony import */ var _WebSocketTransport__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(24); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (undefined && undefined.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; + + + + + + + +var MAX_REDIRECTS = 100; +var WebSocketModule = null; +var EventSourceModule = null; +if (_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && "function" !== "undefined") { + // In order to ignore the dynamic require in webpack builds we need to do this magic + // @ts-ignore: TS doesn't know about these names + var requireFunc = true ? require : undefined; + WebSocketModule = requireFunc("ws"); + EventSourceModule = requireFunc("eventsource"); +} +/** @private */ +var HttpConnection = /** @class */ (function () { + function HttpConnection(url, options) { + if (options === void 0) { options = {}; } + this.features = {}; + this.negotiateVersion = 1; + _Utils__WEBPACK_IMPORTED_MODULE_5__["Arg"].isRequired(url, "url"); + this.logger = Object(_Utils__WEBPACK_IMPORTED_MODULE_5__["createLogger"])(options.logger); + this.baseUrl = this.resolveUrl(url); + options = options || {}; + options.logMessageContent = options.logMessageContent || false; + if (!_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && typeof WebSocket !== "undefined" && !options.WebSocket) { + options.WebSocket = WebSocket; + } + else if (_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && !options.WebSocket) { + if (WebSocketModule) { + options.WebSocket = WebSocketModule; + } + } + if (!_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && typeof EventSource !== "undefined" && !options.EventSource) { + options.EventSource = EventSource; + } + else if (_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && !options.EventSource) { + if (typeof EventSourceModule !== "undefined") { + options.EventSource = EventSourceModule; + } + } + this.httpClient = options.httpClient || new _DefaultHttpClient__WEBPACK_IMPORTED_MODULE_0__["DefaultHttpClient"](this.logger); + this.connectionState = "Disconnected" /* Disconnected */; + this.connectionStarted = false; + this.options = options; + this.onreceive = null; + this.onclose = null; + } + HttpConnection.prototype.start = function (transferFormat) { + return __awaiter(this, void 0, void 0, function () { + var message, message; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + transferFormat = transferFormat || _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"].Binary; + _Utils__WEBPACK_IMPORTED_MODULE_5__["Arg"].isIn(transferFormat, _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"], "transferFormat"); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Starting connection with transfer format '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][transferFormat] + "'."); + if (this.connectionState !== "Disconnected" /* Disconnected */) { + return [2 /*return*/, Promise.reject(new Error("Cannot start an HttpConnection that is not in the 'Disconnected' state."))]; + } + this.connectionState = "Connecting " /* Connecting */; + this.startInternalPromise = this.startInternal(transferFormat); + return [4 /*yield*/, this.startInternalPromise]; + case 1: + _a.sent(); + if (!(this.connectionState === "Disconnecting" /* Disconnecting */)) return [3 /*break*/, 3]; + message = "Failed to start the HttpConnection before stop() was called."; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, message); + // We cannot await stopPromise inside startInternal since stopInternal awaits the startInternalPromise. + return [4 /*yield*/, this.stopPromise]; + case 2: + // We cannot await stopPromise inside startInternal since stopInternal awaits the startInternalPromise. + _a.sent(); + return [2 /*return*/, Promise.reject(new Error(message))]; + case 3: + if (this.connectionState !== "Connected" /* Connected */) { + message = "HttpConnection.startInternal completed gracefully but didn't enter the connection into the connected state!"; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, message); + return [2 /*return*/, Promise.reject(new Error(message))]; + } + _a.label = 4; + case 4: + this.connectionStarted = true; + return [2 /*return*/]; + } + }); + }); + }; + HttpConnection.prototype.send = function (data) { + if (this.connectionState !== "Connected" /* Connected */) { + return Promise.reject(new Error("Cannot send data if the connection is not in the 'Connected' State.")); + } + if (!this.sendQueue) { + this.sendQueue = new TransportSendQueue(this.transport); + } + // Transport will not be null if state is connected + return this.sendQueue.send(data); + }; + HttpConnection.prototype.stop = function (error) { + return __awaiter(this, void 0, void 0, function () { + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + if (this.connectionState === "Disconnected" /* Disconnected */) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Call to HttpConnection.stop(" + error + ") ignored because the connection is already in the disconnected state."); + return [2 /*return*/, Promise.resolve()]; + } + if (this.connectionState === "Disconnecting" /* Disconnecting */) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Call to HttpConnection.stop(" + error + ") ignored because the connection is already in the disconnecting state."); + return [2 /*return*/, this.stopPromise]; + } + this.connectionState = "Disconnecting" /* Disconnecting */; + this.stopPromise = new Promise(function (resolve) { + // Don't complete stop() until stopConnection() completes. + _this.stopPromiseResolver = resolve; + }); + // stopInternal should never throw so just observe it. + return [4 /*yield*/, this.stopInternal(error)]; + case 1: + // stopInternal should never throw so just observe it. + _a.sent(); + return [4 /*yield*/, this.stopPromise]; + case 2: + _a.sent(); + return [2 /*return*/]; + } + }); + }); + }; + HttpConnection.prototype.stopInternal = function (error) { + return __awaiter(this, void 0, void 0, function () { + var e_1, e_2, e_3; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + // Set error as soon as possible otherwise there is a race between + // the transport closing and providing an error and the error from a close message + // We would prefer the close message error. + this.stopError = error; + _a.label = 1; + case 1: + _a.trys.push([1, 3, , 4]); + return [4 /*yield*/, this.startInternalPromise]; + case 2: + _a.sent(); + return [3 /*break*/, 4]; + case 3: + e_1 = _a.sent(); + return [3 /*break*/, 4]; + case 4: + if (!this.sendQueue) return [3 /*break*/, 9]; + _a.label = 5; + case 5: + _a.trys.push([5, 7, , 8]); + return [4 /*yield*/, this.sendQueue.stop()]; + case 6: + _a.sent(); + return [3 /*break*/, 8]; + case 7: + e_2 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "TransportSendQueue.stop() threw error '" + e_2 + "'."); + return [3 /*break*/, 8]; + case 8: + this.sendQueue = undefined; + _a.label = 9; + case 9: + if (!this.transport) return [3 /*break*/, 14]; + _a.label = 10; + case 10: + _a.trys.push([10, 12, , 13]); + return [4 /*yield*/, this.transport.stop()]; + case 11: + _a.sent(); + return [3 /*break*/, 13]; + case 12: + e_3 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "HttpConnection.transport.stop() threw error '" + e_3 + "'."); + this.stopConnection(); + return [3 /*break*/, 13]; + case 13: + this.transport = undefined; + return [3 /*break*/, 15]; + case 14: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "HttpConnection.transport is undefined in HttpConnection.stop() because start() failed."); + this.stopConnection(); + _a.label = 15; + case 15: return [2 /*return*/]; + } + }); + }); + }; + HttpConnection.prototype.startInternal = function (transferFormat) { + return __awaiter(this, void 0, void 0, function () { + var url, negotiateResponse, redirects, _loop_1, this_1, e_4; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + url = this.baseUrl; + this.accessTokenFactory = this.options.accessTokenFactory; + _a.label = 1; + case 1: + _a.trys.push([1, 12, , 13]); + if (!this.options.skipNegotiation) return [3 /*break*/, 5]; + if (!(this.options.transport === _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].WebSockets)) return [3 /*break*/, 3]; + // No need to add a connection ID in this case + this.transport = this.constructTransport(_ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].WebSockets); + // We should just call connect directly in this case. + // No fallback or negotiate in this case. + return [4 /*yield*/, this.startTransport(url, transferFormat)]; + case 2: + // We should just call connect directly in this case. + // No fallback or negotiate in this case. + _a.sent(); + return [3 /*break*/, 4]; + case 3: throw new Error("Negotiation can only be skipped when using the WebSocket transport directly."); + case 4: return [3 /*break*/, 11]; + case 5: + negotiateResponse = null; + redirects = 0; + _loop_1 = function () { + var accessToken_1; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: return [4 /*yield*/, this_1.getNegotiationResponse(url)]; + case 1: + negotiateResponse = _a.sent(); + // the user tries to stop the connection when it is being started + if (this_1.connectionState === "Disconnecting" /* Disconnecting */ || this_1.connectionState === "Disconnected" /* Disconnected */) { + throw new Error("The connection was stopped during negotiation."); + } + if (negotiateResponse.error) { + throw new Error(negotiateResponse.error); + } + if (negotiateResponse.ProtocolVersion) { + throw new Error("Detected a connection attempt to an ASP.NET SignalR Server. This client only supports connecting to an ASP.NET Core SignalR Server. See https://aka.ms/signalr-core-differences for details."); + } + if (negotiateResponse.url) { + url = negotiateResponse.url; + } + if (negotiateResponse.accessToken) { + accessToken_1 = negotiateResponse.accessToken; + this_1.accessTokenFactory = function () { return accessToken_1; }; + } + redirects++; + return [2 /*return*/]; + } + }); + }; + this_1 = this; + _a.label = 6; + case 6: return [5 /*yield**/, _loop_1()]; + case 7: + _a.sent(); + _a.label = 8; + case 8: + if (negotiateResponse.url && redirects < MAX_REDIRECTS) return [3 /*break*/, 6]; + _a.label = 9; + case 9: + if (redirects === MAX_REDIRECTS && negotiateResponse.url) { + throw new Error("Negotiate redirection limit exceeded."); + } + return [4 /*yield*/, this.createTransport(url, this.options.transport, negotiateResponse, transferFormat)]; + case 10: + _a.sent(); + _a.label = 11; + case 11: + if (this.transport instanceof _LongPollingTransport__WEBPACK_IMPORTED_MODULE_3__["LongPollingTransport"]) { + this.features.inherentKeepAlive = true; + } + if (this.connectionState === "Connecting " /* Connecting */) { + // Ensure the connection transitions to the connected state prior to completing this.startInternalPromise. + // start() will handle the case when stop was called and startInternal exits still in the disconnecting state. + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "The HttpConnection connected successfully."); + this.connectionState = "Connected" /* Connected */; + } + return [3 /*break*/, 13]; + case 12: + e_4 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Failed to start the connection: " + e_4); + this.connectionState = "Disconnected" /* Disconnected */; + this.transport = undefined; + return [2 /*return*/, Promise.reject(e_4)]; + case 13: return [2 /*return*/]; + } + }); + }); + }; + HttpConnection.prototype.getNegotiationResponse = function (url) { + return __awaiter(this, void 0, void 0, function () { + var _a, headers, token, negotiateUrl, response, negotiateResponse, e_5; + return __generator(this, function (_b) { + switch (_b.label) { + case 0: + if (!this.accessTokenFactory) return [3 /*break*/, 2]; + return [4 /*yield*/, this.accessTokenFactory()]; + case 1: + token = _b.sent(); + if (token) { + headers = (_a = {}, + _a["Authorization"] = "Bearer " + token, + _a); + } + _b.label = 2; + case 2: + negotiateUrl = this.resolveNegotiateUrl(url); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Sending negotiation request: " + negotiateUrl + "."); + _b.label = 3; + case 3: + _b.trys.push([3, 5, , 6]); + return [4 /*yield*/, this.httpClient.post(negotiateUrl, { + content: "", + headers: headers, + })]; + case 4: + response = _b.sent(); + if (response.statusCode !== 200) { + return [2 /*return*/, Promise.reject(new Error("Unexpected status code returned from negotiate " + response.statusCode))]; + } + negotiateResponse = JSON.parse(response.content); + if (!negotiateResponse.negotiateVersion || negotiateResponse.negotiateVersion < 1) { + // Negotiate version 0 doesn't use connectionToken + // So we set it equal to connectionId so all our logic can use connectionToken without being aware of the negotiate version + negotiateResponse.connectionToken = negotiateResponse.connectionId; + } + return [2 /*return*/, negotiateResponse]; + case 5: + e_5 = _b.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Failed to complete negotiation with the server: " + e_5); + return [2 /*return*/, Promise.reject(e_5)]; + case 6: return [2 /*return*/]; + } + }); + }); + }; + HttpConnection.prototype.createConnectUrl = function (url, connectionToken) { + if (!connectionToken) { + return url; + } + return url + (url.indexOf("?") === -1 ? "?" : "&") + ("id=" + connectionToken); + }; + HttpConnection.prototype.createTransport = function (url, requestedTransport, negotiateResponse, requestedTransferFormat) { + return __awaiter(this, void 0, void 0, function () { + var connectUrl, transportExceptions, transports, negotiate, _i, transports_1, endpoint, transportOrError, ex_1, ex_2, message; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + connectUrl = this.createConnectUrl(url, negotiateResponse.connectionToken); + if (!this.isITransport(requestedTransport)) return [3 /*break*/, 2]; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Connection was provided an instance of ITransport, using that directly."); + this.transport = requestedTransport; + return [4 /*yield*/, this.startTransport(connectUrl, requestedTransferFormat)]; + case 1: + _a.sent(); + this.connectionId = negotiateResponse.connectionId; + return [2 /*return*/]; + case 2: + transportExceptions = []; + transports = negotiateResponse.availableTransports || []; + negotiate = negotiateResponse; + _i = 0, transports_1 = transports; + _a.label = 3; + case 3: + if (!(_i < transports_1.length)) return [3 /*break*/, 13]; + endpoint = transports_1[_i]; + transportOrError = this.resolveTransportOrError(endpoint, requestedTransport, requestedTransferFormat); + if (!(transportOrError instanceof Error)) return [3 /*break*/, 4]; + // Store the error and continue, we don't want to cause a re-negotiate in these cases + transportExceptions.push(endpoint.transport + " failed: " + transportOrError); + return [3 /*break*/, 12]; + case 4: + if (!this.isITransport(transportOrError)) return [3 /*break*/, 12]; + this.transport = transportOrError; + if (!!negotiate) return [3 /*break*/, 9]; + _a.label = 5; + case 5: + _a.trys.push([5, 7, , 8]); + return [4 /*yield*/, this.getNegotiationResponse(url)]; + case 6: + negotiate = _a.sent(); + return [3 /*break*/, 8]; + case 7: + ex_1 = _a.sent(); + return [2 /*return*/, Promise.reject(ex_1)]; + case 8: + connectUrl = this.createConnectUrl(url, negotiate.connectionToken); + _a.label = 9; + case 9: + _a.trys.push([9, 11, , 12]); + return [4 /*yield*/, this.startTransport(connectUrl, requestedTransferFormat)]; + case 10: + _a.sent(); + this.connectionId = negotiate.connectionId; + return [2 /*return*/]; + case 11: + ex_2 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Failed to start the transport '" + endpoint.transport + "': " + ex_2); + negotiate = undefined; + transportExceptions.push(endpoint.transport + " failed: " + ex_2); + if (this.connectionState !== "Connecting " /* Connecting */) { + message = "Failed to select transport before stop() was called."; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, message); + return [2 /*return*/, Promise.reject(new Error(message))]; + } + return [3 /*break*/, 12]; + case 12: + _i++; + return [3 /*break*/, 3]; + case 13: + if (transportExceptions.length > 0) { + return [2 /*return*/, Promise.reject(new Error("Unable to connect to the server with any of the available transports. " + transportExceptions.join(" ")))]; + } + return [2 /*return*/, Promise.reject(new Error("None of the transports supported by the client are supported by the server."))]; + } + }); + }); + }; + HttpConnection.prototype.constructTransport = function (transport) { + switch (transport) { + case _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].WebSockets: + if (!this.options.WebSocket) { + throw new Error("'WebSocket' is not supported in your environment."); + } + return new _WebSocketTransport__WEBPACK_IMPORTED_MODULE_6__["WebSocketTransport"](this.httpClient, this.accessTokenFactory, this.logger, this.options.logMessageContent || false, this.options.WebSocket); + case _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].ServerSentEvents: + if (!this.options.EventSource) { + throw new Error("'EventSource' is not supported in your environment."); + } + return new _ServerSentEventsTransport__WEBPACK_IMPORTED_MODULE_4__["ServerSentEventsTransport"](this.httpClient, this.accessTokenFactory, this.logger, this.options.logMessageContent || false, this.options.EventSource); + case _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].LongPolling: + return new _LongPollingTransport__WEBPACK_IMPORTED_MODULE_3__["LongPollingTransport"](this.httpClient, this.accessTokenFactory, this.logger, this.options.logMessageContent || false); + default: + throw new Error("Unknown transport: " + transport + "."); + } + }; + HttpConnection.prototype.startTransport = function (url, transferFormat) { + var _this = this; + this.transport.onreceive = this.onreceive; + this.transport.onclose = function (e) { return _this.stopConnection(e); }; + return this.transport.connect(url, transferFormat); + }; + HttpConnection.prototype.resolveTransportOrError = function (endpoint, requestedTransport, requestedTransferFormat) { + var transport = _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][endpoint.transport]; + if (transport === null || transport === undefined) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Skipping transport '" + endpoint.transport + "' because it is not supported by this client."); + return new Error("Skipping transport '" + endpoint.transport + "' because it is not supported by this client."); + } + else { + if (transportMatches(requestedTransport, transport)) { + var transferFormats = endpoint.transferFormats.map(function (s) { return _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][s]; }); + if (transferFormats.indexOf(requestedTransferFormat) >= 0) { + if ((transport === _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].WebSockets && !this.options.WebSocket) || + (transport === _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].ServerSentEvents && !this.options.EventSource)) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Skipping transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' because it is not supported in your environment.'"); + return new Error("'" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' is not supported in your environment."); + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Selecting transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "'."); + try { + return this.constructTransport(transport); + } + catch (ex) { + return ex; + } + } + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Skipping transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' because it does not support the requested transfer format '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][requestedTransferFormat] + "'."); + return new Error("'" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' does not support " + _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][requestedTransferFormat] + "."); + } + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Skipping transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' because it was disabled by the client."); + return new Error("'" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' is disabled by the client."); + } + } + }; + HttpConnection.prototype.isITransport = function (transport) { + return transport && typeof (transport) === "object" && "connect" in transport; + }; + HttpConnection.prototype.stopConnection = function (error) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "HttpConnection.stopConnection(" + error + ") called while in state " + this.connectionState + "."); + this.transport = undefined; + // If we have a stopError, it takes precedence over the error from the transport + error = this.stopError || error; + this.stopError = undefined; + if (this.connectionState === "Disconnected" /* Disconnected */) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Call to HttpConnection.stopConnection(" + error + ") was ignored because the connection is already in the disconnected state."); + return; + } + if (this.connectionState === "Connecting " /* Connecting */) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Warning, "Call to HttpConnection.stopConnection(" + error + ") was ignored because the connection hasn't yet left the in the connecting state."); + return; + } + if (this.connectionState === "Disconnecting" /* Disconnecting */) { + // A call to stop() induced this call to stopConnection and needs to be completed. + // Any stop() awaiters will be scheduled to continue after the onclose callback fires. + this.stopPromiseResolver(); + } + if (error) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Connection disconnected with error '" + error + "'."); + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Information, "Connection disconnected."); + } + this.connectionId = undefined; + this.connectionState = "Disconnected" /* Disconnected */; + if (this.onclose && this.connectionStarted) { + this.connectionStarted = false; + try { + this.onclose(error); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "HttpConnection.onclose(" + error + ") threw error '" + e + "'."); + } + } + }; + HttpConnection.prototype.resolveUrl = function (url) { + // startsWith is not supported in IE + if (url.lastIndexOf("https://", 0) === 0 || url.lastIndexOf("http://", 0) === 0) { + return url; + } + if (!_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isBrowser || !window.document) { + throw new Error("Cannot resolve '" + url + "'."); + } + // Setting the url to the href propery of an anchor tag handles normalization + // for us. There are 3 main cases. + // 1. Relative path normalization e.g "b" -> "http://localhost:5000/a/b" + // 2. Absolute path normalization e.g "/a/b" -> "http://localhost:5000/a/b" + // 3. Networkpath reference normalization e.g "//localhost:5000/a/b" -> "http://localhost:5000/a/b" + var aTag = window.document.createElement("a"); + aTag.href = url; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Information, "Normalizing '" + url + "' to '" + aTag.href + "'."); + return aTag.href; + }; + HttpConnection.prototype.resolveNegotiateUrl = function (url) { + var index = url.indexOf("?"); + var negotiateUrl = url.substring(0, index === -1 ? url.length : index); + if (negotiateUrl[negotiateUrl.length - 1] !== "/") { + negotiateUrl += "/"; + } + negotiateUrl += "negotiate"; + negotiateUrl += index === -1 ? "" : url.substring(index); + if (negotiateUrl.indexOf("negotiateVersion") === -1) { + negotiateUrl += index === -1 ? "?" : "&"; + negotiateUrl += "negotiateVersion=" + this.negotiateVersion; + } + return negotiateUrl; + }; + return HttpConnection; +}()); + +function transportMatches(requestedTransport, actualTransport) { + return !requestedTransport || ((actualTransport & requestedTransport) !== 0); +} +/** @private */ +var TransportSendQueue = /** @class */ (function () { + function TransportSendQueue(transport) { + this.transport = transport; + this.buffer = []; + this.executing = true; + this.sendBufferedData = new PromiseSource(); + this.transportResult = new PromiseSource(); + this.sendLoopPromise = this.sendLoop(); + } + TransportSendQueue.prototype.send = function (data) { + this.bufferData(data); + if (!this.transportResult) { + this.transportResult = new PromiseSource(); + } + return this.transportResult.promise; + }; + TransportSendQueue.prototype.stop = function () { + this.executing = false; + this.sendBufferedData.resolve(); + return this.sendLoopPromise; + }; + TransportSendQueue.prototype.bufferData = function (data) { + if (this.buffer.length && typeof (this.buffer[0]) !== typeof (data)) { + throw new Error("Expected data to be of type " + typeof (this.buffer) + " but was of type " + typeof (data)); + } + this.buffer.push(data); + this.sendBufferedData.resolve(); + }; + TransportSendQueue.prototype.sendLoop = function () { + return __awaiter(this, void 0, void 0, function () { + var transportResult, data, error_1; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + if (false) {} + return [4 /*yield*/, this.sendBufferedData.promise]; + case 1: + _a.sent(); + if (!this.executing) { + if (this.transportResult) { + this.transportResult.reject("Connection stopped."); + } + return [3 /*break*/, 6]; + } + this.sendBufferedData = new PromiseSource(); + transportResult = this.transportResult; + this.transportResult = undefined; + data = typeof (this.buffer[0]) === "string" ? + this.buffer.join("") : + TransportSendQueue.concatBuffers(this.buffer); + this.buffer.length = 0; + _a.label = 2; + case 2: + _a.trys.push([2, 4, , 5]); + return [4 /*yield*/, this.transport.send(data)]; + case 3: + _a.sent(); + transportResult.resolve(); + return [3 /*break*/, 5]; + case 4: + error_1 = _a.sent(); + transportResult.reject(error_1); + return [3 /*break*/, 5]; + case 5: return [3 /*break*/, 0]; + case 6: return [2 /*return*/]; + } + }); + }); + }; + TransportSendQueue.concatBuffers = function (arrayBuffers) { + var totalLength = arrayBuffers.map(function (b) { return b.byteLength; }).reduce(function (a, b) { return a + b; }); + var result = new Uint8Array(totalLength); + var offset = 0; + for (var _i = 0, arrayBuffers_1 = arrayBuffers; _i < arrayBuffers_1.length; _i++) { + var item = arrayBuffers_1[_i]; + result.set(new Uint8Array(item), offset); + offset += item.byteLength; + } + return result; + }; + return TransportSendQueue; +}()); + +var PromiseSource = /** @class */ (function () { + function PromiseSource() { + var _this = this; + this.promise = new Promise(function (resolve, reject) { + var _a; + return _a = [resolve, reject], _this.resolver = _a[0], _this.rejecter = _a[1], _a; + }); + } + PromiseSource.prototype.resolve = function () { + this.resolver(); + }; + PromiseSource.prototype.reject = function (reason) { + this.rejecter(reason); + }; + return PromiseSource; +}()); + + +/***/ }), +/* 20 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HttpTransportType", function() { return HttpTransportType; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransferFormat", function() { return TransferFormat; }); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// This will be treated as a bit flag in the future, so we keep it using power-of-two values. +/** Specifies a specific HTTP transport type. */ +var HttpTransportType; +(function (HttpTransportType) { + /** Specifies no transport preference. */ + HttpTransportType[HttpTransportType["None"] = 0] = "None"; + /** Specifies the WebSockets transport. */ + HttpTransportType[HttpTransportType["WebSockets"] = 1] = "WebSockets"; + /** Specifies the Server-Sent Events transport. */ + HttpTransportType[HttpTransportType["ServerSentEvents"] = 2] = "ServerSentEvents"; + /** Specifies the Long Polling transport. */ + HttpTransportType[HttpTransportType["LongPolling"] = 4] = "LongPolling"; +})(HttpTransportType || (HttpTransportType = {})); +/** Specifies the transfer format for a connection. */ +var TransferFormat; +(function (TransferFormat) { + /** Specifies that only text data will be transmitted over the connection. */ + TransferFormat[TransferFormat["Text"] = 1] = "Text"; + /** Specifies that binary data will be transmitted over the connection. */ + TransferFormat[TransferFormat["Binary"] = 2] = "Binary"; +})(TransferFormat || (TransferFormat = {})); + + +/***/ }), +/* 21 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LongPollingTransport", function() { return LongPollingTransport; }); +/* harmony import */ var _AbortController__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(22); +/* harmony import */ var _Errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9); +/* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(20); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(13); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (undefined && undefined.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; + + + + + +// Not exported from 'index', this type is internal. +/** @private */ +var LongPollingTransport = /** @class */ (function () { + function LongPollingTransport(httpClient, accessTokenFactory, logger, logMessageContent) { + this.httpClient = httpClient; + this.accessTokenFactory = accessTokenFactory; + this.logger = logger; + this.pollAbort = new _AbortController__WEBPACK_IMPORTED_MODULE_0__["AbortController"](); + this.logMessageContent = logMessageContent; + this.running = false; + this.onreceive = null; + this.onclose = null; + } + Object.defineProperty(LongPollingTransport.prototype, "pollAborted", { + // This is an internal type, not exported from 'index' so this is really just internal. + get: function () { + return this.pollAbort.aborted; + }, + enumerable: true, + configurable: true + }); + LongPollingTransport.prototype.connect = function (url, transferFormat) { + return __awaiter(this, void 0, void 0, function () { + var pollOptions, token, pollUrl, response; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(url, "url"); + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(transferFormat, "transferFormat"); + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isIn(transferFormat, _ITransport__WEBPACK_IMPORTED_MODULE_3__["TransferFormat"], "transferFormat"); + this.url = url; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Connecting."); + // Allow binary format on Node and Browsers that support binary content (indicated by the presence of responseType property) + if (transferFormat === _ITransport__WEBPACK_IMPORTED_MODULE_3__["TransferFormat"].Binary && + (typeof XMLHttpRequest !== "undefined" && typeof new XMLHttpRequest().responseType !== "string")) { + throw new Error("Binary protocols over XmlHttpRequest not implementing advanced features are not supported."); + } + pollOptions = { + abortSignal: this.pollAbort.signal, + headers: {}, + timeout: 100000, + }; + if (transferFormat === _ITransport__WEBPACK_IMPORTED_MODULE_3__["TransferFormat"].Binary) { + pollOptions.responseType = "arraybuffer"; + } + return [4 /*yield*/, this.getAccessToken()]; + case 1: + token = _a.sent(); + this.updateHeaderToken(pollOptions, token); + pollUrl = url + "&_=" + Date.now(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) polling: " + pollUrl + "."); + return [4 /*yield*/, this.httpClient.get(pollUrl, pollOptions)]; + case 2: + response = _a.sent(); + if (response.statusCode !== 200) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "(LongPolling transport) Unexpected response code: " + response.statusCode + "."); + // Mark running as false so that the poll immediately ends and runs the close logic + this.closeError = new _Errors__WEBPACK_IMPORTED_MODULE_1__["HttpError"](response.statusText || "", response.statusCode); + this.running = false; + } + else { + this.running = true; + } + this.receiving = this.poll(this.url, pollOptions); + return [2 /*return*/]; + } + }); + }); + }; + LongPollingTransport.prototype.getAccessToken = function () { + return __awaiter(this, void 0, void 0, function () { + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + if (!this.accessTokenFactory) return [3 /*break*/, 2]; + return [4 /*yield*/, this.accessTokenFactory()]; + case 1: return [2 /*return*/, _a.sent()]; + case 2: return [2 /*return*/, null]; + } + }); + }); + }; + LongPollingTransport.prototype.updateHeaderToken = function (request, token) { + if (!request.headers) { + request.headers = {}; + } + if (token) { + // tslint:disable-next-line:no-string-literal + request.headers["Authorization"] = "Bearer " + token; + return; + } + // tslint:disable-next-line:no-string-literal + if (request.headers["Authorization"]) { + // tslint:disable-next-line:no-string-literal + delete request.headers["Authorization"]; + } + }; + LongPollingTransport.prototype.poll = function (url, pollOptions) { + return __awaiter(this, void 0, void 0, function () { + var token, pollUrl, response, e_1; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + _a.trys.push([0, , 8, 9]); + _a.label = 1; + case 1: + if (!this.running) return [3 /*break*/, 7]; + return [4 /*yield*/, this.getAccessToken()]; + case 2: + token = _a.sent(); + this.updateHeaderToken(pollOptions, token); + _a.label = 3; + case 3: + _a.trys.push([3, 5, , 6]); + pollUrl = url + "&_=" + Date.now(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) polling: " + pollUrl + "."); + return [4 /*yield*/, this.httpClient.get(pollUrl, pollOptions)]; + case 4: + response = _a.sent(); + if (response.statusCode === 204) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "(LongPolling transport) Poll terminated by server."); + this.running = false; + } + else if (response.statusCode !== 200) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "(LongPolling transport) Unexpected response code: " + response.statusCode + "."); + // Unexpected status code + this.closeError = new _Errors__WEBPACK_IMPORTED_MODULE_1__["HttpError"](response.statusText || "", response.statusCode); + this.running = false; + } + else { + // Process the response + if (response.content) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) data received. " + Object(_Utils__WEBPACK_IMPORTED_MODULE_4__["getDataDetail"])(response.content, this.logMessageContent) + "."); + if (this.onreceive) { + this.onreceive(response.content); + } + } + else { + // This is another way timeout manifest. + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Poll timed out, reissuing."); + } + } + return [3 /*break*/, 6]; + case 5: + e_1 = _a.sent(); + if (!this.running) { + // Log but disregard errors that occur after stopping + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Poll errored after shutdown: " + e_1.message); + } + else { + if (e_1 instanceof _Errors__WEBPACK_IMPORTED_MODULE_1__["TimeoutError"]) { + // Ignore timeouts and reissue the poll. + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Poll timed out, reissuing."); + } + else { + // Close the connection with the error as the result. + this.closeError = e_1; + this.running = false; + } + } + return [3 /*break*/, 6]; + case 6: return [3 /*break*/, 1]; + case 7: return [3 /*break*/, 9]; + case 8: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Polling complete."); + // We will reach here with pollAborted==false when the server returned a response causing the transport to stop. + // If pollAborted==true then client initiated the stop and the stop method will raise the close event after DELETE is sent. + if (!this.pollAborted) { + this.raiseOnClose(); + } + return [7 /*endfinally*/]; + case 9: return [2 /*return*/]; + } + }); + }); + }; + LongPollingTransport.prototype.send = function (data) { + return __awaiter(this, void 0, void 0, function () { + return __generator(this, function (_a) { + if (!this.running) { + return [2 /*return*/, Promise.reject(new Error("Cannot send until the transport is connected"))]; + } + return [2 /*return*/, Object(_Utils__WEBPACK_IMPORTED_MODULE_4__["sendMessage"])(this.logger, "LongPolling", this.httpClient, this.url, this.accessTokenFactory, data, this.logMessageContent)]; + }); + }); + }; + LongPollingTransport.prototype.stop = function () { + return __awaiter(this, void 0, void 0, function () { + var deleteOptions, token; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Stopping polling."); + // Tell receiving loop to stop, abort any current request, and then wait for it to finish + this.running = false; + this.pollAbort.abort(); + _a.label = 1; + case 1: + _a.trys.push([1, , 5, 6]); + return [4 /*yield*/, this.receiving]; + case 2: + _a.sent(); + // Send DELETE to clean up long polling on the server + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) sending DELETE request to " + this.url + "."); + deleteOptions = { + headers: {}, + }; + return [4 /*yield*/, this.getAccessToken()]; + case 3: + token = _a.sent(); + this.updateHeaderToken(deleteOptions, token); + return [4 /*yield*/, this.httpClient.delete(this.url, deleteOptions)]; + case 4: + _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) DELETE request sent."); + return [3 /*break*/, 6]; + case 5: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Stop finished."); + // Raise close event here instead of in polling + // It needs to happen after the DELETE request is sent + this.raiseOnClose(); + return [7 /*endfinally*/]; + case 6: return [2 /*return*/]; + } + }); + }); + }; + LongPollingTransport.prototype.raiseOnClose = function () { + if (this.onclose) { + var logMessage = "(LongPolling transport) Firing onclose event."; + if (this.closeError) { + logMessage += " Error: " + this.closeError; + } + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, logMessage); + this.onclose(this.closeError); + } + }; + return LongPollingTransport; +}()); + + + +/***/ }), +/* 22 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AbortController", function() { return AbortController; }); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Rough polyfill of https://developer.mozilla.org/en-US/docs/Web/API/AbortController +// We don't actually ever use the API being polyfilled, we always use the polyfill because +// it's a very new API right now. +// Not exported from index. +/** @private */ +var AbortController = /** @class */ (function () { + function AbortController() { + this.isAborted = false; + this.onabort = null; + } + AbortController.prototype.abort = function () { + if (!this.isAborted) { + this.isAborted = true; + if (this.onabort) { + this.onabort(); + } + } + }; + Object.defineProperty(AbortController.prototype, "signal", { + get: function () { + return this; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(AbortController.prototype, "aborted", { + get: function () { + return this.isAborted; + }, + enumerable: true, + configurable: true + }); + return AbortController; +}()); + + + +/***/ }), +/* 23 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ServerSentEventsTransport", function() { return ServerSentEventsTransport; }); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9); +/* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(20); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (undefined && undefined.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; + + + +/** @private */ +var ServerSentEventsTransport = /** @class */ (function () { + function ServerSentEventsTransport(httpClient, accessTokenFactory, logger, logMessageContent, eventSourceConstructor) { + this.httpClient = httpClient; + this.accessTokenFactory = accessTokenFactory; + this.logger = logger; + this.logMessageContent = logMessageContent; + this.eventSourceConstructor = eventSourceConstructor; + this.onreceive = null; + this.onclose = null; + } + ServerSentEventsTransport.prototype.connect = function (url, transferFormat) { + return __awaiter(this, void 0, void 0, function () { + var token; + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + _Utils__WEBPACK_IMPORTED_MODULE_2__["Arg"].isRequired(url, "url"); + _Utils__WEBPACK_IMPORTED_MODULE_2__["Arg"].isRequired(transferFormat, "transferFormat"); + _Utils__WEBPACK_IMPORTED_MODULE_2__["Arg"].isIn(transferFormat, _ITransport__WEBPACK_IMPORTED_MODULE_1__["TransferFormat"], "transferFormat"); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(SSE transport) Connecting."); + // set url before accessTokenFactory because this.url is only for send and we set the auth header instead of the query string for send + this.url = url; + if (!this.accessTokenFactory) return [3 /*break*/, 2]; + return [4 /*yield*/, this.accessTokenFactory()]; + case 1: + token = _a.sent(); + if (token) { + url += (url.indexOf("?") < 0 ? "?" : "&") + ("access_token=" + encodeURIComponent(token)); + } + _a.label = 2; + case 2: return [2 /*return*/, new Promise(function (resolve, reject) { + var opened = false; + if (transferFormat !== _ITransport__WEBPACK_IMPORTED_MODULE_1__["TransferFormat"].Text) { + reject(new Error("The Server-Sent Events transport only supports the 'Text' transfer format")); + return; + } + var eventSource; + if (_Utils__WEBPACK_IMPORTED_MODULE_2__["Platform"].isBrowser || _Utils__WEBPACK_IMPORTED_MODULE_2__["Platform"].isWebWorker) { + eventSource = new _this.eventSourceConstructor(url, { withCredentials: true }); + } + else { + // Non-browser passes cookies via the dictionary + var cookies = _this.httpClient.getCookieString(url); + eventSource = new _this.eventSourceConstructor(url, { withCredentials: true, headers: { Cookie: cookies } }); + } + try { + eventSource.onmessage = function (e) { + if (_this.onreceive) { + try { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(SSE transport) data received. " + Object(_Utils__WEBPACK_IMPORTED_MODULE_2__["getDataDetail"])(e.data, _this.logMessageContent) + "."); + _this.onreceive(e.data); + } + catch (error) { + _this.close(error); + return; + } + } + }; + eventSource.onerror = function (e) { + var error = new Error(e.data || "Error occurred"); + if (opened) { + _this.close(error); + } + else { + reject(error); + } + }; + eventSource.onopen = function () { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Information, "SSE connected to " + _this.url); + _this.eventSource = eventSource; + opened = true; + resolve(); + }; + } + catch (e) { + reject(e); + return; + } + })]; + } + }); + }); + }; + ServerSentEventsTransport.prototype.send = function (data) { + return __awaiter(this, void 0, void 0, function () { + return __generator(this, function (_a) { + if (!this.eventSource) { + return [2 /*return*/, Promise.reject(new Error("Cannot send until the transport is connected"))]; + } + return [2 /*return*/, Object(_Utils__WEBPACK_IMPORTED_MODULE_2__["sendMessage"])(this.logger, "SSE", this.httpClient, this.url, this.accessTokenFactory, data, this.logMessageContent)]; + }); + }); + }; + ServerSentEventsTransport.prototype.stop = function () { + this.close(); + return Promise.resolve(); + }; + ServerSentEventsTransport.prototype.close = function (e) { + if (this.eventSource) { + this.eventSource.close(); + this.eventSource = undefined; + if (this.onclose) { + this.onclose(e); + } + } + }; + return ServerSentEventsTransport; +}()); + + + +/***/ }), +/* 24 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WebSocketTransport", function() { return WebSocketTransport; }); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9); +/* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(20); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (undefined && undefined.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; + + + +/** @private */ +var WebSocketTransport = /** @class */ (function () { + function WebSocketTransport(httpClient, accessTokenFactory, logger, logMessageContent, webSocketConstructor) { + this.logger = logger; + this.accessTokenFactory = accessTokenFactory; + this.logMessageContent = logMessageContent; + this.webSocketConstructor = webSocketConstructor; + this.httpClient = httpClient; + this.onreceive = null; + this.onclose = null; + } + WebSocketTransport.prototype.connect = function (url, transferFormat) { + return __awaiter(this, void 0, void 0, function () { + var token; + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + _Utils__WEBPACK_IMPORTED_MODULE_2__["Arg"].isRequired(url, "url"); + _Utils__WEBPACK_IMPORTED_MODULE_2__["Arg"].isRequired(transferFormat, "transferFormat"); + _Utils__WEBPACK_IMPORTED_MODULE_2__["Arg"].isIn(transferFormat, _ITransport__WEBPACK_IMPORTED_MODULE_1__["TransferFormat"], "transferFormat"); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(WebSockets transport) Connecting."); + if (!this.accessTokenFactory) return [3 /*break*/, 2]; + return [4 /*yield*/, this.accessTokenFactory()]; + case 1: + token = _a.sent(); + if (token) { + url += (url.indexOf("?") < 0 ? "?" : "&") + ("access_token=" + encodeURIComponent(token)); + } + _a.label = 2; + case 2: return [2 /*return*/, new Promise(function (resolve, reject) { + url = url.replace(/^http/, "ws"); + var webSocket; + var cookies = _this.httpClient.getCookieString(url); + var opened = false; + if (_Utils__WEBPACK_IMPORTED_MODULE_2__["Platform"].isNode && cookies) { + // Only pass cookies when in non-browser environments + webSocket = new _this.webSocketConstructor(url, undefined, { + headers: { + Cookie: "" + cookies, + }, + }); + } + if (!webSocket) { + // Chrome is not happy with passing 'undefined' as protocol + webSocket = new _this.webSocketConstructor(url); + } + if (transferFormat === _ITransport__WEBPACK_IMPORTED_MODULE_1__["TransferFormat"].Binary) { + webSocket.binaryType = "arraybuffer"; + } + // tslint:disable-next-line:variable-name + webSocket.onopen = function (_event) { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Information, "WebSocket connected to " + url + "."); + _this.webSocket = webSocket; + opened = true; + resolve(); + }; + webSocket.onerror = function (event) { + var error = null; + // ErrorEvent is a browser only type we need to check if the type exists before using it + if (typeof ErrorEvent !== "undefined" && event instanceof ErrorEvent) { + error = event.error; + } + else { + error = new Error("There was an error with the transport."); + } + reject(error); + }; + webSocket.onmessage = function (message) { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(WebSockets transport) data received. " + Object(_Utils__WEBPACK_IMPORTED_MODULE_2__["getDataDetail"])(message.data, _this.logMessageContent) + "."); + if (_this.onreceive) { + _this.onreceive(message.data); + } + }; + webSocket.onclose = function (event) { + // Don't call close handler if connection was never established + // We'll reject the connect call instead + if (opened) { + _this.close(event); + } + else { + var error = null; + // ErrorEvent is a browser only type we need to check if the type exists before using it + if (typeof ErrorEvent !== "undefined" && event instanceof ErrorEvent) { + error = event.error; + } + else { + error = new Error("There was an error with the transport."); + } + reject(error); + } + }; + })]; + } + }); + }); + }; + WebSocketTransport.prototype.send = function (data) { + if (this.webSocket && this.webSocket.readyState === this.webSocketConstructor.OPEN) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(WebSockets transport) sending data. " + Object(_Utils__WEBPACK_IMPORTED_MODULE_2__["getDataDetail"])(data, this.logMessageContent) + "."); + this.webSocket.send(data); + return Promise.resolve(); + } + return Promise.reject("WebSocket is not in the OPEN state"); + }; + WebSocketTransport.prototype.stop = function () { + if (this.webSocket) { + // Clear websocket handlers because we are considering the socket closed now + this.webSocket.onclose = function () { }; + this.webSocket.onmessage = function () { }; + this.webSocket.onerror = function () { }; + this.webSocket.close(); + this.webSocket = undefined; + // Manually invoke onclose callback inline so we know the HttpConnection was closed properly before returning + // This also solves an issue where websocket.onclose could take 18+ seconds to trigger during network disconnects + this.close(undefined); + } + return Promise.resolve(); + }; + WebSocketTransport.prototype.close = function (event) { + // webSocket will be null if the transport did not start successfully + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(WebSockets transport) socket closed."); + if (this.onclose) { + if (event && (event.wasClean === false || event.code !== 1000)) { + this.onclose(new Error("WebSocket closed with status code: " + event.code + " (" + event.reason + ").")); + } + else { + this.onclose(); + } + } + }; + return WebSocketTransport; +}()); + + + +/***/ }), +/* 25 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "JsonHubProtocol", function() { return JsonHubProtocol; }); +/* harmony import */ var _IHubProtocol__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9); +/* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(20); +/* harmony import */ var _Loggers__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(14); +/* harmony import */ var _TextMessageFormat__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(12); +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + + + + + +var JSON_HUB_PROTOCOL_NAME = "json"; +/** Implements the JSON Hub Protocol. */ +var JsonHubProtocol = /** @class */ (function () { + function JsonHubProtocol() { + /** @inheritDoc */ + this.name = JSON_HUB_PROTOCOL_NAME; + /** @inheritDoc */ + this.version = 1; + /** @inheritDoc */ + this.transferFormat = _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"].Text; + } + /** Creates an array of {@link @microsoft/signalr.HubMessage} objects from the specified serialized representation. + * + * @param {string} input A string containing the serialized representation. + * @param {ILogger} logger A logger that will be used to log messages that occur during parsing. + */ + JsonHubProtocol.prototype.parseMessages = function (input, logger) { + // The interface does allow "ArrayBuffer" to be passed in, but this implementation does not. So let's throw a useful error. + if (typeof input !== "string") { + throw new Error("Invalid input for JSON hub protocol. Expected a string."); + } + if (!input) { + return []; + } + if (logger === null) { + logger = _Loggers__WEBPACK_IMPORTED_MODULE_3__["NullLogger"].instance; + } + // Parse the messages + var messages = _TextMessageFormat__WEBPACK_IMPORTED_MODULE_4__["TextMessageFormat"].parse(input); + var hubMessages = []; + for (var _i = 0, messages_1 = messages; _i < messages_1.length; _i++) { + var message = messages_1[_i]; + var parsedMessage = JSON.parse(message); + if (typeof parsedMessage.type !== "number") { + throw new Error("Invalid payload."); + } + switch (parsedMessage.type) { + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_0__["MessageType"].Invocation: + this.isInvocationMessage(parsedMessage); + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_0__["MessageType"].StreamItem: + this.isStreamItemMessage(parsedMessage); + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_0__["MessageType"].Completion: + this.isCompletionMessage(parsedMessage); + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_0__["MessageType"].Ping: + // Single value, no need to validate + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_0__["MessageType"].Close: + // All optional values, no need to validate + break; + default: + // Future protocol changes can add message types, old clients can ignore them + logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Information, "Unknown message type '" + parsedMessage.type + "' ignored."); + continue; + } + hubMessages.push(parsedMessage); + } + return hubMessages; + }; + /** Writes the specified {@link @microsoft/signalr.HubMessage} to a string and returns it. + * + * @param {HubMessage} message The message to write. + * @returns {string} A string containing the serialized representation of the message. + */ + JsonHubProtocol.prototype.writeMessage = function (message) { + return _TextMessageFormat__WEBPACK_IMPORTED_MODULE_4__["TextMessageFormat"].write(JSON.stringify(message)); + }; + JsonHubProtocol.prototype.isInvocationMessage = function (message) { + this.assertNotEmptyString(message.target, "Invalid payload for Invocation message."); + if (message.invocationId !== undefined) { + this.assertNotEmptyString(message.invocationId, "Invalid payload for Invocation message."); + } + }; + JsonHubProtocol.prototype.isStreamItemMessage = function (message) { + this.assertNotEmptyString(message.invocationId, "Invalid payload for StreamItem message."); + if (message.item === undefined) { + throw new Error("Invalid payload for StreamItem message."); + } + }; + JsonHubProtocol.prototype.isCompletionMessage = function (message) { + if (message.result && message.error) { + throw new Error("Invalid payload for Completion message."); + } + if (!message.result && message.error) { + this.assertNotEmptyString(message.error, "Invalid payload for Completion message."); + } + this.assertNotEmptyString(message.invocationId, "Invalid payload for Completion message."); + }; + JsonHubProtocol.prototype.assertNotEmptyString = function (value, errorMessage) { + if (typeof value !== "string" || value === "") { + throw new Error(errorMessage); + } + }; + return JsonHubProtocol; +}()); + + + +/***/ }) +/******/ ]); +}); +//# sourceMappingURL=signalr.js.map \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/js/signalr.min.js b/src/Features/Blockcore.Features.WebHost/UI/wwwroot/js/signalr.min.js new file mode 100644 index 000000000..59345e158 --- /dev/null +++ b/src/Features/Blockcore.Features.WebHost/UI/wwwroot/js/signalr.min.js @@ -0,0 +1,17 @@ +(function webpackUniversalModuleDefinition(root,factory){if(typeof exports==="object"&&typeof module==="object")module.exports=factory();else if(typeof define==="function"&&define.amd)define([],factory);else if(typeof exports==="object")exports["signalR"]=factory();else root["signalR"]=factory()})(window,function(){return function(modules){var installedModules={};function __webpack_require__(moduleId){if(installedModules[moduleId]){return installedModules[moduleId].exports}var module=installedModules[moduleId]={i:moduleId,l:false,exports:{}};modules[moduleId].call(module.exports,module,module.exports,__webpack_require__);module.l=true;return module.exports}__webpack_require__.m=modules;__webpack_require__.c=installedModules;__webpack_require__.d=function(exports,name,getter){if(!__webpack_require__.o(exports,name)){Object.defineProperty(exports,name,{enumerable:true,get:getter})}};__webpack_require__.r=function(exports){if(typeof Symbol!=="undefined"&&Symbol.toStringTag){Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"})}Object.defineProperty(exports,"__esModule",{value:true})};__webpack_require__.t=function(value,mode){if(mode&1)value=__webpack_require__(value);if(mode&8)return value;if(mode&4&&typeof value==="object"&&value&&value.__esModule)return value;var ns=Object.create(null);__webpack_require__.r(ns);Object.defineProperty(ns,"default",{enumerable:true,value:value});if(mode&2&&typeof value!="string")for(var key in value)__webpack_require__.d(ns,key,function(key){return value[key]}.bind(null,key));return ns};__webpack_require__.n=function(module){var getter=module&&module.__esModule?function getDefault(){return module["default"]}:function getModuleExports(){return module};__webpack_require__.d(getter,"a",getter);return getter};__webpack_require__.o=function(object,property){return Object.prototype.hasOwnProperty.call(object,property)};__webpack_require__.p="";return __webpack_require__(__webpack_require__.s=0)}([function(module,__webpack_exports__,__webpack_require__){"use strict";__webpack_require__.r(__webpack_exports__);var es6_promise_dist_es6_promise_auto_js__WEBPACK_IMPORTED_MODULE_0__=__webpack_require__(1);var es6_promise_dist_es6_promise_auto_js__WEBPACK_IMPORTED_MODULE_0___default=__webpack_require__.n(es6_promise_dist_es6_promise_auto_js__WEBPACK_IMPORTED_MODULE_0__);var _index__WEBPACK_IMPORTED_MODULE_1__=__webpack_require__(3);__webpack_require__.d(__webpack_exports__,"VERSION",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["VERSION"]});__webpack_require__.d(__webpack_exports__,"AbortError",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["AbortError"]});__webpack_require__.d(__webpack_exports__,"HttpError",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["HttpError"]});__webpack_require__.d(__webpack_exports__,"TimeoutError",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["TimeoutError"]});__webpack_require__.d(__webpack_exports__,"HttpClient",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["HttpClient"]});__webpack_require__.d(__webpack_exports__,"HttpResponse",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["HttpResponse"]});__webpack_require__.d(__webpack_exports__,"DefaultHttpClient",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["DefaultHttpClient"]});__webpack_require__.d(__webpack_exports__,"HubConnection",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["HubConnection"]});__webpack_require__.d(__webpack_exports__,"HubConnectionState",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["HubConnectionState"]});__webpack_require__.d(__webpack_exports__,"HubConnectionBuilder",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["HubConnectionBuilder"]});__webpack_require__.d(__webpack_exports__,"MessageType",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["MessageType"]});__webpack_require__.d(__webpack_exports__,"LogLevel",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["LogLevel"]});__webpack_require__.d(__webpack_exports__,"HttpTransportType",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["HttpTransportType"]});__webpack_require__.d(__webpack_exports__,"TransferFormat",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["TransferFormat"]});__webpack_require__.d(__webpack_exports__,"NullLogger",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["NullLogger"]});__webpack_require__.d(__webpack_exports__,"JsonHubProtocol",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["JsonHubProtocol"]});__webpack_require__.d(__webpack_exports__,"Subject",function(){return _index__WEBPACK_IMPORTED_MODULE_1__["Subject"]});if(!Uint8Array.prototype.indexOf){Object.defineProperty(Uint8Array.prototype,"indexOf",{value:Array.prototype.indexOf,writable:true})}if(!Uint8Array.prototype.slice){Object.defineProperty(Uint8Array.prototype,"slice",{value:function(start,end){return new Uint8Array(Array.prototype.slice.call(this,start,end))},writable:true})}if(!Uint8Array.prototype.forEach){Object.defineProperty(Uint8Array.prototype,"forEach",{value:Array.prototype.forEach,writable:true})}},function(module,exports,__webpack_require__){(function(global){var require; +/*! + * @overview es6-promise - a tiny implementation of Promises/A+. + * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald) + * @license Licensed under MIT license + * See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE + * @version v4.2.2+97478eb6 + */ +/*! + * @overview es6-promise - a tiny implementation of Promises/A+. + * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald) + * @license Licensed under MIT license + * See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE + * @version v4.2.2+97478eb6 + */ +(function(global,factory){true?module.exports=factory():undefined})(this,function(){"use strict";function objectOrFunction(x){var type=typeof x;return x!==null&&(type==="object"||type==="function")}function isFunction(x){return typeof x==="function"}var _isArray=void 0;if(Array.isArray){_isArray=Array.isArray}else{_isArray=function(x){return Object.prototype.toString.call(x)==="[object Array]"}}var isArray=_isArray;var len=0;var vertxNext=void 0;var customSchedulerFn=void 0;var asap=function asap(callback,arg){queue[len]=callback;queue[len+1]=arg;len+=2;if(len===2){if(customSchedulerFn){customSchedulerFn(flush)}else{scheduleFlush()}}};function setScheduler(scheduleFn){customSchedulerFn=scheduleFn}function setAsap(asapFn){asap=asapFn}var browserWindow=typeof window!=="undefined"?window:undefined;var browserGlobal=browserWindow||{};var BrowserMutationObserver=browserGlobal.MutationObserver||browserGlobal.WebKitMutationObserver;var isNode=typeof self==="undefined"&&typeof process!=="undefined"&&{}.toString.call(process)==="[object process]";var isWorker=typeof Uint8ClampedArray!=="undefined"&&typeof importScripts!=="undefined"&&typeof MessageChannel!=="undefined";function useNextTick(){return function(){return process.nextTick(flush)}}function useVertxTimer(){if(typeof vertxNext!=="undefined"){return function(){vertxNext(flush)}}return useSetTimeout()}function useMutationObserver(){var iterations=0;var observer=new BrowserMutationObserver(flush);var node=document.createTextNode("");observer.observe(node,{characterData:true});return function(){node.data=iterations=++iterations%2}}function useMessageChannel(){var channel=new MessageChannel;channel.port1.onmessage=flush;return function(){return channel.port2.postMessage(0)}}function useSetTimeout(){var globalSetTimeout=setTimeout;return function(){return globalSetTimeout(flush,1)}}var queue=new Array(1e3);function flush(){for(var i=0;i=200&&xhr.status<300){resolve(new _HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpResponse"](xhr.status,xhr.statusText,xhr.response||xhr.responseText))}else{reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["HttpError"](xhr.statusText,xhr.status))}};xhr.onerror=function(){_this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning,"Error from HTTP request. "+xhr.status+": "+xhr.statusText+".");reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["HttpError"](xhr.statusText,xhr.status))};xhr.ontimeout=function(){_this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning,"Timeout from HTTP request.");reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["TimeoutError"])};xhr.send(request.content||"")})};return XhrHttpClient}(_HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpClient"])},function(module,__webpack_exports__,__webpack_require__){"use strict";__webpack_require__.r(__webpack_exports__);__webpack_require__.d(__webpack_exports__,"LogLevel",function(){return LogLevel});var LogLevel;(function(LogLevel){LogLevel[LogLevel["Trace"]=0]="Trace";LogLevel[LogLevel["Debug"]=1]="Debug";LogLevel[LogLevel["Information"]=2]="Information";LogLevel[LogLevel["Warning"]=3]="Warning";LogLevel[LogLevel["Error"]=4]="Error";LogLevel[LogLevel["Critical"]=5]="Critical";LogLevel[LogLevel["None"]=6]="None"})(LogLevel||(LogLevel={}))},function(module,__webpack_exports__,__webpack_require__){"use strict";__webpack_require__.r(__webpack_exports__);__webpack_require__.d(__webpack_exports__,"HubConnectionState",function(){return HubConnectionState});__webpack_require__.d(__webpack_exports__,"HubConnection",function(){return HubConnection});var _HandshakeProtocol__WEBPACK_IMPORTED_MODULE_0__=__webpack_require__(11);var _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__=__webpack_require__(15);var _ILogger__WEBPACK_IMPORTED_MODULE_2__=__webpack_require__(9);var _Subject__WEBPACK_IMPORTED_MODULE_3__=__webpack_require__(16);var _Utils__WEBPACK_IMPORTED_MODULE_4__=__webpack_require__(13);var __awaiter=undefined&&undefined.__awaiter||function(thisArg,_arguments,P,generator){return new(P||(P=Promise))(function(resolve,reject){function fulfilled(value){try{step(generator.next(value))}catch(e){reject(e)}}function rejected(value){try{step(generator["throw"](value))}catch(e){reject(e)}}function step(result){result.done?resolve(result.value):new P(function(resolve){resolve(result.value)}).then(fulfilled,rejected)}step((generator=generator.apply(thisArg,_arguments||[])).next())})};var __generator=undefined&&undefined.__generator||function(thisArg,body){var _={label:0,sent:function(){if(t[0]&1)throw t[1];return t[1]},trys:[],ops:[]},f,y,t,g;return g={next:verb(0),throw:verb(1),return:verb(2)},typeof Symbol==="function"&&(g[Symbol.iterator]=function(){return this}),g;function verb(n){return function(v){return step([n,v])}}function step(op){if(f)throw new TypeError("Generator is already executing.");while(_)try{if(f=1,y&&(t=op[0]&2?y["return"]:op[0]?y["throw"]||((t=y["return"])&&t.call(y),0):y.next)&&!(t=t.call(y,op[1])).done)return t;if(y=0,t)op=[op[0]&2,t.value];switch(op[0]){case 0:case 1:t=op;break;case 4:_.label++;return{value:op[1],done:false};case 5:_.label++;y=op[1];op=[0];continue;case 7:op=_.ops.pop();_.trys.pop();continue;default:if(!(t=_.trys,t=t.length>0&&t[t.length-1])&&(op[0]===6||op[0]===2)){_=0;continue}if(op[0]===3&&(!t||op[1]>t[0]&&op[1]responseLength?binaryData.slice(responseLength).buffer:null}else{var textData=data;var separatorIndex=textData.indexOf(_TextMessageFormat__WEBPACK_IMPORTED_MODULE_0__["TextMessageFormat"].RecordSeparator);if(separatorIndex===-1){throw new Error("Message is incomplete.")}var responseLength=separatorIndex+1;messageData=textData.substring(0,responseLength);remainingData=textData.length>responseLength?textData.substring(responseLength):null}var messages=_TextMessageFormat__WEBPACK_IMPORTED_MODULE_0__["TextMessageFormat"].parse(messageData);var response=JSON.parse(messages[0]);if(response.type){throw new Error("Expected a handshake response from the server.")}responseMessage=response;return[remainingData,responseMessage]};return HandshakeProtocol}()},function(module,__webpack_exports__,__webpack_require__){"use strict";__webpack_require__.r(__webpack_exports__);__webpack_require__.d(__webpack_exports__,"TextMessageFormat",function(){return TextMessageFormat});var TextMessageFormat=function(){function TextMessageFormat(){}TextMessageFormat.write=function(output){return""+output+TextMessageFormat.RecordSeparator};TextMessageFormat.parse=function(input){if(input[input.length-1]!==TextMessageFormat.RecordSeparator){throw new Error("Message is incomplete.")}var messages=input.split(TextMessageFormat.RecordSeparator);messages.pop();return messages};TextMessageFormat.RecordSeparatorCode=30;TextMessageFormat.RecordSeparator=String.fromCharCode(TextMessageFormat.RecordSeparatorCode);return TextMessageFormat}()},function(module,__webpack_exports__,__webpack_require__){"use strict";__webpack_require__.r(__webpack_exports__);__webpack_require__.d(__webpack_exports__,"Arg",function(){return Arg});__webpack_require__.d(__webpack_exports__,"Platform",function(){return Platform});__webpack_require__.d(__webpack_exports__,"getDataDetail",function(){return getDataDetail});__webpack_require__.d(__webpack_exports__,"formatArrayBuffer",function(){return formatArrayBuffer});__webpack_require__.d(__webpack_exports__,"isArrayBuffer",function(){return isArrayBuffer});__webpack_require__.d(__webpack_exports__,"sendMessage",function(){return sendMessage});__webpack_require__.d(__webpack_exports__,"createLogger",function(){return createLogger});__webpack_require__.d(__webpack_exports__,"SubjectSubscription",function(){return SubjectSubscription});__webpack_require__.d(__webpack_exports__,"ConsoleLogger",function(){return ConsoleLogger});var _ILogger__WEBPACK_IMPORTED_MODULE_0__=__webpack_require__(9);var _Loggers__WEBPACK_IMPORTED_MODULE_1__=__webpack_require__(14);var __awaiter=undefined&&undefined.__awaiter||function(thisArg,_arguments,P,generator){return new(P||(P=Promise))(function(resolve,reject){function fulfilled(value){try{step(generator.next(value))}catch(e){reject(e)}}function rejected(value){try{step(generator["throw"](value))}catch(e){reject(e)}}function step(result){result.done?resolve(result.value):new P(function(resolve){resolve(result.value)}).then(fulfilled,rejected)}step((generator=generator.apply(thisArg,_arguments||[])).next())})};var __generator=undefined&&undefined.__generator||function(thisArg,body){var _={label:0,sent:function(){if(t[0]&1)throw t[1];return t[1]},trys:[],ops:[]},f,y,t,g;return g={next:verb(0),throw:verb(1),return:verb(2)},typeof Symbol==="function"&&(g[Symbol.iterator]=function(){return this}),g;function verb(n){return function(v){return step([n,v])}}function step(op){if(f)throw new TypeError("Generator is already executing.");while(_)try{if(f=1,y&&(t=op[0]&2?y["return"]:op[0]?y["throw"]||((t=y["return"])&&t.call(y),0):y.next)&&!(t=t.call(y,op[1])).done)return t;if(y=0,t)op=[op[0]&2,t.value];switch(op[0]){case 0:case 1:t=op;break;case 4:_.label++;return{value:op[1],done:false};case 5:_.label++;y=op[1];op=[0];continue;case 7:op=_.ops.pop();_.trys.pop();continue;default:if(!(t=_.trys,t=t.length>0&&t[t.length-1])&&(op[0]===6||op[0]===2)){_=0;continue}if(op[0]===3&&(!t||op[1]>t[0]&&op[1]-1){this.subject.observers.splice(index,1)}if(this.subject.observers.length===0&&this.subject.cancelCallback){this.subject.cancelCallback().catch(function(_){})}};return SubjectSubscription}();var ConsoleLogger=function(){function ConsoleLogger(minimumLogLevel){this.minimumLogLevel=minimumLogLevel;this.outputConsole=console}ConsoleLogger.prototype.log=function(logLevel,message){if(logLevel>=this.minimumLogLevel){switch(logLevel){case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Critical:case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Error:this.outputConsole.error("["+(new Date).toISOString()+"] "+_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel]+": "+message);break;case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Warning:this.outputConsole.warn("["+(new Date).toISOString()+"] "+_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel]+": "+message);break;case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Information:this.outputConsole.info("["+(new Date).toISOString()+"] "+_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel]+": "+message);break;default:this.outputConsole.log("["+(new Date).toISOString()+"] "+_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel]+": "+message);break}}};return ConsoleLogger}()},function(module,__webpack_exports__,__webpack_require__){"use strict";__webpack_require__.r(__webpack_exports__);__webpack_require__.d(__webpack_exports__,"NullLogger",function(){return NullLogger});var NullLogger=function(){function NullLogger(){}NullLogger.prototype.log=function(_logLevel,_message){};NullLogger.instance=new NullLogger;return NullLogger}()},function(module,__webpack_exports__,__webpack_require__){"use strict";__webpack_require__.r(__webpack_exports__);__webpack_require__.d(__webpack_exports__,"MessageType",function(){return MessageType});var MessageType;(function(MessageType){MessageType[MessageType["Invocation"]=1]="Invocation";MessageType[MessageType["StreamItem"]=2]="StreamItem";MessageType[MessageType["Completion"]=3]="Completion";MessageType[MessageType["StreamInvocation"]=4]="StreamInvocation";MessageType[MessageType["CancelInvocation"]=5]="CancelInvocation";MessageType[MessageType["Ping"]=6]="Ping";MessageType[MessageType["Close"]=7]="Close"})(MessageType||(MessageType={}))},function(module,__webpack_exports__,__webpack_require__){"use strict";__webpack_require__.r(__webpack_exports__);__webpack_require__.d(__webpack_exports__,"Subject",function(){return Subject});var _Utils__WEBPACK_IMPORTED_MODULE_0__=__webpack_require__(13);var Subject=function(){function Subject(){this.observers=[]}Subject.prototype.next=function(item){for(var _i=0,_a=this.observers;_i<_a.length;_i++){var observer=_a[_i];observer.next(item)}};Subject.prototype.error=function(err){for(var _i=0,_a=this.observers;_i<_a.length;_i++){var observer=_a[_i];if(observer.error){observer.error(err)}}};Subject.prototype.complete=function(){for(var _i=0,_a=this.observers;_i<_a.length;_i++){var observer=_a[_i];if(observer.complete){observer.complete()}}};Subject.prototype.subscribe=function(observer){this.observers.push(observer);return new _Utils__WEBPACK_IMPORTED_MODULE_0__["SubjectSubscription"](this,observer)};return Subject}()},function(module,__webpack_exports__,__webpack_require__){"use strict";__webpack_require__.r(__webpack_exports__);__webpack_require__.d(__webpack_exports__,"HubConnectionBuilder",function(){return HubConnectionBuilder});var _DefaultReconnectPolicy__WEBPACK_IMPORTED_MODULE_0__=__webpack_require__(18);var _HttpConnection__WEBPACK_IMPORTED_MODULE_1__=__webpack_require__(19);var _HubConnection__WEBPACK_IMPORTED_MODULE_2__=__webpack_require__(10);var _ILogger__WEBPACK_IMPORTED_MODULE_3__=__webpack_require__(9);var _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_4__=__webpack_require__(25);var _Loggers__WEBPACK_IMPORTED_MODULE_5__=__webpack_require__(14);var _Utils__WEBPACK_IMPORTED_MODULE_6__=__webpack_require__(13);var __assign=undefined&&undefined.__assign||Object.assign||function(t){for(var s,i=1,n=arguments.length;i0&&t[t.length-1])&&(op[0]===6||op[0]===2)){_=0;continue}if(op[0]===3&&(!t||op[1]>t[0]&&op[1]0){return[2,Promise.reject(new Error("Unable to connect to the server with any of the available transports. "+transportExceptions.join(" ")))]}return[2,Promise.reject(new Error("None of the transports supported by the client are supported by the server."))]}})})};HttpConnection.prototype.constructTransport=function(transport){switch(transport){case _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].WebSockets:if(!this.options.WebSocket){throw new Error("'WebSocket' is not supported in your environment.")}return new _WebSocketTransport__WEBPACK_IMPORTED_MODULE_6__["WebSocketTransport"](this.httpClient,this.accessTokenFactory,this.logger,this.options.logMessageContent||false,this.options.WebSocket);case _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].ServerSentEvents:if(!this.options.EventSource){throw new Error("'EventSource' is not supported in your environment.")}return new _ServerSentEventsTransport__WEBPACK_IMPORTED_MODULE_4__["ServerSentEventsTransport"](this.httpClient,this.accessTokenFactory,this.logger,this.options.logMessageContent||false,this.options.EventSource);case _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].LongPolling:return new _LongPollingTransport__WEBPACK_IMPORTED_MODULE_3__["LongPollingTransport"](this.httpClient,this.accessTokenFactory,this.logger,this.options.logMessageContent||false);default:throw new Error("Unknown transport: "+transport+".")}};HttpConnection.prototype.startTransport=function(url,transferFormat){var _this=this;this.transport.onreceive=this.onreceive;this.transport.onclose=function(e){return _this.stopConnection(e)};return this.transport.connect(url,transferFormat)};HttpConnection.prototype.resolveTransportOrError=function(endpoint,requestedTransport,requestedTransferFormat){var transport=_ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][endpoint.transport];if(transport===null||transport===undefined){this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug,"Skipping transport '"+endpoint.transport+"' because it is not supported by this client.");return new Error("Skipping transport '"+endpoint.transport+"' because it is not supported by this client.")}else{if(transportMatches(requestedTransport,transport)){var transferFormats=endpoint.transferFormats.map(function(s){return _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][s]});if(transferFormats.indexOf(requestedTransferFormat)>=0){if(transport===_ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].WebSockets&&!this.options.WebSocket||transport===_ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].ServerSentEvents&&!this.options.EventSource){this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug,"Skipping transport '"+_ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport]+"' because it is not supported in your environment.'");return new Error("'"+_ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport]+"' is not supported in your environment.")}else{this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug,"Selecting transport '"+_ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport]+"'.");try{return this.constructTransport(transport)}catch(ex){return ex}}}else{this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug,"Skipping transport '"+_ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport]+"' because it does not support the requested transfer format '"+_ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][requestedTransferFormat]+"'.");return new Error("'"+_ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport]+"' does not support "+_ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][requestedTransferFormat]+".")}}else{this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug,"Skipping transport '"+_ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport]+"' because it was disabled by the client.");return new Error("'"+_ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport]+"' is disabled by the client.")}}};HttpConnection.prototype.isITransport=function(transport){return transport&&typeof transport==="object"&&"connect"in transport};HttpConnection.prototype.stopConnection=function(error){this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug,"HttpConnection.stopConnection("+error+") called while in state "+this.connectionState+".");this.transport=undefined;error=this.stopError||error;this.stopError=undefined;if(this.connectionState==="Disconnected"){this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug,"Call to HttpConnection.stopConnection("+error+") was ignored because the connection is already in the disconnected state.");return}if(this.connectionState==="Connecting "){this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Warning,"Call to HttpConnection.stopConnection("+error+") was ignored because the connection hasn't yet left the in the connecting state.");return}if(this.connectionState==="Disconnecting"){this.stopPromiseResolver()}if(error){this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error,"Connection disconnected with error '"+error+"'.")}else{this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Information,"Connection disconnected.")}this.connectionId=undefined;this.connectionState="Disconnected";if(this.onclose&&this.connectionStarted){this.connectionStarted=false;try{this.onclose(error)}catch(e){this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error,"HttpConnection.onclose("+error+") threw error '"+e+"'.")}}};HttpConnection.prototype.resolveUrl=function(url){if(url.lastIndexOf("https://",0)===0||url.lastIndexOf("http://",0)===0){return url}if(!_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isBrowser||!window.document){throw new Error("Cannot resolve '"+url+"'.")}var aTag=window.document.createElement("a");aTag.href=url;this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Information,"Normalizing '"+url+"' to '"+aTag.href+"'.");return aTag.href};HttpConnection.prototype.resolveNegotiateUrl=function(url){var index=url.indexOf("?");var negotiateUrl=url.substring(0,index===-1?url.length:index);if(negotiateUrl[negotiateUrl.length-1]!=="/"){negotiateUrl+="/"}negotiateUrl+="negotiate";negotiateUrl+=index===-1?"":url.substring(index);if(negotiateUrl.indexOf("negotiateVersion")===-1){negotiateUrl+=index===-1?"?":"&";negotiateUrl+="negotiateVersion="+this.negotiateVersion}return negotiateUrl};return HttpConnection}();function transportMatches(requestedTransport,actualTransport){return!requestedTransport||(actualTransport&requestedTransport)!==0}var TransportSendQueue=function(){function TransportSendQueue(transport){this.transport=transport;this.buffer=[];this.executing=true;this.sendBufferedData=new PromiseSource;this.transportResult=new PromiseSource;this.sendLoopPromise=this.sendLoop()}TransportSendQueue.prototype.send=function(data){this.bufferData(data);if(!this.transportResult){this.transportResult=new PromiseSource}return this.transportResult.promise};TransportSendQueue.prototype.stop=function(){this.executing=false;this.sendBufferedData.resolve();return this.sendLoopPromise};TransportSendQueue.prototype.bufferData=function(data){if(this.buffer.length&&typeof this.buffer[0]!==typeof data){throw new Error("Expected data to be of type "+typeof this.buffer+" but was of type "+typeof data)}this.buffer.push(data);this.sendBufferedData.resolve()};TransportSendQueue.prototype.sendLoop=function(){return __awaiter(this,void 0,void 0,function(){var transportResult,data,error_1;return __generator(this,function(_a){switch(_a.label){case 0:if(false){}return[4,this.sendBufferedData.promise];case 1:_a.sent();if(!this.executing){if(this.transportResult){this.transportResult.reject("Connection stopped.")}return[3,6]}this.sendBufferedData=new PromiseSource;transportResult=this.transportResult;this.transportResult=undefined;data=typeof this.buffer[0]==="string"?this.buffer.join(""):TransportSendQueue.concatBuffers(this.buffer);this.buffer.length=0;_a.label=2;case 2:_a.trys.push([2,4,,5]);return[4,this.transport.send(data)];case 3:_a.sent();transportResult.resolve();return[3,5];case 4:error_1=_a.sent();transportResult.reject(error_1);return[3,5];case 5:return[3,0];case 6:return[2]}})})};TransportSendQueue.concatBuffers=function(arrayBuffers){var totalLength=arrayBuffers.map(function(b){return b.byteLength}).reduce(function(a,b){return a+b});var result=new Uint8Array(totalLength);var offset=0;for(var _i=0,arrayBuffers_1=arrayBuffers;_i0&&t[t.length-1])&&(op[0]===6||op[0]===2)){_=0;continue}if(op[0]===3&&(!t||op[1]>t[0]&&op[1]0&&t[t.length-1])&&(op[0]===6||op[0]===2)){_=0;continue}if(op[0]===3&&(!t||op[1]>t[0]&&op[1]0&&t[t.length-1])&&(op[0]===6||op[0]===2)){_=0;continue}if(op[0]===3&&(!t||op[1]>t[0]&&op[1] + + + + + Blockcore: Web Socket Events + + + + + + + Node Events | Node Commands + +

Node Events

+

Web Socket Events

+

View source to learn how to listen to events sent from the node. See below a live stream of events received.

+ +
+

+ Go back... +

+ +
+ + + + + + \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-events/node.html b/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-events/node.html new file mode 100644 index 000000000..0c593f802 --- /dev/null +++ b/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-events/node.html @@ -0,0 +1,60 @@ + + + + + Blockcore: Web Socket Events + + + + + + Node Events | Node Commands + +

Node Commands

+

Web Socket Events

+

Discover the events available for Web Socket on the node.

+ + +
+

+ Go back... +

+ +
+ + + + + \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/WebHostFeature.cs b/src/Features/Blockcore.Features.WebHost/WebHostFeature.cs new file mode 100644 index 000000000..060021cb9 --- /dev/null +++ b/src/Features/Blockcore.Features.WebHost/WebHostFeature.cs @@ -0,0 +1,225 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Blockcore.Builder; +using Blockcore.Builder.Feature; +using Blockcore.Features.WebHost.Broadcasters; +using Blockcore.Features.WebHost.Events; +using Blockcore.Features.WebHost.Hubs; +using Blockcore.Features.WebHost.Options; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using NBitcoin; + +namespace Blockcore.Features.WebHost +{ + /// + /// Provides an Api to the full node + /// + public sealed class WebHostFeature : FullNodeFeature + { + internal static Dictionary eventBroadcasterSettings; + + /// How long we are willing to wait for the WebHost to stop. + private const int WebHostStopTimeoutSeconds = 10; + + private readonly IFullNodeBuilder fullNodeBuilder; + + private readonly FullNode fullNode; + + private readonly WebHostSettings settings; + + private readonly WebHostFeatureOptions featureOptions; + + private readonly IEnumerable eventBroadcasters; + + private readonly IEventsSubscriptionService eventsSubscriptionService; + + private readonly ILogger logger; + + private IWebHost webHost; + + private readonly ICertificateStore certificateStore; + + public WebHostFeature( + IFullNodeBuilder fullNodeBuilder, + FullNode fullNode, + WebHostFeatureOptions apiFeatureOptions, + WebHostSettings apiSettings, + ILoggerFactory loggerFactory, + ICertificateStore certificateStore, + IEnumerable eventBroadcasters, + IEventsSubscriptionService eventsSubscriptionService) + { + this.fullNodeBuilder = fullNodeBuilder; + this.fullNode = fullNode; + this.featureOptions = apiFeatureOptions; + this.settings = apiSettings; + this.certificateStore = certificateStore; + this.eventBroadcasters = eventBroadcasters; + this.eventsSubscriptionService = eventsSubscriptionService; + this.logger = loggerFactory.CreateLogger(this.GetType().FullName); + + this.InitializeBeforeBase = true; + } + + public override Task InitializeAsync() + { + string log = $"WebHost listening on: {Environment.NewLine}{this.settings.ApiUri}{Environment.NewLine} - UI: {this.settings.EnableUI}{Environment.NewLine} - API: {this.settings.EnableAPI}{Environment.NewLine} - WS: {this.settings.EnableWS}"; + this.logger.LogInformation(log); + + this.eventsSubscriptionService.Init(); + + foreach (IClientEventBroadcaster clientEventBroadcaster in this.eventBroadcasters) + { + // Intialise with specified settings + clientEventBroadcaster.Init(eventBroadcasterSettings[clientEventBroadcaster.GetType()]); + } + + this.webHost = Program.Initialize(this.fullNodeBuilder.Services, this.fullNode, this.settings, this.certificateStore, new WebHostBuilder()); + + if (this.settings.KeepaliveTimer == null) + { + this.logger.LogTrace("(-)[KEEPALIVE_DISABLED]"); + return Task.CompletedTask; + } + + // Start the keepalive timer, if set. + // If the timer expires, the node will shut down. + this.settings.KeepaliveTimer.Elapsed += (sender, args) => + { + this.logger.LogInformation($"The application will shut down because the keepalive timer has elapsed."); + + this.settings.KeepaliveTimer.Stop(); + this.settings.KeepaliveTimer.Enabled = false; + this.fullNode.NodeLifetime.StopApplication(); + }; + + this.settings.KeepaliveTimer.Start(); + + return Task.CompletedTask; + } + + /// + /// Prints command-line help. + /// + /// The network to extract values from. + public static void PrintHelp(Network network) + { + WebHostSettings.PrintHelp(network); + } + + /// + /// Get the default configuration. + /// + /// The string builder to add the settings to. + /// The network to base the defaults off. + public static void BuildDefaultConfigurationFile(StringBuilder builder, Network network) + { + WebHostSettings.BuildDefaultConfigurationFile(builder, network); + } + + /// + public override void Dispose() + { + // Make sure the timer is stopped and disposed. + if (this.settings.KeepaliveTimer != null) + { + this.settings.KeepaliveTimer.Stop(); + this.settings.KeepaliveTimer.Enabled = false; + this.settings.KeepaliveTimer.Dispose(); + } + + // Make sure we are releasing the listening ip address / port. + if (this.webHost != null) + { + this.logger.LogInformation("API stopping on URL '{0}'.", this.settings.ApiUri); + this.webHost.StopAsync(TimeSpan.FromSeconds(WebHostStopTimeoutSeconds)).Wait(); + this.webHost = null; + } + } + } + + public sealed class WebHostFeatureOptions + { + public IClientEvent[] EventsToHandle { get; set; } + + public (Type Broadcaster, ClientEventBroadcasterSettings clientEventBroadcasterSettings)[] ClientEventBroadcasters { get; set; } + } + + /// + /// A class providing extension methods for . + /// + public static class ApiFeatureExtension + { + [Obsolete("Use the new UseWebHost()")] + public static IFullNodeBuilder UseApi(this IFullNodeBuilder fullNodeBuilder, Action optionsAction = null) + { + return UseWebHost(fullNodeBuilder, optionsAction); + } + + public static IFullNodeBuilder UseWebHost(this IFullNodeBuilder fullNodeBuilder, Action optionsAction = null) + { + // TODO: move the options in to the feature builder + var options = new WebHostFeatureOptions(); + optionsAction?.Invoke(options); + + // If there is no events to handle defined in the options configured by the node, add a few default. + if (options.EventsToHandle == null) + { + options.EventsToHandle = new[] + { + (IClientEvent) new BlockConnectedClientEvent(), + new TransactionReceivedClientEvent() + }; + } + + // If there is now client event broadcasters, add the default ones. + if (options.ClientEventBroadcasters == null) + { + options.ClientEventBroadcasters = new[] + { + (Broadcaster: typeof(StakingBroadcaster), ClientEventBroadcasterSettings: new ClientEventBroadcasterSettings { BroadcastFrequencySeconds = 5 }), + (Broadcaster: typeof(WalletInfoBroadcaster), ClientEventBroadcasterSettings: new ClientEventBroadcasterSettings { BroadcastFrequencySeconds = 5 }) + }; + } + + WebHostFeature.eventBroadcasterSettings = options.ClientEventBroadcasters.ToDictionary(pair => pair.Broadcaster, pair => pair.clientEventBroadcasterSettings); + + fullNodeBuilder.ConfigureFeature(features => + { + features + .AddFeature() + .FeatureServices(services => + { + services.AddSingleton(fullNodeBuilder); + services.AddSingleton(options); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + + if (null != options.ClientEventBroadcasters) + { + foreach ((Type Broadcaster, ClientEventBroadcasterSettings clientEventBroadcasterSettings) in options.ClientEventBroadcasters) + { + if (typeof(IClientEventBroadcaster).IsAssignableFrom(Broadcaster)) + { + services.AddSingleton(typeof(IClientEventBroadcaster), Broadcaster); + } + else + { + Console.WriteLine($"Warning {Broadcaster.Name} is not of type {typeof(IClientEventBroadcaster).Name}"); + } + } + } + }); + }); + + return fullNodeBuilder; + } + } +} diff --git a/src/Features/Blockcore.Features.WebHost/ApiSettings.cs b/src/Features/Blockcore.Features.WebHost/WebHostSettings.cs similarity index 78% rename from src/Features/Blockcore.Features.WebHost/ApiSettings.cs rename to src/Features/Blockcore.Features.WebHost/WebHostSettings.cs index c4ca5aa87..32d4446de 100644 --- a/src/Features/Blockcore.Features.WebHost/ApiSettings.cs +++ b/src/Features/Blockcore.Features.WebHost/WebHostSettings.cs @@ -11,7 +11,7 @@ namespace Blockcore.Features.WebHost /// /// Configuration related to the API interface. /// - public class ApiSettings + public class WebHostSettings { /// The default port used by the API when the node runs on the network. public const string DefaultApiHost = "http://localhost"; @@ -28,6 +28,21 @@ public class ApiSettings /// URI to node's API interface. public Timer KeepaliveTimer { get; private set; } + /// + /// If true then the node will add and start the SignalR feature. This should never be enabled if node is accessible to the public. + /// + public bool EnableWS { get; private set; } + + /// + /// If true the node will host a UI available in the WebHost. This should never be enabled if node is accessible to the public. + /// + public bool EnableUI { get; private set; } + + /// + /// If true the node will host a REST API in the WebHost. This should never be enabled if node is accessible to the public. + /// + public bool EnableAPI { get; private set; } + /// /// The HTTPS certificate file path. /// @@ -44,11 +59,11 @@ public class ApiSettings /// Initializes an instance of the object from the node configuration. ///
/// The node configuration. - public ApiSettings(NodeSettings nodeSettings) + public WebHostSettings(NodeSettings nodeSettings) { Guard.NotNull(nodeSettings, nameof(nodeSettings)); - this.logger = nodeSettings.LoggerFactory.CreateLogger(typeof(ApiSettings).FullName); + this.logger = nodeSettings.LoggerFactory.CreateLogger(typeof(WebHostSettings).FullName); TextFileConfiguration config = nodeSettings.ConfigReader; @@ -91,6 +106,10 @@ public ApiSettings(NodeSettings nodeSettings) Interval = keepAlive * 1000 }; } + + this.EnableWS = config.GetOrDefault("enableWS", false, this.logger); + this.EnableUI = config.GetOrDefault("enableUI", true, this.logger); + this.EnableAPI = config.GetOrDefault("enableAPI", true, this.logger); } /// Prints the help information on how to configure the API settings to the logger. @@ -104,6 +123,9 @@ public static void PrintHelp(Network network) builder.AppendLine($"-keepalive= Keep Alive interval (set in seconds). Default: 0 (no keep alive)."); builder.AppendLine($"-usehttps= Use https protocol on the API. Defaults to false."); builder.AppendLine($"-certificatefilepath= Path to the certificate used for https traffic encryption. Defaults to . Password protected files are not supported. On MacOs, only p12 certificates can be used without password."); + builder.AppendLine($"-enableWS= Enable the Web Socket endpoints. Defaults to false."); + builder.AppendLine($"-enableUI= Enable the node UI. Defaults to true."); + builder.AppendLine($"-enableAPI= Enable the node API. Defaults to true."); NodeSettings.Default(network).Logger.LogInformation(builder.ToString()); } @@ -124,6 +146,12 @@ public static void BuildDefaultConfigurationFile(StringBuilder builder, Network builder.AppendLine($"#keepalive=0"); builder.AppendLine($"#Use HTTPS protocol on the API. Default is false."); builder.AppendLine($"#usehttps=false"); + builder.AppendLine($"#Enable the Web Socket endpoints. Defaults to false."); + builder.AppendLine($"#enableWS=false"); + builder.AppendLine($"#Enable the node UI. Defaults to true."); + builder.AppendLine($"#enableUI=true"); + builder.AppendLine($"#Enable the node API. Defaults to true."); + builder.AppendLine($"#enableAPI=true"); builder.AppendLine($"#Path to the file containing the certificate to use for https traffic encryption. Password protected files are not supported. On MacOs, only p12 certificates can be used without password."); builder.AppendLine(@"#Please refer to .Net Core documentation for usage: 'https://docs.microsoft.com/en-us/dotnet/api/system.security.cryptography.x509certificates.x509certificate2.-ctor?view=netcore-2.1#System_Security_Cryptography_X509Certificates_X509Certificate2__ctor_System_Byte___'."); builder.AppendLine($"#certificatefilepath="); diff --git a/src/Networks/Bitcoin/Bitcoin.Cli/Program.cs b/src/Networks/Bitcoin/Bitcoin.Cli/Program.cs index d5676a0b9..44f3b4538 100644 --- a/src/Networks/Bitcoin/Bitcoin.Cli/Program.cs +++ b/src/Networks/Bitcoin/Bitcoin.Cli/Program.cs @@ -175,7 +175,7 @@ public static void Main(string[] args) MinProtocolVersion = ProtocolVersion.ALT_PROTOCOL_VERSION }; - var apiSettings = new ApiSettings(nodeSettings); + var apiSettings = new WebHostSettings(nodeSettings); string url = $"http://localhost:{apiSettings.ApiPort}/api".AppendPathSegment(command); diff --git a/src/Networks/Bitcoin/Bitcoind/Program.cs b/src/Networks/Bitcoin/Bitcoind/Program.cs index 0022e3b29..997a20db2 100644 --- a/src/Networks/Bitcoin/Bitcoind/Program.cs +++ b/src/Networks/Bitcoin/Bitcoind/Program.cs @@ -35,7 +35,7 @@ public static async Task Main(string[] args) .AddMining() .AddRPC() .UseWallet() - .UseApi() + .UseWebHost() .Build(); if (node != null) diff --git a/src/Networks/City/City.Node/City.Node.csproj b/src/Networks/City/City.Node/City.Node.csproj index 4ac03e2e3..723ba3d05 100644 --- a/src/Networks/City/City.Node/City.Node.csproj +++ b/src/Networks/City/City.Node/City.Node.csproj @@ -22,7 +22,6 @@ - diff --git a/src/Networks/City/City.Node/Program.cs b/src/Networks/City/City.Node/Program.cs index 6192a5165..566d1778b 100644 --- a/src/Networks/City/City.Node/Program.cs +++ b/src/Networks/City/City.Node/Program.cs @@ -11,9 +11,6 @@ using Blockcore.Features.MemoryPool; using Blockcore.Features.Miner; using Blockcore.Features.RPC; -using Blockcore.Features.SignalR; -using Blockcore.Features.SignalR.Broadcasters; -using Blockcore.Features.SignalR.Events; using Blockcore.Utilities; using NBitcoin; using NBitcoin.Protocol; @@ -39,28 +36,10 @@ public static async Task Main(string[] args) .UseMempool() .UseColdStakingWallet() .AddPowPosMining() - .UseApi() + .UseWebHost() .AddRPC() .UseDiagnosticFeature(); - if (nodeSettings.EnableSignalR) - { - nodeBuilder.AddSignalR(options => - { - options.EventsToHandle = new[] - { - (IClientEvent) new BlockConnectedClientEvent(), - new TransactionReceivedClientEvent() - }; - - options.ClientEventBroadcasters = new[] - { - (Broadcaster: typeof(StakingBroadcaster), ClientEventBroadcasterSettings: new ClientEventBroadcasterSettings { BroadcastFrequencySeconds = 5 }), - (Broadcaster: typeof(WalletInfoBroadcaster), ClientEventBroadcasterSettings: new ClientEventBroadcasterSettings { BroadcastFrequencySeconds = 5 }) - }; - }); - } - IFullNode node = nodeBuilder.Build(); if (node != null) diff --git a/src/Networks/Stratis/StratisDns/Program.cs b/src/Networks/Stratis/StratisDns/Program.cs index a4bd3ce5d..08daaea80 100644 --- a/src/Networks/Stratis/StratisDns/Program.cs +++ b/src/Networks/Stratis/StratisDns/Program.cs @@ -54,7 +54,7 @@ public static async Task Main(string[] args) .UseMempool() .UseWallet() .AddPowPosMining() - .UseApi() + .UseWebHost() .AddRPC() .UseDns() .Build(); @@ -65,7 +65,7 @@ public static async Task Main(string[] args) node = new FullNodeBuilder() .UseNodeSettings(nodeSettings) .UsePosConsensus() - .UseApi() + .UseWebHost() .AddRPC() .UseDns() .Build(); diff --git a/src/Networks/Stratis/Stratisd/Program.cs b/src/Networks/Stratis/Stratisd/Program.cs index 5a7f6a713..9f93b5bfc 100644 --- a/src/Networks/Stratis/Stratisd/Program.cs +++ b/src/Networks/Stratis/Stratisd/Program.cs @@ -11,9 +11,6 @@ using Blockcore.Features.MemoryPool; using Blockcore.Features.Miner; using Blockcore.Features.RPC; -using Blockcore.Features.SignalR; -using Blockcore.Features.SignalR.Broadcasters; -using Blockcore.Features.SignalR.Events; using Blockcore.Networks; using Blockcore.Networks.Stratis; using Blockcore.Utilities; @@ -43,34 +40,10 @@ public static async Task Main(string[] args) .UseMempool() .UseColdStakingWallet() .AddPowPosMining() - .UseApi() + .UseWebHost() .AddRPC() .UseDiagnosticFeature(); - if (nodeSettings.EnableSignalR) - { - nodeBuilder.AddSignalR(options => - { - options.EventsToHandle = new[] - { - (IClientEvent) new BlockConnectedClientEvent(), - new TransactionReceivedClientEvent() - }; - - options.ClientEventBroadcasters = new[] - { - (Broadcaster: typeof(StakingBroadcaster), ClientEventBroadcasterSettings: new ClientEventBroadcasterSettings - { - BroadcastFrequencySeconds = 5 - }), - (Broadcaster: typeof(WalletInfoBroadcaster), ClientEventBroadcasterSettings: new ClientEventBroadcasterSettings - { - BroadcastFrequencySeconds = 5 - }) - }; - }); - } - IFullNode node = nodeBuilder.Build(); if (node != null) diff --git a/src/Networks/Stratis/Stratisd/StratisD.csproj b/src/Networks/Stratis/Stratisd/StratisD.csproj index 77700ed7c..e8e2961e2 100644 --- a/src/Networks/Stratis/Stratisd/StratisD.csproj +++ b/src/Networks/Stratis/Stratisd/StratisD.csproj @@ -24,7 +24,6 @@ - diff --git a/src/Networks/Xds/Xdsd/Program.cs b/src/Networks/Xds/Xdsd/Program.cs index 37f4f70ad..5c944af3d 100644 --- a/src/Networks/Xds/Xdsd/Program.cs +++ b/src/Networks/Xds/Xdsd/Program.cs @@ -36,7 +36,7 @@ public static async Task Main(string[] args) .UseMempool() .UseColdStakingWallet() .AddPowPosMining() - .UseApi() + .UseWebHost() .AddRPC() .UseDiagnosticFeature(); diff --git a/src/Networks/Xds/Xdsd/XdsD.csproj b/src/Networks/Xds/Xdsd/XdsD.csproj index 6e1b13c75..5bc1638f0 100644 --- a/src/Networks/Xds/Xdsd/XdsD.csproj +++ b/src/Networks/Xds/Xdsd/XdsD.csproj @@ -24,7 +24,6 @@ - diff --git a/src/Networks/x42/x42.Node/Program.cs b/src/Networks/x42/x42.Node/Program.cs index 53e53edb8..f94c60de6 100644 --- a/src/Networks/x42/x42.Node/Program.cs +++ b/src/Networks/x42/x42.Node/Program.cs @@ -11,9 +11,6 @@ using Blockcore.Features.MemoryPool; using Blockcore.Features.Miner; using Blockcore.Features.RPC; -using Blockcore.Features.SignalR; -using Blockcore.Features.SignalR.Broadcasters; -using Blockcore.Features.SignalR.Events; using Blockcore.Utilities; using NBitcoin; using NBitcoin.Protocol; @@ -39,28 +36,10 @@ public static async Task Main(string[] args) .UseMempool() .UseColdStakingWallet() .AddPowPosMining() - .UseApi() + .UseWebHost() .AddRPC() .UseDiagnosticFeature(); - if (nodeSettings.EnableSignalR) - { - nodeBuilder.AddSignalR(options => - { - options.EventsToHandle = new[] - { - (IClientEvent) new BlockConnectedClientEvent(), - new TransactionReceivedClientEvent() - }; - - options.ClientEventBroadcasters = new[] - { - (Broadcaster: typeof(StakingBroadcaster), ClientEventBroadcasterSettings: new ClientEventBroadcasterSettings { BroadcastFrequencySeconds = 5 }), - (Broadcaster: typeof(WalletInfoBroadcaster), ClientEventBroadcasterSettings: new ClientEventBroadcasterSettings { BroadcastFrequencySeconds = 5 }) - }; - }); - } - IFullNode node = nodeBuilder.Build(); if (node != null) diff --git a/src/Networks/x42/x42.Node/x42.Node.csproj b/src/Networks/x42/x42.Node/x42.Node.csproj index 48d0a465c..3d59d2b46 100644 --- a/src/Networks/x42/x42.Node/x42.Node.csproj +++ b/src/Networks/x42/x42.Node/x42.Node.csproj @@ -22,7 +22,6 @@ - diff --git a/src/Node/Blockcore.Node/Blockcore.Node.csproj b/src/Node/Blockcore.Node/Blockcore.Node.csproj index 94ded182d..98372cdce 100644 --- a/src/Node/Blockcore.Node/Blockcore.Node.csproj +++ b/src/Node/Blockcore.Node/Blockcore.Node.csproj @@ -22,7 +22,6 @@ - diff --git a/src/Node/Blockcore.Node/NodeBuilder.cs b/src/Node/Blockcore.Node/NodeBuilder.cs index af4b510e2..fb4b84b34 100644 --- a/src/Node/Blockcore.Node/NodeBuilder.cs +++ b/src/Node/Blockcore.Node/NodeBuilder.cs @@ -42,7 +42,7 @@ private static IFullNodeBuilder CreateBaseBuilder(string chain, NodeSettings set .UseNodeSettings(settings) .UseBlockStore() .UseMempool() - .UseApi() + .UseWebHost() .AddRPC() .UseDiagnosticFeature(); diff --git a/src/Node/Blockcore.Node/Program.cs b/src/Node/Blockcore.Node/Program.cs index eb797ef1e..9004f1ba6 100644 --- a/src/Node/Blockcore.Node/Program.cs +++ b/src/Node/Blockcore.Node/Program.cs @@ -4,9 +4,6 @@ using System.Threading.Tasks; using Blockcore.Builder; using Blockcore.Configuration; -using Blockcore.Features.SignalR; -using Blockcore.Features.SignalR.Broadcasters; -using Blockcore.Features.SignalR.Events; using Blockcore.Utilities; namespace Blockcore.Node @@ -26,24 +23,6 @@ public static async Task Main(string[] args) NodeSettings nodeSettings = NetworkSelector.Create(chain, args); IFullNodeBuilder nodeBuilder = NodeBuilder.Create(chain, nodeSettings); - if (nodeSettings.EnableSignalR) - { - nodeBuilder.AddSignalR(options => - { - options.EventsToHandle = new[] - { - (IClientEvent) new BlockConnectedClientEvent(), - new TransactionReceivedClientEvent() - }; - - options.ClientEventBroadcasters = new[] - { - (Broadcaster: typeof(StakingBroadcaster), ClientEventBroadcasterSettings: new ClientEventBroadcasterSettings { BroadcastFrequencySeconds = 5 }), - (Broadcaster: typeof(WalletInfoBroadcaster), ClientEventBroadcasterSettings: new ClientEventBroadcasterSettings { BroadcastFrequencySeconds = 5 }) - }; - }); - } - IFullNode node = nodeBuilder.Build(); if (node != null) diff --git a/src/Node/Blockcore.Node/Properties/launchSettings.json b/src/Node/Blockcore.Node/Properties/launchSettings.json index 699429aab..44537d661 100644 --- a/src/Node/Blockcore.Node/Properties/launchSettings.json +++ b/src/Node/Blockcore.Node/Properties/launchSettings.json @@ -60,9 +60,9 @@ "commandName": "Project", "commandLineArgs": "--chain=XDS -server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -testnet" }, - "XDS (MAIN/LOCAL/RPC/SIGNALR)": { + "XDS (MAIN/LOCAL/RPC/UI/API/WS)": { "commandName": "Project", - "commandLineArgs": "--chain=XDS -server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -enableSignalR=true" + "commandLineArgs": "--chain=XDS -server -rpcallowip=127.0.0.1 -rpcbind=127.0.0.1 -rpcpassword=rpcpassword -rpcuser=rpcuser -datadir=nodedata -enableUI=true -enableAPI=true -enableWS=true" } } } \ No newline at end of file diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/ApiSettingsTest.cs b/src/Tests/Blockcore.Features.WebHost.Tests/ApiSettingsTest.cs index 14fddfd5f..ba12bda60 100644 --- a/src/Tests/Blockcore.Features.WebHost.Tests/ApiSettingsTest.cs +++ b/src/Tests/Blockcore.Features.WebHost.Tests/ApiSettingsTest.cs @@ -29,11 +29,11 @@ public void GivenNoApiSettingsAreProvided_AndOnBitcoinNetwork_ThenDefaultSetting var nodeSettings = new NodeSettings(network); // Act. - ApiSettings settings = FullNodeSetup(nodeSettings); + WebHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(network.DefaultAPIPort, settings.ApiPort); - Assert.Equal(new Uri($"{ApiSettings.DefaultApiHost}:{network.DefaultAPIPort}"), settings.ApiUri); + Assert.Equal(new Uri($"{WebHostSettings.DefaultApiHost}:{network.DefaultAPIPort}"), settings.ApiUri); } /// @@ -47,11 +47,11 @@ public void GivenNoApiSettingsAreProvided_AndOnStratisNetwork_ThenDefaultSetting var nodeSettings = new NodeSettings(network); // Act. - ApiSettings settings = FullNodeSetup(nodeSettings); + WebHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(network.DefaultAPIPort, settings.ApiPort); - Assert.Equal(new Uri($"{ApiSettings.DefaultApiHost}:{network.DefaultAPIPort}"), settings.ApiUri); + Assert.Equal(new Uri($"{WebHostSettings.DefaultApiHost}:{network.DefaultAPIPort}"), settings.ApiUri); settings.HttpsCertificateFilePath.Should().BeNull(); settings.UseHttps.Should().BeFalse(); @@ -68,11 +68,11 @@ public void GivenApiPortIsProvided_ThenPortIsUsedWithDefaultApiUri() var nodeSettings = new NodeSettings(this.Network, args:new[] { $"-apiport={customPort}" }); // Act. - ApiSettings settings = FullNodeSetup(nodeSettings); + WebHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(customPort, settings.ApiPort); - Assert.Equal(new Uri($"{ApiSettings.DefaultApiHost}:{customPort}"), settings.ApiUri); + Assert.Equal(new Uri($"{WebHostSettings.DefaultApiHost}:{customPort}"), settings.ApiUri); } /// @@ -87,7 +87,7 @@ public void GivenApiUriIsProvided_AndGivenBitcoinNetwork_ThenApiUriIsUsedWithDef var nodeSettings = new NodeSettings(network, args:new[] { $"-apiuri={customApiUri}" }); // Act. - ApiSettings settings = FullNodeSetup(nodeSettings); + WebHostSettings settings = FullNodeSetup(nodeSettings); // Assert. @@ -107,7 +107,7 @@ public void GivenApiUriIsProvided_AndGivenStratisNetwork_ThenApiUriIsUsedWithDef var nodeSettings = new NodeSettings(network, args:new[] { $"-apiuri={customApiUri}" }); // Act. - ApiSettings settings = FullNodeSetup(nodeSettings); + WebHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(network.DefaultAPIPort, settings.ApiPort); @@ -127,7 +127,7 @@ public void GivenApiUri_AndApiPortIsProvided_AndGivenBitcoinNetwork_ThenApiUriIs var nodeSettings = new NodeSettings(network, args:new[] { $"-apiuri={customApiUri}", $"-apiport={customPort}" }); // Act. - ApiSettings settings = FullNodeSetup(nodeSettings); + WebHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(customPort, settings.ApiPort); @@ -147,7 +147,7 @@ public void GivenApiUriIncludingPortIsProvided_ThenUseThePassedApiUri() var nodeSettings = new NodeSettings(network, args:new[] { $"-apiuri={customApiUri}" }); // Act. - ApiSettings settings = FullNodeSetup(nodeSettings); + WebHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(customPort, settings.ApiPort); @@ -164,7 +164,7 @@ public void GivenBitcoinMain_ThenUseTheCorrectPort() NodeSettings nodeSettings = NodeSettings.Default(KnownNetworks.Main); // Act. - ApiSettings settings = FullNodeSetup(nodeSettings); + WebHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(KnownNetworks.Main.DefaultAPIPort, settings.ApiPort); @@ -180,7 +180,7 @@ public void GivenBitcoinTestnet_ThenUseTheCorrectPort() NodeSettings nodeSettings = NodeSettings.Default(KnownNetworks.TestNet); // Act. - ApiSettings settings = FullNodeSetup(nodeSettings); + WebHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(KnownNetworks.TestNet.DefaultAPIPort, settings.ApiPort); @@ -196,7 +196,7 @@ public void GivenStratisMainnet_ThenUseTheCorrectPort() NodeSettings nodeSettings = NodeSettings.Default(KnownNetworks.StratisMain); // Act. - ApiSettings settings = FullNodeSetup(nodeSettings); + WebHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(KnownNetworks.StratisMain.DefaultAPIPort, settings.ApiPort); @@ -212,7 +212,7 @@ public void GivenStratisTestnet_ThenUseTheCorrectPort() NodeSettings nodeSettings = NodeSettings.Default(KnownNetworks.StratisTest); // Act. - ApiSettings settings = FullNodeSetup(nodeSettings); + WebHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(KnownNetworks.StratisTest.DefaultAPIPort, settings.ApiPort); @@ -242,7 +242,7 @@ public void GivenCertificateFilePath_ThenUsesTheCorrectFileName() var nodeSettings = new NodeSettings(KnownNetworks.TestNet, args: new[] { $"-certificatefilepath={certificateFileName}" }); // Act. - ApiSettings settings = FullNodeSetup(nodeSettings); + WebHostSettings settings = FullNodeSetup(nodeSettings); // Assert. settings.HttpsCertificateFilePath.Should().Be(certificateFileName); @@ -264,14 +264,14 @@ public void GivenUseHttpsAndNoCertificateFilePath_ThenShouldThrowConfigurationEx settingsAction.Should().Throw(); } - private static ApiSettings FullNodeSetup(NodeSettings nodeSettings) + private static WebHostSettings FullNodeSetup(NodeSettings nodeSettings) { return new FullNodeBuilder() .UseNodeSettings(nodeSettings) - .UseApi() + .UseWebHost() .UsePowConsensus() .Build() - .NodeService(); + .NodeService(); } } } diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/ProgramTests.cs b/src/Tests/Blockcore.Features.WebHost.Tests/ProgramTests.cs index 3b0b0662f..eab30b83c 100644 --- a/src/Tests/Blockcore.Features.WebHost.Tests/ProgramTests.cs +++ b/src/Tests/Blockcore.Features.WebHost.Tests/ProgramTests.cs @@ -13,14 +13,14 @@ public class ProgramTest { private readonly X509Certificate2 certificateToUse; private readonly ICertificateStore certificateStore; - private readonly ApiSettings apiSettings; + private readonly WebHostSettings apiSettings; private readonly IWebHostBuilder webHostBuilder; private X509Certificate2 certificateRetrieved; public ProgramTest() { - this.apiSettings = new ApiSettings(NodeSettings.Default(KnownNetworks.TestNet)) { UseHttps = true }; + this.apiSettings = new WebHostSettings(NodeSettings.Default(KnownNetworks.TestNet)) { UseHttps = true }; this.certificateToUse = new X509Certificate2(); this.certificateStore = Substitute.For(); this.webHostBuilder = Substitute.For(); diff --git a/src/Tests/Blockcore.IntegrationTests.Common/EnvironmentMockUpHelpers/NodeBuilder.cs b/src/Tests/Blockcore.IntegrationTests.Common/EnvironmentMockUpHelpers/NodeBuilder.cs index bc8a46a43..8073072ee 100644 --- a/src/Tests/Blockcore.IntegrationTests.Common/EnvironmentMockUpHelpers/NodeBuilder.cs +++ b/src/Tests/Blockcore.IntegrationTests.Common/EnvironmentMockUpHelpers/NodeBuilder.cs @@ -149,7 +149,7 @@ public CoreNode CreateStratisCustomPowNode(Network network, NodeConfigParameters .AddMining() .UseWallet() .AddRPC() - .UseApi() + .UseWebHost() .UseTestChainedHeaderTree() .MockIBD()); diff --git a/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPosRunner.cs b/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPosRunner.cs index 36c4efd70..08eb470dc 100644 --- a/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPosRunner.cs +++ b/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPosRunner.cs @@ -43,7 +43,7 @@ public override void BuildNode() .UseWallet() .AddPowPosMining() .AddRPC() - .UseApi() + .UseWebHost() .UseTestChainedHeaderTree() .MockIBD(); diff --git a/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPowRunner.cs b/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPowRunner.cs index 8c5f62df0..8d86e19d7 100644 --- a/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPowRunner.cs +++ b/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPowRunner.cs @@ -41,7 +41,7 @@ public override void BuildNode() .AddMining() .UseWallet() .AddRPC() - .UseApi() + .UseWebHost() .UseTestChainedHeaderTree() .MockIBD(); diff --git a/src/Tests/Blockcore.IntegrationTests/API/ApiSteps.cs b/src/Tests/Blockcore.IntegrationTests/API/ApiSteps.cs index 51a05bca8..e8bd4bf20 100644 --- a/src/Tests/Blockcore.IntegrationTests/API/ApiSteps.cs +++ b/src/Tests/Blockcore.IntegrationTests/API/ApiSteps.cs @@ -153,7 +153,7 @@ private void a_proof_of_stake_node_with_api_enabled() this.stratisPosApiNode = this.posNodeBuilder.CreateStratisPosNode(this.posNetwork).Start(); this.stratisPosApiNode.FullNode.NodeService(true).Should().NotBeNull(); - this.apiUri = this.stratisPosApiNode.FullNode.NodeService().ApiUri; + this.apiUri = this.stratisPosApiNode.FullNode.NodeService().ApiUri; } private void the_proof_of_stake_node_has_passed_LastPOWBlock() @@ -178,7 +178,7 @@ private void a_proof_of_work_node_with_api_enabled() this.firstStratisPowApiNode.Mnemonic = this.firstStratisPowApiNode.Mnemonic; this.firstStratisPowApiNode.FullNode.Network.Consensus.CoinbaseMaturity = this.maturity; - this.apiUri = this.firstStratisPowApiNode.FullNode.NodeService().ApiUri; + this.apiUri = this.firstStratisPowApiNode.FullNode.NodeService().ApiUri; } private void a_second_proof_of_work_node_with_api_enabled() diff --git a/src/Tests/Blockcore.IntegrationTests/API/MultiCallTest.cs b/src/Tests/Blockcore.IntegrationTests/API/MultiCallTest.cs index 28ee50901..22b69615b 100644 --- a/src/Tests/Blockcore.IntegrationTests/API/MultiCallTest.cs +++ b/src/Tests/Blockcore.IntegrationTests/API/MultiCallTest.cs @@ -17,7 +17,7 @@ public void CanPerformMultipleParallelCallsToTheSameController() this.stratisPosApiNode = this.posNodeBuilder.CreateStratisPosNode(this.posNetwork).Start(); this.stratisPosApiNode.FullNode.NodeService(true); - this.apiUri = this.stratisPosApiNode.FullNode.NodeService().ApiUri; + this.apiUri = this.stratisPosApiNode.FullNode.NodeService().ApiUri; // With these tests we still need to create the wallets outside of the builder this.stratisPosApiNode.FullNode.WalletManager().CreateWallet(WalletPassword, WalletName, WalletPassphrase); diff --git a/src/Tests/Blockcore.IntegrationTests/CustomNodeBuilderTests.cs b/src/Tests/Blockcore.IntegrationTests/CustomNodeBuilderTests.cs index 95d2f05e6..8530d82e1 100644 --- a/src/Tests/Blockcore.IntegrationTests/CustomNodeBuilderTests.cs +++ b/src/Tests/Blockcore.IntegrationTests/CustomNodeBuilderTests.cs @@ -45,7 +45,7 @@ public void CanUnderstandUnknownParams() .AddMining() .UseWallet() .AddRPC() - .UseApi() + .UseWebHost() .MockIBD()); var coreNode = nodeBuilder.CreateCustomNode(buildAction, this.network, @@ -76,7 +76,7 @@ public void CanUseCustomConfigFileFromParams() .AddMining() .UseWallet() .AddRPC() - .UseApi() + .UseWebHost() .MockIBD()); var coreNode = nodeBuilder.CreateCustomNode(buildAction, this.network, ProtocolVersion.PROTOCOL_VERSION, configParameters: extraParams); diff --git a/src/Tests/Blockcore.IntegrationTests/ProvenHeaderTests.cs b/src/Tests/Blockcore.IntegrationTests/ProvenHeaderTests.cs index 55b646783..0106952be 100644 --- a/src/Tests/Blockcore.IntegrationTests/ProvenHeaderTests.cs +++ b/src/Tests/Blockcore.IntegrationTests/ProvenHeaderTests.cs @@ -39,7 +39,7 @@ public CoreNode CreateNode(NodeBuilder nodeBuilder, string agent, ProtocolVersio .UsePosConsensus() .UseMempool() .AddRPC() - .UseApi() + .UseWebHost() .UseTestChainedHeaderTree() .MockIBD() ); diff --git a/src/Tests/Blockcore.IntegrationTests/Wallet/ColdWalletTests.cs b/src/Tests/Blockcore.IntegrationTests/Wallet/ColdWalletTests.cs index f508887c7..20c1415c5 100644 --- a/src/Tests/Blockcore.IntegrationTests/Wallet/ColdWalletTests.cs +++ b/src/Tests/Blockcore.IntegrationTests/Wallet/ColdWalletTests.cs @@ -89,7 +89,7 @@ private CoreNode CreatePowPosMiningNode(NodeBuilder nodeBuilder, Network network builder .AddPowPosMining() .AddRPC() - .UseApi() + .UseWebHost() .UseTestChainedHeaderTree() .MockIBD(); }); diff --git a/src/Tests/Blockcore.Tests/NodeConfiguration/NodeSettingsTest.cs b/src/Tests/Blockcore.Tests/NodeConfiguration/NodeSettingsTest.cs index 343a2b5a0..b3322abe9 100644 --- a/src/Tests/Blockcore.Tests/NodeConfiguration/NodeSettingsTest.cs +++ b/src/Tests/Blockcore.Tests/NodeConfiguration/NodeSettingsTest.cs @@ -162,7 +162,7 @@ public void NodeSettings_CanOverrideOnlyApiPort() var nodeSettings = new NodeSettings(new BitcoinRegTest(), args: new[] { $"-apiport={apiport}" }); - var apiSettings = new ApiSettings(nodeSettings); + var apiSettings = new WebHostSettings(nodeSettings); var rpcSettings = new RpcSettings(nodeSettings); var configurationManagerSettings = new ConnectionManagerSettings(nodeSettings); @@ -186,7 +186,7 @@ public void NodeSettings_CanOverrideAllPorts() var nodeSettings = new NodeSettings(new BitcoinRegTest(), args: args); - var apiSettings = new ApiSettings(nodeSettings); + var apiSettings = new WebHostSettings(nodeSettings); var rpcSettings = new RpcSettings(nodeSettings); var configurationManagerSettings = new ConnectionManagerSettings(nodeSettings); From fb8315b4de4752b51eebce0dfd54da89f0a93866 Mon Sep 17 00:00:00 2001 From: SondreB Date: Wed, 13 May 2020 20:41:25 +0200 Subject: [PATCH 02/14] Improve the Web Socket event handling - Return the EventBase directly to Web Socket consumers. - Remove unused code. - Remove references in WebHost project. --- .../Broadcasters/BroadcasterBase.cs | 23 +- .../ClientEventBroadcasterSettings.cs | 2 +- .../Broadcasters}/IClientEventBroadcaster.cs | 4 +- .../IEventsSubscriptionService.cs | 19 ++ .../EventBus/CoreEvents/BlockConnected.cs | 6 + .../CoreEvents/TransactionReceived.cs | 13 +- src/Blockcore/EventBus/EventBase.cs | 5 + src/External/NBitcoin/Network.cs | 6 - .../Broadcasters/StakingBroadcaster.cs | 10 +- .../Broadcasters/StakingInfoClientEvent.cs | 17 ++ .../Blockcore.Features.Miner/MiningFeature.cs | 3 + .../WalletGeneralInfoClientEvent.cs | 17 ++ .../Broadcasters/WalletInfoBroadcaster.cs | 30 +-- .../WalletFeature.cs | 3 + .../Blockcore.Features.WebHost.csproj | 5 +- .../EventSubscriptionService.cs | 70 ------ .../Events/BlockConnectedClientEvent.cs | 27 --- .../Events/EventSubscriptionService.cs | 222 ++++++++++++++++++ .../Events/StakingInfoClientEvent.cs | 41 ---- .../Events/TransactionReceivedClientEvent.cs | 33 --- .../Events/WalletGeneralInfoClientEvent.cs | 28 --- .../Hubs/EventsHub.cs | 36 ++- .../Hubs/NodeHub.cs | 4 +- .../IClientEvent.cs | 12 - .../IEventsSubscriptionService.cs | 7 - .../KeepAliveActionFilter.cs | 40 ---- .../Blockcore.Features.WebHost/Startup.cs | 20 +- .../UI/Shared/MainLayout.razor | 2 +- .../UI/wwwroot/ws-events/index.html | 60 ----- .../UI/wwwroot/ws-ui/index.html | 102 ++++++++ .../UI/wwwroot/{ws-events => ws-ui}/node.html | 4 +- .../WebHostFeature.cs | 96 +------- .../WebHostSettings.cs | 16 -- src/Networks/City/City/Networks/CityMain.cs | 1 - .../City/City/Networks/CityRegTest.cs | 1 - src/Networks/City/City/Networks/CityTest.cs | 1 - .../Blockcore.Networks.Stratis/StratisMain.cs | 1 - .../Blockcore.Networks.Stratis/StratisTest.cs | 1 - .../Stratisd/Properties/launchSettings.json | 4 - .../Xds/Blockcore.Networks.Xds/XdsMain.cs | 1 - src/Networks/x42/x42/Networks/x42Main.cs | 1 - src/Networks/x42/x42/Networks/x42RegTest.cs | 1 - src/Networks/x42/x42/Networks/x42Test.cs | 1 - src/Node/Blockcore.Node/NodeBuilder.cs | 2 +- 44 files changed, 490 insertions(+), 508 deletions(-) rename src/{Features/Blockcore.Features.WebHost => Blockcore}/Broadcasters/BroadcasterBase.cs (65%) rename src/{Features/Blockcore.Features.WebHost/Options => Blockcore/Broadcasters}/ClientEventBroadcasterSettings.cs (71%) rename src/{Features/Blockcore.Features.WebHost => Blockcore/Broadcasters}/IClientEventBroadcaster.cs (62%) create mode 100644 src/Blockcore/Broadcasters/IEventsSubscriptionService.cs rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.Miner}/Broadcasters/StakingBroadcaster.cs (79%) create mode 100644 src/Features/Blockcore.Features.Miner/Broadcasters/StakingInfoClientEvent.cs create mode 100644 src/Features/Blockcore.Features.Wallet/Broadcasters/WalletGeneralInfoClientEvent.cs rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.Wallet}/Broadcasters/WalletInfoBroadcaster.cs (81%) delete mode 100644 src/Features/Blockcore.Features.WebHost/EventSubscriptionService.cs delete mode 100644 src/Features/Blockcore.Features.WebHost/Events/BlockConnectedClientEvent.cs create mode 100644 src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs delete mode 100644 src/Features/Blockcore.Features.WebHost/Events/StakingInfoClientEvent.cs delete mode 100644 src/Features/Blockcore.Features.WebHost/Events/TransactionReceivedClientEvent.cs delete mode 100644 src/Features/Blockcore.Features.WebHost/Events/WalletGeneralInfoClientEvent.cs delete mode 100644 src/Features/Blockcore.Features.WebHost/IClientEvent.cs delete mode 100644 src/Features/Blockcore.Features.WebHost/IEventsSubscriptionService.cs delete mode 100644 src/Features/Blockcore.Features.WebHost/KeepAliveActionFilter.cs delete mode 100644 src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-events/index.html create mode 100644 src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-ui/index.html rename src/Features/Blockcore.Features.WebHost/UI/wwwroot/{ws-events => ws-ui}/node.html (90%) diff --git a/src/Features/Blockcore.Features.WebHost/Broadcasters/BroadcasterBase.cs b/src/Blockcore/Broadcasters/BroadcasterBase.cs similarity index 65% rename from src/Features/Blockcore.Features.WebHost/Broadcasters/BroadcasterBase.cs rename to src/Blockcore/Broadcasters/BroadcasterBase.cs index 742e756ff..0af960e9b 100644 --- a/src/Features/Blockcore.Features.WebHost/Broadcasters/BroadcasterBase.cs +++ b/src/Blockcore/Broadcasters/BroadcasterBase.cs @@ -1,26 +1,26 @@ using System; using System.Collections.Generic; using Blockcore.AsyncWork; -using Blockcore.Features.WebHost.Hubs; -using Blockcore.Features.WebHost.Options; +using Blockcore.EventBus; using Blockcore.Utilities; +using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; -namespace Blockcore.Features.WebHost.Broadcasters +namespace Blockcore.Broadcasters { /// /// Base class for all Web Socket Broadcasters /// public abstract class ClientBroadcasterBase : IClientEventBroadcaster { - private readonly EventsHub eventsHub; + private readonly IEventsSubscriptionService eventsHub; private readonly INodeLifetime nodeLifetime; private readonly IAsyncProvider asyncProvider; - protected readonly ILogger logger; private IAsyncLoop asyncLoop; + protected readonly ILogger log; protected ClientBroadcasterBase( - EventsHub eventsHub, + IEventsSubscriptionService eventsHub, ILoggerFactory loggerFactory, INodeLifetime nodeLifetime, IAsyncProvider asyncProvider) @@ -28,25 +28,26 @@ protected ClientBroadcasterBase( this.eventsHub = eventsHub; this.nodeLifetime = nodeLifetime; this.asyncProvider = asyncProvider; - this.logger = loggerFactory.CreateLogger(this.GetType().FullName); + this.log = loggerFactory.CreateLogger(this.GetType().FullName); } public void Init(ClientEventBroadcasterSettings broadcasterSettings) { - this.logger.LogDebug($"Initialising Web Socket Broadcaster {this.GetType().Name}"); + this.log.LogDebug($"Initialising Web Socket Broadcaster {this.GetType().Name}"); + this.asyncLoop = this.asyncProvider.CreateAndRunAsyncLoop( $"Broadcast {this.GetType().Name}", async token => { - foreach (IClientEvent clientEvent in this.GetMessages()) + foreach (EventBase clientEvent in this.GetMessages()) { - await this.eventsHub.SendToClientsAsync(clientEvent).ConfigureAwait(false); + this.eventsHub.OnEvent(clientEvent); } }, this.nodeLifetime.ApplicationStopping, repeatEvery: TimeSpan.FromSeconds(Math.Max(broadcasterSettings.BroadcastFrequencySeconds, 5))); } - protected abstract IEnumerable GetMessages(); + protected abstract IEnumerable GetMessages(); } } \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/Options/ClientEventBroadcasterSettings.cs b/src/Blockcore/Broadcasters/ClientEventBroadcasterSettings.cs similarity index 71% rename from src/Features/Blockcore.Features.WebHost/Options/ClientEventBroadcasterSettings.cs rename to src/Blockcore/Broadcasters/ClientEventBroadcasterSettings.cs index 63633670a..cd7d18216 100644 --- a/src/Features/Blockcore.Features.WebHost/Options/ClientEventBroadcasterSettings.cs +++ b/src/Blockcore/Broadcasters/ClientEventBroadcasterSettings.cs @@ -1,4 +1,4 @@ -namespace Blockcore.Features.WebHost.Options +namespace Blockcore.Broadcasters { public class ClientEventBroadcasterSettings { diff --git a/src/Features/Blockcore.Features.WebHost/IClientEventBroadcaster.cs b/src/Blockcore/Broadcasters/IClientEventBroadcaster.cs similarity index 62% rename from src/Features/Blockcore.Features.WebHost/IClientEventBroadcaster.cs rename to src/Blockcore/Broadcasters/IClientEventBroadcaster.cs index a12c2ef15..7c89798bd 100644 --- a/src/Features/Blockcore.Features.WebHost/IClientEventBroadcaster.cs +++ b/src/Blockcore/Broadcasters/IClientEventBroadcaster.cs @@ -1,6 +1,6 @@ -using Blockcore.Features.WebHost.Options; +using Microsoft.AspNetCore.SignalR; -namespace Blockcore.Features.WebHost +namespace Blockcore.Broadcasters { public interface IClientEventBroadcaster { diff --git a/src/Blockcore/Broadcasters/IEventsSubscriptionService.cs b/src/Blockcore/Broadcasters/IEventsSubscriptionService.cs new file mode 100644 index 000000000..297e0b81d --- /dev/null +++ b/src/Blockcore/Broadcasters/IEventsSubscriptionService.cs @@ -0,0 +1,19 @@ +using System.Threading.Tasks; +using Blockcore.Broadcasters; +using Blockcore.EventBus; + +namespace Blockcore.Broadcasters +{ + public interface IEventsSubscriptionService + { + void Init(); + + void Subscribe(string id, string name); + + void Unsubscribe(string id, string name); + + void UnsubscribeAll(string id); + + void OnEvent(EventBase @event); + } +} \ No newline at end of file diff --git a/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs b/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs index e77ba7338..71f9005ae 100644 --- a/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs +++ b/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs @@ -10,9 +10,15 @@ public class BlockConnected : EventBase { public ChainedHeaderBlock ConnectedBlock { get; } + public string Hash { get; set; } + + public int Height { get; set; } + public BlockConnected(ChainedHeaderBlock connectedBlock) { this.ConnectedBlock = connectedBlock; + this.Hash = this.ConnectedBlock.ChainedHeader.HashBlock.ToString(); + this.Height = this.ConnectedBlock.ChainedHeader.Height; } } } \ No newline at end of file diff --git a/src/Blockcore/EventBus/CoreEvents/TransactionReceived.cs b/src/Blockcore/EventBus/CoreEvents/TransactionReceived.cs index 3f61a5da6..d634a5d96 100644 --- a/src/Blockcore/EventBus/CoreEvents/TransactionReceived.cs +++ b/src/Blockcore/EventBus/CoreEvents/TransactionReceived.cs @@ -1,4 +1,5 @@ -using NBitcoin; +using System; +using NBitcoin; namespace Blockcore.EventBus.CoreEvents { @@ -10,9 +11,19 @@ public class TransactionReceived : EventBase { public Transaction ReceivedTransaction { get; } + public string TxHash { get; set; } + + public bool IsCoinbase { get; set; } + + public bool IsCoinstake { get; set; } + public TransactionReceived(Transaction receivedTransaction) { this.ReceivedTransaction = receivedTransaction; + + this.TxHash = this.ReceivedTransaction.GetHash().ToString(); + this.IsCoinbase = this.ReceivedTransaction.IsCoinBase; + this.IsCoinstake = this.ReceivedTransaction.IsCoinStake; } } } \ No newline at end of file diff --git a/src/Blockcore/EventBus/EventBase.cs b/src/Blockcore/EventBus/EventBase.cs index a319d3a9b..d7f0941ab 100644 --- a/src/Blockcore/EventBus/EventBase.cs +++ b/src/Blockcore/EventBus/EventBase.cs @@ -1,4 +1,5 @@ using System; +using Blockcore.Broadcasters; namespace Blockcore.EventBus { @@ -20,5 +21,9 @@ public override string ToString() { return $"{this.CorrelationId.ToString()} - {this.GetType().Name}"; } + + public string EventName { get { return this.GetType().Name.ToLowerInvariant(); } } + + public string EventType { get { return this.GetType().ToString(); } } } } \ No newline at end of file diff --git a/src/External/NBitcoin/Network.cs b/src/External/NBitcoin/Network.cs index d4f875469..9bb61495a 100644 --- a/src/External/NBitcoin/Network.cs +++ b/src/External/NBitcoin/Network.cs @@ -125,12 +125,6 @@ public abstract class Network /// The default port on which nodes of this network communicate with external clients. /// public int DefaultPort { get; protected set; } - - /// - /// The default port on which SignalR broadcasts for this network. - /// - [Obsolete("SignalR has been migrated into WebHost and use same port as API.")] - public int DefaultSignalRPort { get; protected set; } /// /// The default maximum number of outbound connections a node on this network will form. diff --git a/src/Features/Blockcore.Features.WebHost/Broadcasters/StakingBroadcaster.cs b/src/Features/Blockcore.Features.Miner/Broadcasters/StakingBroadcaster.cs similarity index 79% rename from src/Features/Blockcore.Features.WebHost/Broadcasters/StakingBroadcaster.cs rename to src/Features/Blockcore.Features.Miner/Broadcasters/StakingBroadcaster.cs index 3086c5766..9d9650485 100644 --- a/src/Features/Blockcore.Features.WebHost/Broadcasters/StakingBroadcaster.cs +++ b/src/Features/Blockcore.Features.Miner/Broadcasters/StakingBroadcaster.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using Blockcore.AsyncWork; +using Blockcore.Broadcasters; +using Blockcore.EventBus; using Blockcore.Features.Miner.Interfaces; -using Blockcore.Features.WebHost.Events; -using Blockcore.Features.WebHost.Hubs; using Blockcore.Utilities; using Microsoft.Extensions.Logging; -namespace Blockcore.Features.WebHost.Broadcasters +namespace Blockcore.Features.Miner.Broadcasters { /// /// Broadcasts current staking information to Web Socket clients @@ -20,13 +20,13 @@ public StakingBroadcaster( IPosMinting posMinting, INodeLifetime nodeLifetime, IAsyncProvider asyncProvider, - EventsHub eventsHub) + IEventsSubscriptionService eventsHub) : base(eventsHub, loggerFactory, nodeLifetime, asyncProvider) { this.posMinting = posMinting; } - protected override IEnumerable GetMessages() + protected override IEnumerable GetMessages() { if (null != this.posMinting) { diff --git a/src/Features/Blockcore.Features.Miner/Broadcasters/StakingInfoClientEvent.cs b/src/Features/Blockcore.Features.Miner/Broadcasters/StakingInfoClientEvent.cs new file mode 100644 index 000000000..2b697b4c9 --- /dev/null +++ b/src/Features/Blockcore.Features.Miner/Broadcasters/StakingInfoClientEvent.cs @@ -0,0 +1,17 @@ +using System; +using Blockcore.Broadcasters; +using Blockcore.EventBus; +using Blockcore.Features.Miner.Api.Models; + +namespace Blockcore.Features.Miner.Broadcasters +{ + public class StakingInfoClientEvent : EventBase + { + public StakingInfoClientEvent(GetStakingInfoModel stakingInfoModel) + { + this.StakingInfo = stakingInfoModel; + } + + public GetStakingInfoModel StakingInfo { get; set; } + } +} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.Miner/MiningFeature.cs b/src/Features/Blockcore.Features.Miner/MiningFeature.cs index 9155aa5b8..7159ce361 100644 --- a/src/Features/Blockcore.Features.Miner/MiningFeature.cs +++ b/src/Features/Blockcore.Features.Miner/MiningFeature.cs @@ -3,6 +3,7 @@ using System.Text; using System.Threading.Tasks; using Blockcore.Base; +using Blockcore.Broadcasters; using Blockcore.Builder; using Blockcore.Builder.Feature; using Blockcore.Configuration; @@ -10,6 +11,7 @@ using Blockcore.Configuration.Settings; using Blockcore.Features.BlockStore; using Blockcore.Features.MemoryPool; +using Blockcore.Features.Miner.Broadcasters; using Blockcore.Features.Miner.Interfaces; using Blockcore.Features.Miner.Staking; using Blockcore.Features.RPC; @@ -260,6 +262,7 @@ public static IFullNodeBuilder AddPowPosMining(this IFullNodeBuilder fullNodeBui services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); }); }); diff --git a/src/Features/Blockcore.Features.Wallet/Broadcasters/WalletGeneralInfoClientEvent.cs b/src/Features/Blockcore.Features.Wallet/Broadcasters/WalletGeneralInfoClientEvent.cs new file mode 100644 index 000000000..4bd804ece --- /dev/null +++ b/src/Features/Blockcore.Features.Wallet/Broadcasters/WalletGeneralInfoClientEvent.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using Blockcore.Broadcasters; +using Blockcore.EventBus; +using Blockcore.Features.Wallet.Api.Models; + +namespace Blockcore.Features.Wallet.Broadcasters +{ + public class WalletGeneralInfoClientEvent : EventBase + { + public WalletGeneralInfoModel WalletInfo { get; set; } + + public string WalletName { get; set; } + + public IEnumerable AccountsBalances { get; set; } + } +} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/Broadcasters/WalletInfoBroadcaster.cs b/src/Features/Blockcore.Features.Wallet/Broadcasters/WalletInfoBroadcaster.cs similarity index 81% rename from src/Features/Blockcore.Features.WebHost/Broadcasters/WalletInfoBroadcaster.cs rename to src/Features/Blockcore.Features.Wallet/Broadcasters/WalletInfoBroadcaster.cs index 11b9f0a55..23e1a88c4 100644 --- a/src/Features/Blockcore.Features.WebHost/Broadcasters/WalletInfoBroadcaster.cs +++ b/src/Features/Blockcore.Features.Wallet/Broadcasters/WalletInfoBroadcaster.cs @@ -3,18 +3,18 @@ using System.IO; using System.Linq; using Blockcore.AsyncWork; +using Blockcore.Broadcasters; using Blockcore.Connection; +using Blockcore.EventBus; using Blockcore.Features.Wallet; using Blockcore.Features.Wallet.Api.Models; using Blockcore.Features.Wallet.Interfaces; using Blockcore.Features.Wallet.Types; -using Blockcore.Features.WebHost.Events; -using Blockcore.Features.WebHost.Hubs; using Blockcore.Utilities; using Microsoft.Extensions.Logging; using NBitcoin; -namespace Blockcore.Features.WebHost.Broadcasters +namespace Blockcore.Features.Wallet.Broadcasters { /// /// Broadcasts current staking information to Web Socket clients @@ -32,7 +32,7 @@ public WalletInfoBroadcaster( IAsyncProvider asyncProvider, INodeLifetime nodeLifetime, ChainIndexer chainIndexer, - EventsHub eventsHub) + IEventsSubscriptionService eventsHub) : base(eventsHub, loggerFactory, nodeLifetime, asyncProvider) { this.walletManager = walletManager; @@ -40,7 +40,7 @@ public WalletInfoBroadcaster( this.chainIndexer = chainIndexer; } - protected override IEnumerable GetMessages() + protected override IEnumerable GetMessages() { foreach (string walletName in this.walletManager.GetWalletsNames()) { @@ -82,13 +82,15 @@ protected override IEnumerable GetMessages() clientEvent = new WalletGeneralInfoClientEvent { WalletName = walletName, - Network = wallet.Network, - CreationTime = wallet.CreationTime, - LastBlockSyncedHeight = wallet.AccountsRoot.Single().LastBlockSyncedHeight, - ConnectedNodes = this.connectionManager.ConnectedPeers.Count(), - ChainTip = this.chainIndexer.Tip.Height, - IsChainSynced = this.chainIndexer.IsDownloaded(), - IsDecrypted = true, + WalletInfo = new WalletGeneralInfoModel { + Network = wallet.Network, + CreationTime = wallet.CreationTime, + LastBlockSyncedHeight = wallet.AccountsRoot.Single().LastBlockSyncedHeight, + ConnectedNodes = this.connectionManager.ConnectedPeers.Count(), + ChainTip = this.chainIndexer.Tip.Height, + IsChainSynced = this.chainIndexer.IsDownloaded(), + IsDecrypted = true, + }, AccountsBalances = accountBalanceModels }; @@ -99,12 +101,12 @@ protected override IEnumerable GetMessages() string fileName = fileNameCollection.FirstOrDefault(i => i.Equals(searchFile)); if (!string.IsNullOrEmpty(folder) && !string.IsNullOrEmpty(fileName)) { - clientEvent.WalletFilePath = Path.Combine(folder, fileName); + clientEvent.WalletInfo.WalletFilePath = Path.Combine(folder, fileName); } } catch (Exception e) { - this.logger.LogError(e, "Exception occurred: {0}"); + this.log.LogError(e, "Exception occurred: {0}"); } if (null != clientEvent) diff --git a/src/Features/Blockcore.Features.Wallet/WalletFeature.cs b/src/Features/Blockcore.Features.Wallet/WalletFeature.cs index 24845fe45..ff9c3f8c5 100644 --- a/src/Features/Blockcore.Features.Wallet/WalletFeature.cs +++ b/src/Features/Blockcore.Features.Wallet/WalletFeature.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using Blockcore.Broadcasters; using Blockcore.Builder; using Blockcore.Builder.Feature; using Blockcore.Configuration.Logging; @@ -13,6 +14,7 @@ using Blockcore.Features.MemoryPool.Broadcasting; using Blockcore.Features.RPC; using Blockcore.Features.Wallet.AddressBook; +using Blockcore.Features.Wallet.Broadcasters; using Blockcore.Features.Wallet.Interfaces; using Blockcore.Features.Wallet.Types; using Blockcore.Features.Wallet.UI; @@ -168,6 +170,7 @@ public static IFullNodeBuilder UseWallet(this IFullNodeBuilder fullNodeBuilder) services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); }); }); diff --git a/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj b/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj index f4451462c..9cbe85552 100644 --- a/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj +++ b/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj @@ -31,8 +31,6 @@ - - @@ -40,10 +38,11 @@ - + + \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/EventSubscriptionService.cs b/src/Features/Blockcore.Features.WebHost/EventSubscriptionService.cs deleted file mode 100644 index 1f71d294c..000000000 --- a/src/Features/Blockcore.Features.WebHost/EventSubscriptionService.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Blockcore.EventBus; -using Blockcore.Features.WebHost.Hubs; -using Blockcore.Features.WebHost.Options; -using Blockcore.Signals; -using Microsoft.Extensions.Logging; - -namespace Blockcore.Features.WebHost -{ - /// - /// This class subscribes to Stratis.Bitcoin.EventBus messages and proxy's them - /// to SignalR messages. - /// - public class EventSubscriptionService : IEventsSubscriptionService, IDisposable - { - private readonly WebHostFeatureOptions options; - private readonly ISignals signals; - private readonly EventsHub eventsHub; - private readonly ILogger logger; - private readonly List subscriptions = new List(); - - public EventSubscriptionService( - WebHostFeatureOptions options, - ILoggerFactory loggerFactory, - ISignals signals, - EventsHub eventsHub) - { - this.options = options; - this.signals = signals; - this.eventsHub = eventsHub; - this.logger = loggerFactory.CreateLogger(); - } - - public void Init() - { - MethodInfo subscribeMethod = this.signals.GetType().GetMethod("Subscribe"); - MethodInfo onEventCallbackMethod = typeof(EventSubscriptionService).GetMethod("OnEvent"); - foreach (IClientEvent eventToHandle in this.options.EventsToHandle) - { - this.logger.LogDebug("Create subscription for {0}", eventToHandle.NodeEventType); - MethodInfo subscribeMethodInfo = subscribeMethod.MakeGenericMethod(eventToHandle.NodeEventType); - Type callbackType = typeof(Action<>).MakeGenericType(eventToHandle.NodeEventType); - Delegate onEventDelegate = Delegate.CreateDelegate(callbackType, this, onEventCallbackMethod); - - var token = (SubscriptionToken)subscribeMethodInfo.Invoke(this.signals, new object[] { onEventDelegate }); - this.subscriptions.Add(token); - } - } - - // ReSharper disable once UnusedMember.Global - // This is invoked through reflection - public void OnEvent(EventBase @event) - { - Type childType = @event.GetType(); - IClientEvent clientEvent = this.options.EventsToHandle.FirstOrDefault(ev => ev.NodeEventType == childType); - if (clientEvent == null) return; - clientEvent.BuildFrom(@event); - this.eventsHub.SendToClientsAsync(clientEvent).ConfigureAwait(false).GetAwaiter().GetResult(); - } - - public void Dispose() - { - this.eventsHub?.Dispose(); - this.subscriptions.ForEach(s => s?.Dispose()); - } - } -} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/Events/BlockConnectedClientEvent.cs b/src/Features/Blockcore.Features.WebHost/Events/BlockConnectedClientEvent.cs deleted file mode 100644 index c1b4026ee..000000000 --- a/src/Features/Blockcore.Features.WebHost/Events/BlockConnectedClientEvent.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using Blockcore.EventBus; -using Blockcore.EventBus.CoreEvents; - -namespace Blockcore.Features.WebHost.Events -{ - public class BlockConnectedClientEvent : IClientEvent - { - public string Hash { get; set; } - - public int Height { get; set; } - - public Type NodeEventType { get; } = typeof(BlockConnected); - - public void BuildFrom(EventBase @event) - { - if (@event is BlockConnected blockConnected) - { - this.Hash = blockConnected.ConnectedBlock.ChainedHeader.HashBlock.ToString(); - this.Height = blockConnected.ConnectedBlock.ChainedHeader.Height; - return; - } - - throw new ArgumentException(); - } - } -} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs b/src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs new file mode 100644 index 000000000..bd3de5093 --- /dev/null +++ b/src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs @@ -0,0 +1,222 @@ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Collections.Immutable; +using System.Linq; +using System.Reflection; +using Blockcore.Broadcasters; +using Blockcore.EventBus; +using Blockcore.Features.WebHost.Hubs; +using Blockcore.Signals; +using Microsoft.AspNetCore.SignalR; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using NBitcoin; + +namespace Blockcore.Features.WebHost.Events +{ + /// + /// This class subscribes to Stratis.Bitcoin.EventBus messages and proxy's them + /// to SignalR messages. + /// + public class EventSubscriptionService : IEventsSubscriptionService, IDisposable + { + internal class SubscriptionList + { + internal List Events { get; set; } = new List(); + } + + private readonly ISignals signals; + private readonly ILogger log; + + private readonly ConcurrentDictionary subscriptions = new ConcurrentDictionary(); + private readonly ConcurrentDictionary consumers = new ConcurrentDictionary(); + private readonly ConcurrentDictionary events = new ConcurrentDictionary(); + + private IHubContext hubContext; + + public EventSubscriptionService( + ILoggerFactory logger, + ISignals signals) + { + this.log = logger.CreateLogger(); ; + this.signals = signals; + } + + public void Init() + { + Type baseType = typeof(EventBase); + + // Get all events that is loaded on the node. + IEnumerable types = AppDomain.CurrentDomain.GetAssemblies() + .SelectMany(s => s.GetTypes()) + .Where(p => baseType.IsAssignableFrom(p)); + + // Make sure all the events are available to be subscribed to. + foreach (Type type in types) + { + this.events.AddOrReplace(type.Name.ToLowerInvariant(), type); + } + } + + private IHubContext HubContext + { + get + { + if (this.hubContext == null) + { + if (Startup.Provider != null) + { + this.hubContext = Startup.Provider.GetService>(); + } + } + + return this.hubContext; + } + } + + private void SubscribeToEvent(string name) + { + Type eventToSubscribe = this.events.GetValueOrDefault(name); + + if (eventToSubscribe == null) + { + throw new ApplicationException($"The event does not exists \"{name}\"."); + } + + MethodInfo subscribeMethod = this.signals.GetType().GetMethod("Subscribe"); + MethodInfo onEventCallbackMethod = typeof(EventSubscriptionService).GetMethod("OnEvent"); + + this.log.LogDebug("Create subscription for {0}", eventToSubscribe); + + MethodInfo subscribeMethodInfo = subscribeMethod.MakeGenericMethod(eventToSubscribe); + Type callbackType = typeof(Action<>).MakeGenericType(eventToSubscribe); + Delegate onEventDelegate = Delegate.CreateDelegate(callbackType, this, onEventCallbackMethod); + + var token = (SubscriptionToken)subscribeMethodInfo.Invoke(this.signals, new object[] { onEventDelegate }); + var added = this.subscriptions.TryAdd(name, token); + + // If we did not add this successful, unsubscribe again to avoid leaking subscriptions to events. + if (!added) + { + // Dispose the token, it will unsubscribe. + token.Dispose(); + } + } + + private void UnsubscribeToEvent(string name) + { + if (this.subscriptions.ContainsKey(name)) + { + this.subscriptions[name].Dispose(); + } + } + + public void Subscribe(string id, string name) + { + name = name.ToLowerInvariant(); + + SubscriptionList consumer = this.consumers.GetOrAdd(id, x => new SubscriptionList()); ; + + if (consumer.Events.Contains(name)) + { + return; + } + + this.log.LogInformation("The {id} is subscribing to \"{name}\" event.", id, name); + + consumer.Events.Add(name); + + // If we are currently not subscribing to this event, add a subscription to it. + if (!this.subscriptions.ContainsKey(name)) + { + SubscribeToEvent(name); + } + } + + public void Unsubscribe(string id, string name) + { + name = name.ToLowerInvariant(); + + if (!this.consumers.ContainsKey(id)) + { + return; + } + + this.log.LogInformation("The {id} is unsubscribing to \"{name}\" event.", id, name); + + SubscriptionList consumer = this.consumers[id]; + + if (consumer.Events.Contains(name)) + { + consumer.Events.Remove(name); + } + + if (consumer.Events.Count == 0) + { + this.consumers.TryRemove(name, out _); + } + + // If there are no longer any subscribers to this event, remove the subscription to it. + if (!this.consumers.Any(c => c.Value.Events.Contains(name))) + { + UnsubscribeToEvent(name); + } + } + + /// + /// Call to unsubscribe to all events registered on this consumer Id. + /// + /// + public void UnsubscribeAll(string id) + { + if (!this.consumers.ContainsKey(id)) + { + return; + } + + this.log.LogInformation("The {id} is unsubscribing to all events.", id); + + SubscriptionList consumer = this.consumers[id]; + + if (consumer == null) + { + return; + } + + // Get all IDs to remove in separate list so code doesn't crash when Unsubscribe changes the collection. + var events = consumer.Events.ToList(); + events.ForEach(e => Unsubscribe(id, e)); + + this.consumers.TryRemove(id, out _); + } + + public void OnEvent(EventBase @event) + { + if (this.HubContext != null && @event != null) + { + ImmutableList consumersToInform = this.consumers.Where(c => c.Value.Events.Contains(@event.EventName)).Select(c => c.Key).ToImmutableList(); + + if (consumersToInform.Count > 0) + { + try + { + this.hubContext.Clients.Clients(consumersToInform).SendAsync("ReceiveEvent", @event).ConfigureAwait(false).GetAwaiter(); + } + catch (Exception ex) + { + this.log.LogError(ex, "Failed to send event to consumer."); + } + + } + } + } + + public void Dispose() + { + // Dispose all the subscriptions. + List subs = this.subscriptions.Select(s => s.Value).ToList(); + subs.ForEach(s => s?.Dispose()); + } + } +} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/Events/StakingInfoClientEvent.cs b/src/Features/Blockcore.Features.WebHost/Events/StakingInfoClientEvent.cs deleted file mode 100644 index 96766d8fc..000000000 --- a/src/Features/Blockcore.Features.WebHost/Events/StakingInfoClientEvent.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using Blockcore.EventBus; -using Blockcore.Features.Miner.Api.Models; - -namespace Blockcore.Features.WebHost.Events -{ - /// - /// Marker type for Client - /// - public class StakingInfo - { - } - - public class StakingInfoClientEvent : GetStakingInfoModel, IClientEvent - { - public StakingInfoClientEvent(GetStakingInfoModel stakingInfoModel) - { - if (null != stakingInfoModel) - { - this.Enabled = stakingInfoModel.Enabled; - this.Staking = stakingInfoModel.Staking; - this.Difficulty = stakingInfoModel.Difficulty; - this.Immature = stakingInfoModel.Immature; - this.Weight = stakingInfoModel.Weight; - this.NetStakeWeight = stakingInfoModel.NetStakeWeight; - this.ExpectedTime = stakingInfoModel.ExpectedTime; - this.PooledTx = stakingInfoModel.PooledTx; - this.SearchInterval = stakingInfoModel.SearchInterval; - this.CurrentBlockSize = stakingInfoModel.CurrentBlockSize; - this.CurrentBlockTx = stakingInfoModel.CurrentBlockTx; - } - } - - public Type NodeEventType => typeof(StakingInfo); - - public void BuildFrom(EventBase @event) - { - throw new NotImplementedException(); - } - } -} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/Events/TransactionReceivedClientEvent.cs b/src/Features/Blockcore.Features.WebHost/Events/TransactionReceivedClientEvent.cs deleted file mode 100644 index 665d9ec2e..000000000 --- a/src/Features/Blockcore.Features.WebHost/Events/TransactionReceivedClientEvent.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using Blockcore.EventBus; -using Blockcore.EventBus.CoreEvents; - -namespace Blockcore.Features.WebHost.Events -{ - public class TransactionReceivedClientEvent : IClientEvent - { - public string TxHash { get; set; } - - public bool IsCoinbase { get; set; } - - public bool IsCoinstake { get; set; } - - public uint Time { get; set; } - - public Type NodeEventType { get; } = typeof(TransactionReceived); - - public void BuildFrom(EventBase @event) - { - if (@event is TransactionReceived transactionReceived) - { - this.TxHash = transactionReceived.ReceivedTransaction.GetHash().ToString(); - this.IsCoinbase = transactionReceived.ReceivedTransaction.IsCoinBase; - this.IsCoinstake = transactionReceived.ReceivedTransaction.IsCoinStake; - // this.Time = transactionReceived.ReceivedTransaction.Time; - return; - } - - throw new ArgumentException(); - } - } -} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/Events/WalletGeneralInfoClientEvent.cs b/src/Features/Blockcore.Features.WebHost/Events/WalletGeneralInfoClientEvent.cs deleted file mode 100644 index c82baa7fa..000000000 --- a/src/Features/Blockcore.Features.WebHost/Events/WalletGeneralInfoClientEvent.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using Blockcore.EventBus; -using Blockcore.Features.Wallet.Api.Models; - -namespace Blockcore.Features.WebHost.Events -{ - /// - /// Marker type for Client - /// - public class WalletGeneralInfo - { - } - - public class WalletGeneralInfoClientEvent : WalletGeneralInfoModel, IClientEvent - { - - public string WalletName { get; set; } - public Type NodeEventType => typeof(WalletGeneralInfo); - - public IEnumerable AccountsBalances { get; set; } - - public void BuildFrom(EventBase @event) - { - throw new NotImplementedException(); - } - } -} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs b/src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs index a64904fd9..4c8a702bc 100644 --- a/src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs +++ b/src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs @@ -1,5 +1,9 @@ using System; using System.Threading.Tasks; +using Blockcore.Broadcasters; +using Blockcore.EventBus; +using Blockcore.Features.WebHost.Events; +using Blockcore.Utilities; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; @@ -9,9 +13,13 @@ public class EventsHub : Hub { private readonly ILogger logger; - public EventsHub(ILoggerFactory loggerFactory) + private readonly IEventsSubscriptionService eventsSubscriptionService; + + public EventsHub(ILoggerFactory loggerFactory, IEventsSubscriptionService eventsSubscriptionService) { this.logger = loggerFactory.CreateLogger(); + + this.eventsSubscriptionService = eventsSubscriptionService; } public override Task OnConnectedAsync() @@ -23,22 +31,30 @@ public override Task OnConnectedAsync() public override Task OnDisconnectedAsync(Exception exception) { this.logger.LogDebug("Client with id {id} disconnected", this.Context.ConnectionId); + + this.eventsSubscriptionService.UnsubscribeAll(this.Context.ConnectionId); + return base.OnDisconnectedAsync(exception); } - public async Task SendToClientsAsync(IClientEvent @event) + public Task Subscribe(params string[] events) { - // Check if any there are any connected clients - if (this.Clients == null) return; - - try - { - await this.Clients.All.SendAsync("receiveEvent", @event); + foreach (var @event in events) + { + this.eventsSubscriptionService.Subscribe(this.Context.ConnectionId, @event); } - catch (Exception ex) + + return Task.CompletedTask; + } + + public Task Unsubscribe(params string[] events) + { + foreach (var @event in events) { - this.logger.LogError(ex, "Error sending to clients"); + this.eventsSubscriptionService.Unsubscribe(this.Context.ConnectionId, @event); } + + return Task.CompletedTask; } } } \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs b/src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs index e1c5b6dc7..536fb3094 100644 --- a/src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs +++ b/src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs @@ -24,9 +24,9 @@ public NodeHub(ILoggerFactory loggerFactory) /// /// Any message to echo back. /// Returns the same message supplied. - public Task Message(string message) + public Task Echo(string message) { - return this.Clients.Caller.SendAsync("Message", message); + return this.Clients.Caller.SendAsync("Echo", message); } } } diff --git a/src/Features/Blockcore.Features.WebHost/IClientEvent.cs b/src/Features/Blockcore.Features.WebHost/IClientEvent.cs deleted file mode 100644 index 18b17e24a..000000000 --- a/src/Features/Blockcore.Features.WebHost/IClientEvent.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using Blockcore.EventBus; - -namespace Blockcore.Features.WebHost -{ - public interface IClientEvent - { - Type NodeEventType { get; } - - void BuildFrom(EventBase @event); - } -} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/IEventsSubscriptionService.cs b/src/Features/Blockcore.Features.WebHost/IEventsSubscriptionService.cs deleted file mode 100644 index 7dc668745..000000000 --- a/src/Features/Blockcore.Features.WebHost/IEventsSubscriptionService.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Blockcore.Features.WebHost -{ - public interface IEventsSubscriptionService - { - void Init(); - } -} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/KeepAliveActionFilter.cs b/src/Features/Blockcore.Features.WebHost/KeepAliveActionFilter.cs deleted file mode 100644 index 27518c852..000000000 --- a/src/Features/Blockcore.Features.WebHost/KeepAliveActionFilter.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Threading.Tasks; -using System.Timers; -using Blockcore.Utilities; -using Microsoft.AspNetCore.Mvc.Filters; - -namespace Blockcore.Features.WebHost -{ - /// - /// An asynchronous action filter whose role is to reset the keepalive counter. - /// - /// - public class KeepaliveActionFilter : IAsyncActionFilter - { - /// The keepalive object. - private readonly Timer timer; - - /// - /// Initializes a new instance of the class. - /// - /// The API settings. - public KeepaliveActionFilter(WebHostSettings apiSettings) - { - if (apiSettings == null) - { - return; - } - - this.timer = apiSettings.KeepaliveTimer; - } - - /// - public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next) - { - // If keepalive is used, reset the timer. - this.timer?.Reset(); - - await next(); - } - } -} diff --git a/src/Features/Blockcore.Features.WebHost/Startup.cs b/src/Features/Blockcore.Features.WebHost/Startup.cs index d39ed2807..96b9d34aa 100644 --- a/src/Features/Blockcore.Features.WebHost/Startup.cs +++ b/src/Features/Blockcore.Features.WebHost/Startup.cs @@ -17,6 +17,11 @@ namespace Blockcore.Features.WebHost { public class Startup { + /// + /// Provides access to the service provider created by the ASP.NET runtime. + /// + public static IServiceProvider Provider { get; private set; } + public Startup(IWebHostEnvironment env, IFullNode fullNode) { this.fullNode = fullNode; @@ -96,16 +101,6 @@ public void ConfigureServices(IServiceCollection services) services.AddMvc(options => { options.Filters.Add(typeof(LoggingActionFilter)); - -#pragma warning disable ASP0000 // Do not call 'IServiceCollection.BuildServiceProvider' in 'ConfigureServices' - ServiceProvider serviceProvider = services.BuildServiceProvider(); -#pragma warning restore ASP0000 // Do not call 'IServiceCollection.BuildServiceProvider' in 'ConfigureServices' - - var apiSettings = (WebHostSettings)serviceProvider.GetRequiredService(typeof(WebHostSettings)); - if (apiSettings.KeepaliveTimer != null) - { - options.Filters.Add(typeof(KeepaliveActionFilter)); - } }) // add serializers for NBitcoin objects .AddNewtonsoftJson(options => Serializer.RegisterFrontConverters(options.SerializerSettings)) @@ -168,6 +163,9 @@ public void ConfigureServices(IServiceCollection services) // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { + // This is needed to access context of the hubs. + Provider = app.ApplicationServices; + WebHostSettings webHostSettings = fullNode.Services.ServiceProvider.GetService(); app.UseStaticFiles(); @@ -188,7 +186,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) if (webHostSettings.EnableWS) { - endpoints.MapHub("/events-hub"); + endpoints.MapHub("/ws-events"); endpoints.MapHub("/ws"); } diff --git a/src/Features/Blockcore.Features.WebHost/UI/Shared/MainLayout.razor b/src/Features/Blockcore.Features.WebHost/UI/Shared/MainLayout.razor index 3427970b3..200e89693 100644 --- a/src/Features/Blockcore.Features.WebHost/UI/Shared/MainLayout.razor +++ b/src/Features/Blockcore.Features.WebHost/UI/Shared/MainLayout.razor @@ -7,7 +7,7 @@
Open API - Web Socket + Web Socket Blockcore
diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-events/index.html b/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-events/index.html deleted file mode 100644 index 40b1fe4fd..000000000 --- a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-events/index.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - Blockcore: Web Socket Events - - - - - - - Node Events | Node Commands - -

Node Events

-

Web Socket Events

-

View source to learn how to listen to events sent from the node. See below a live stream of events received.

- -
-

- Go back... -

- -
- - - - - - \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-ui/index.html b/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-ui/index.html new file mode 100644 index 000000000..447c7b6e9 --- /dev/null +++ b/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-ui/index.html @@ -0,0 +1,102 @@ + + + + + + Blockcore: Web Socket Events + + + + + + + Node Events | Node Commands + +

Node Events

+

Web Socket Events

+ + + + +

View source to learn how to listen to events sent from the node. See below a live stream of events received.

+ +
+

+ Go back... +

+ +
+ + + + + + \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-events/node.html b/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-ui/node.html similarity index 90% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-events/node.html rename to src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-ui/node.html index 0c593f802..253fb7d2a 100644 --- a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-events/node.html +++ b/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-ui/node.html @@ -42,7 +42,7 @@

Web Socket Events

var hub = connection.start(); - connection.on("Message", (result) => { + connection.on("Echo", (result) => { console.log('Received from node: ', result); var tag = document.createElement("p"); @@ -52,7 +52,7 @@

Web Socket Events

}); function echo() { - connection.invoke("Message", "Hello World!").catch(err => console.error(err)); + connection.invoke("Echo", "Hello World!").catch(err => console.error(err)); } diff --git a/src/Features/Blockcore.Features.WebHost/WebHostFeature.cs b/src/Features/Blockcore.Features.WebHost/WebHostFeature.cs index 060021cb9..920a92cec 100644 --- a/src/Features/Blockcore.Features.WebHost/WebHostFeature.cs +++ b/src/Features/Blockcore.Features.WebHost/WebHostFeature.cs @@ -3,12 +3,12 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using Blockcore.Broadcasters; using Blockcore.Builder; using Blockcore.Builder.Feature; -using Blockcore.Features.WebHost.Broadcasters; +using Blockcore.EventBus; using Blockcore.Features.WebHost.Events; using Blockcore.Features.WebHost.Hubs; -using Blockcore.Features.WebHost.Options; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -32,8 +32,6 @@ public sealed class WebHostFeature : FullNodeFeature private readonly WebHostSettings settings; - private readonly WebHostFeatureOptions featureOptions; - private readonly IEnumerable eventBroadcasters; private readonly IEventsSubscriptionService eventsSubscriptionService; @@ -47,7 +45,6 @@ public sealed class WebHostFeature : FullNodeFeature public WebHostFeature( IFullNodeBuilder fullNodeBuilder, FullNode fullNode, - WebHostFeatureOptions apiFeatureOptions, WebHostSettings apiSettings, ILoggerFactory loggerFactory, ICertificateStore certificateStore, @@ -56,7 +53,6 @@ public WebHostFeature( { this.fullNodeBuilder = fullNodeBuilder; this.fullNode = fullNode; - this.featureOptions = apiFeatureOptions; this.settings = apiSettings; this.certificateStore = certificateStore; this.eventBroadcasters = eventBroadcasters; @@ -76,30 +72,12 @@ public override Task InitializeAsync() foreach (IClientEventBroadcaster clientEventBroadcaster in this.eventBroadcasters) { // Intialise with specified settings - clientEventBroadcaster.Init(eventBroadcasterSettings[clientEventBroadcaster.GetType()]); + //clientEventBroadcaster.Init(eventBroadcasterSettings[clientEventBroadcaster.GetType()]); + clientEventBroadcaster.Init(new ClientEventBroadcasterSettings { BroadcastFrequencySeconds = 5 }); } this.webHost = Program.Initialize(this.fullNodeBuilder.Services, this.fullNode, this.settings, this.certificateStore, new WebHostBuilder()); - if (this.settings.KeepaliveTimer == null) - { - this.logger.LogTrace("(-)[KEEPALIVE_DISABLED]"); - return Task.CompletedTask; - } - - // Start the keepalive timer, if set. - // If the timer expires, the node will shut down. - this.settings.KeepaliveTimer.Elapsed += (sender, args) => - { - this.logger.LogInformation($"The application will shut down because the keepalive timer has elapsed."); - - this.settings.KeepaliveTimer.Stop(); - this.settings.KeepaliveTimer.Enabled = false; - this.fullNode.NodeLifetime.StopApplication(); - }; - - this.settings.KeepaliveTimer.Start(); - return Task.CompletedTask; } @@ -125,14 +103,6 @@ public static void BuildDefaultConfigurationFile(StringBuilder builder, Network /// public override void Dispose() { - // Make sure the timer is stopped and disposed. - if (this.settings.KeepaliveTimer != null) - { - this.settings.KeepaliveTimer.Stop(); - this.settings.KeepaliveTimer.Enabled = false; - this.settings.KeepaliveTimer.Dispose(); - } - // Make sure we are releasing the listening ip address / port. if (this.webHost != null) { @@ -143,52 +113,13 @@ public override void Dispose() } } - public sealed class WebHostFeatureOptions - { - public IClientEvent[] EventsToHandle { get; set; } - - public (Type Broadcaster, ClientEventBroadcasterSettings clientEventBroadcasterSettings)[] ClientEventBroadcasters { get; set; } - } - /// /// A class providing extension methods for . /// public static class ApiFeatureExtension { - [Obsolete("Use the new UseWebHost()")] - public static IFullNodeBuilder UseApi(this IFullNodeBuilder fullNodeBuilder, Action optionsAction = null) + public static IFullNodeBuilder UseWebHost(this IFullNodeBuilder fullNodeBuilder) { - return UseWebHost(fullNodeBuilder, optionsAction); - } - - public static IFullNodeBuilder UseWebHost(this IFullNodeBuilder fullNodeBuilder, Action optionsAction = null) - { - // TODO: move the options in to the feature builder - var options = new WebHostFeatureOptions(); - optionsAction?.Invoke(options); - - // If there is no events to handle defined in the options configured by the node, add a few default. - if (options.EventsToHandle == null) - { - options.EventsToHandle = new[] - { - (IClientEvent) new BlockConnectedClientEvent(), - new TransactionReceivedClientEvent() - }; - } - - // If there is now client event broadcasters, add the default ones. - if (options.ClientEventBroadcasters == null) - { - options.ClientEventBroadcasters = new[] - { - (Broadcaster: typeof(StakingBroadcaster), ClientEventBroadcasterSettings: new ClientEventBroadcasterSettings { BroadcastFrequencySeconds = 5 }), - (Broadcaster: typeof(WalletInfoBroadcaster), ClientEventBroadcasterSettings: new ClientEventBroadcasterSettings { BroadcastFrequencySeconds = 5 }) - }; - } - - WebHostFeature.eventBroadcasterSettings = options.ClientEventBroadcasters.ToDictionary(pair => pair.Broadcaster, pair => pair.clientEventBroadcasterSettings); - fullNodeBuilder.ConfigureFeature(features => { features @@ -196,26 +127,9 @@ public static IFullNodeBuilder UseWebHost(this IFullNodeBuilder fullNodeBuilder, .FeatureServices(services => { services.AddSingleton(fullNodeBuilder); - services.AddSingleton(options); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); - - if (null != options.ClientEventBroadcasters) - { - foreach ((Type Broadcaster, ClientEventBroadcasterSettings clientEventBroadcasterSettings) in options.ClientEventBroadcasters) - { - if (typeof(IClientEventBroadcaster).IsAssignableFrom(Broadcaster)) - { - services.AddSingleton(typeof(IClientEventBroadcaster), Broadcaster); - } - else - { - Console.WriteLine($"Warning {Broadcaster.Name} is not of type {typeof(IClientEventBroadcaster).Name}"); - } - } - } }); }); diff --git a/src/Features/Blockcore.Features.WebHost/WebHostSettings.cs b/src/Features/Blockcore.Features.WebHost/WebHostSettings.cs index 32d4446de..c4d4e628d 100644 --- a/src/Features/Blockcore.Features.WebHost/WebHostSettings.cs +++ b/src/Features/Blockcore.Features.WebHost/WebHostSettings.cs @@ -25,9 +25,6 @@ public class WebHostSettings /// Port of node's API interface. public int ApiPort { get; set; } - /// URI to node's API interface. - public Timer KeepaliveTimer { get; private set; } - /// /// If true then the node will add and start the SignalR feature. This should never be enabled if node is accessible to the public. /// @@ -96,17 +93,6 @@ public WebHostSettings(NodeSettings nodeSettings) this.ApiPort = apiUri.Port; } - // Set the keepalive interval (set in seconds). - int keepAlive = config.GetOrDefault("keepalive", 0, this.logger); - if (keepAlive > 0) - { - this.KeepaliveTimer = new Timer - { - AutoReset = false, - Interval = keepAlive * 1000 - }; - } - this.EnableWS = config.GetOrDefault("enableWS", false, this.logger); this.EnableUI = config.GetOrDefault("enableUI", true, this.logger); this.EnableAPI = config.GetOrDefault("enableAPI", true, this.logger); @@ -142,8 +128,6 @@ public static void BuildDefaultConfigurationFile(StringBuilder builder, Network builder.AppendLine($"#apiuri={ DefaultApiHost }"); builder.AppendLine($"#Port of node's API interface. Defaults to { network.DefaultAPIPort }."); builder.AppendLine($"#apiport={ network.DefaultAPIPort }"); - builder.AppendLine($"#Keep Alive interval (set in seconds). Default: 0 (no keep alive)."); - builder.AppendLine($"#keepalive=0"); builder.AppendLine($"#Use HTTPS protocol on the API. Default is false."); builder.AppendLine($"#usehttps=false"); builder.AppendLine($"#Enable the Web Socket endpoints. Defaults to false."); diff --git a/src/Networks/City/City/Networks/CityMain.cs b/src/Networks/City/City/Networks/CityMain.cs index 7844ebccc..a4707e2e9 100644 --- a/src/Networks/City/City/Networks/CityMain.cs +++ b/src/Networks/City/City/Networks/CityMain.cs @@ -46,7 +46,6 @@ public CityMain() DefaultPort = network.DefaultPort; DefaultRPCPort = network.DefaultRPCPort; DefaultAPIPort = network.DefaultAPIPort; - DefaultSignalRPort = network.DefaultSignalRPort; DefaultMaxOutboundConnections = 16; DefaultMaxInboundConnections = 109; diff --git a/src/Networks/City/City/Networks/CityRegTest.cs b/src/Networks/City/City/Networks/CityRegTest.cs index 22470146a..b8393c71a 100644 --- a/src/Networks/City/City/Networks/CityRegTest.cs +++ b/src/Networks/City/City/Networks/CityRegTest.cs @@ -37,7 +37,6 @@ public CityRegTest() DefaultPort = network.DefaultPort; DefaultRPCPort = network.DefaultRPCPort; DefaultAPIPort = network.DefaultAPIPort; - DefaultSignalRPort = network.DefaultSignalRPort; var consensusFactory = new PosConsensusFactory(); diff --git a/src/Networks/City/City/Networks/CityTest.cs b/src/Networks/City/City/Networks/CityTest.cs index 0894a48cb..bd72962aa 100644 --- a/src/Networks/City/City/Networks/CityTest.cs +++ b/src/Networks/City/City/Networks/CityTest.cs @@ -37,7 +37,6 @@ public CityTest() DefaultPort = network.DefaultPort; DefaultRPCPort = network.DefaultRPCPort; DefaultAPIPort = network.DefaultAPIPort; - DefaultSignalRPort = network.DefaultSignalRPort; var consensusFactory = new PosConsensusFactory(); diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisMain.cs b/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisMain.cs index 82fb72648..19acc9203 100644 --- a/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisMain.cs +++ b/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisMain.cs @@ -49,7 +49,6 @@ public StratisMain() this.DefaultMaxInboundConnections = 109; this.DefaultRPCPort = 16174; this.DefaultAPIPort = 37221; - this.DefaultSignalRPort = 38824; this.MaxTipAge = 2 * 60 * 60; this.MinTxFee = 10000; this.FallbackFee = 10000; diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisTest.cs b/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisTest.cs index aa33e8d27..90fe2f562 100644 --- a/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisTest.cs +++ b/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisTest.cs @@ -32,7 +32,6 @@ public StratisTest() this.DefaultMaxInboundConnections = 109; this.DefaultRPCPort = 26174; this.DefaultAPIPort = 38221; - this.DefaultSignalRPort = 39824; this.CoinTicker = "TSTRAT"; this.DefaultBanTimeSeconds = 16000; // 500 (MaxReorg) * 64 (TargetSpacing) / 2 = 4 hours, 26 minutes and 40 seconds diff --git a/src/Networks/Stratis/Stratisd/Properties/launchSettings.json b/src/Networks/Stratis/Stratisd/Properties/launchSettings.json index f12be1ce9..c6b1d05bf 100644 --- a/src/Networks/Stratis/Stratisd/Properties/launchSettings.json +++ b/src/Networks/Stratis/Stratisd/Properties/launchSettings.json @@ -15,10 +15,6 @@ "commandName": "Project", "commandLineArgs": "-testnet -server -rpcpassword=rpcpassword -rpcuser=rpcuser" }, - "Stratis.StratisD Test Keepalive 60s": { - "commandName": "Project", - "commandLineArgs": "-testnet -keepalive=60" - }, "Stratis.StratisD Test No assumevalid": { "commandName": "Project", "commandLineArgs": "-testnet -assumevalid=0 -checkpoints=false" diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/XdsMain.cs b/src/Networks/Xds/Blockcore.Networks.Xds/XdsMain.cs index 642c31b63..b6a9d55d5 100644 --- a/src/Networks/Xds/Blockcore.Networks.Xds/XdsMain.cs +++ b/src/Networks/Xds/Blockcore.Networks.Xds/XdsMain.cs @@ -38,7 +38,6 @@ public XdsMain() this.DefaultPort = 38333; this.DefaultRPCPort = 48333; this.DefaultAPIPort = 48334; - this.DefaultSignalRPort = 48335; this.DefaultMaxOutboundConnections = 16; this.DefaultMaxInboundConnections = 109; this.MaxTimeOffsetSeconds = 25 * 60; diff --git a/src/Networks/x42/x42/Networks/x42Main.cs b/src/Networks/x42/x42/Networks/x42Main.cs index 843500f31..38c26bca1 100644 --- a/src/Networks/x42/x42/Networks/x42Main.cs +++ b/src/Networks/x42/x42/Networks/x42Main.cs @@ -45,7 +45,6 @@ public x42Main() this.DefaultPort = network.DefaultPort; this.DefaultRPCPort = network.DefaultRPCPort; this.DefaultAPIPort = network.DefaultAPIPort; - this.DefaultSignalRPort = network.DefaultSignalRPort; this.DefaultMaxOutboundConnections = 16; this.DefaultMaxInboundConnections = 109; diff --git a/src/Networks/x42/x42/Networks/x42RegTest.cs b/src/Networks/x42/x42/Networks/x42RegTest.cs index d0ccda4f7..074a72dfe 100644 --- a/src/Networks/x42/x42/Networks/x42RegTest.cs +++ b/src/Networks/x42/x42/Networks/x42RegTest.cs @@ -37,7 +37,6 @@ public x42RegTest() DefaultPort = network.DefaultPort; DefaultRPCPort = network.DefaultRPCPort; DefaultAPIPort = network.DefaultAPIPort; - DefaultSignalRPort = network.DefaultSignalRPort; var consensusFactory = new PosConsensusFactory(); diff --git a/src/Networks/x42/x42/Networks/x42Test.cs b/src/Networks/x42/x42/Networks/x42Test.cs index 44c4a3d7c..8c571f5fc 100644 --- a/src/Networks/x42/x42/Networks/x42Test.cs +++ b/src/Networks/x42/x42/Networks/x42Test.cs @@ -44,7 +44,6 @@ public x42Test() this.DefaultPort = network.DefaultPort; this.DefaultRPCPort = network.DefaultRPCPort; this.DefaultAPIPort = network.DefaultAPIPort; - this.DefaultSignalRPort = network.DefaultSignalRPort; this.DefaultBanTimeSeconds = 288; // 9 (MaxReorg) * 64 (TargetSpacing) / 2 = 4 hours, 26 minutes and 40 seconds var consensusFactory = new PosConsensusFactory(); diff --git a/src/Node/Blockcore.Node/NodeBuilder.cs b/src/Node/Blockcore.Node/NodeBuilder.cs index fb4b84b34..efa3899f5 100644 --- a/src/Node/Blockcore.Node/NodeBuilder.cs +++ b/src/Node/Blockcore.Node/NodeBuilder.cs @@ -1,6 +1,5 @@ using Blockcore.Builder; using Blockcore.Configuration; -using Blockcore.Features.WebHost; using Blockcore.Features.BlockStore; using Blockcore.Features.ColdStaking; using Blockcore.Features.Consensus; @@ -9,6 +8,7 @@ using Blockcore.Features.Miner; using Blockcore.Features.RPC; using Blockcore.Features.Wallet; +using Blockcore.Features.WebHost; namespace Blockcore.Node { From 5e848891d153b586e156eca18062270b7d4f96cb Mon Sep 17 00:00:00 2001 From: Mithril Man Date: Wed, 13 May 2020 21:03:15 +0200 Subject: [PATCH 03/14] created a class to handle swagger api documentation xml file inclusion. --- .../Blockcore.Features.WebHost/Startup.cs | 25 +--------- .../SwaggerApiDocumentationScaffolder.cs | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+), 24 deletions(-) create mode 100644 src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs diff --git a/src/Features/Blockcore.Features.WebHost/Startup.cs b/src/Features/Blockcore.Features.WebHost/Startup.cs index 96b9d34aa..81e26c915 100644 --- a/src/Features/Blockcore.Features.WebHost/Startup.cs +++ b/src/Features/Blockcore.Features.WebHost/Startup.cs @@ -124,30 +124,7 @@ public void ConfigureServices(IServiceCollection services) } }); - string[] ApiXmlDocuments = new string[] - { - "Blockcore.xml", - "Blockcore.NBitcoin.xml", - "Blockcore.Features.WebHost.xml", - "Blockcore.Features.Wallet.xml", - "Blockcore.Features.RPC.xml", - "Blockcore.Features.Miner.xml", - "Blockcore.Features.MemoryPool.xml", - "Blockcore.Features.Consensus.xml", - "Blockcore.Features.BlockStore.xml", - "Blockcore.Features.ColdStaking.xml" - }; - - // Include XML documentation files. - string basePath = AppContext.BaseDirectory; - - foreach (string xmlPath in ApiXmlDocuments.Select(xmlDocument => Path.Combine(basePath, xmlDocument))) - { - if (File.Exists(xmlPath)) - { - options.IncludeXmlComments(xmlPath); - } - } + SwaggerApiDocumentationScaffolder.Scaffold(options); #pragma warning disable CS0618 // Type or member is obsolete options.DescribeAllEnumsAsStrings(); diff --git a/src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs b/src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs new file mode 100644 index 000000000..d257356ed --- /dev/null +++ b/src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; +using Swashbuckle.AspNetCore.SwaggerGen; + +namespace Blockcore.Features.WebHost { + + /// + /// Utility class that adds XML documentation references to the API + /// + public static class SwaggerApiDocumentationScaffolder { + /// + /// Scaffolds the folder to obtain documentation related to Controllers. + /// + /// The options. + public static void Scaffold(SwaggerGenOptions options) { + IEnumerable files = AppDomain.CurrentDomain.GetAssemblies() + .Where(asm => GetLoadableTypes(asm).Any(type => typeof(Controller).IsAssignableFrom(type))) + .Select(asm => Path.ChangeExtension(asm.Location, "xml")); + + RegisterFiles(options, files); + } + + /// + /// Gets the loadable types, ignoring assembly that can't be loaded for any reason. + /// + private static IEnumerable GetLoadableTypes(this Assembly assembly) { + try { + return assembly.GetTypes(); + } + catch (ReflectionTypeLoadException e) { + return e.Types.Where(t => t != null); + } + } + + private static void RegisterFiles(SwaggerGenOptions options, IEnumerable files) { + foreach (string file in files) { + if (File.Exists(file)) { + options.IncludeXmlComments(file); + } + } + } + } +} From c15f86cc71f084500c8eeac8b901c701fb79bdf9 Mon Sep 17 00:00:00 2001 From: SondreB Date: Wed, 13 May 2020 23:11:33 +0200 Subject: [PATCH 04/14] Fix issue with exceptions during type loading - Move the Assembly extension from Swagger scaffolding to Utilities. - Minor bug discovered in dispose when object is null (happened during an integration test). --- src/Blockcore/Base/BaseFeature.cs | 7 +++-- .../Extensions/AssemblyExtensions.cs | 26 +++++++++++++++++++ .../Events/EventSubscriptionService.cs | 4 +-- .../SwaggerApiDocumentationScaffolder.cs | 15 ++--------- 4 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 src/Blockcore/Utilities/Extensions/AssemblyExtensions.cs diff --git a/src/Blockcore/Base/BaseFeature.cs b/src/Blockcore/Base/BaseFeature.cs index 990dfe2ef..6fe917550 100644 --- a/src/Blockcore/Base/BaseFeature.cs +++ b/src/Blockcore/Base/BaseFeature.cs @@ -311,8 +311,11 @@ private void StartAddressManager(NetworkPeerConnectionParameters connectionParam /// public override void Dispose() { - this.logger.LogInformation("Flushing peers."); - this.flushAddressManagerLoop.Dispose(); + if (this.flushAddressManagerLoop != null) + { + this.logger.LogInformation("Flushing peers."); + this.flushAddressManagerLoop.Dispose(); + } this.logger.LogInformation("Disposing peer address manager."); this.peerAddressManager.Dispose(); diff --git a/src/Blockcore/Utilities/Extensions/AssemblyExtensions.cs b/src/Blockcore/Utilities/Extensions/AssemblyExtensions.cs new file mode 100644 index 000000000..5aefc5b86 --- /dev/null +++ b/src/Blockcore/Utilities/Extensions/AssemblyExtensions.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Blockcore.Utilities.Extensions +{ + public static class AssemblyExtensions + { + /// + /// Gets the loadable types, ignoring assembly that can't be loaded for any reason. + /// + public static IEnumerable GetLoadableTypes(this Assembly assembly) + { + try + { + return assembly.GetTypes(); + } + catch (ReflectionTypeLoadException e) + { + return e.Types.Where(t => t != null); + } + } + } +} diff --git a/src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs b/src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs index bd3de5093..f80064dbf 100644 --- a/src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs +++ b/src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs @@ -12,6 +12,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NBitcoin; +using Blockcore.Utilities.Extensions; namespace Blockcore.Features.WebHost.Events { @@ -49,8 +50,7 @@ public void Init() // Get all events that is loaded on the node. IEnumerable types = AppDomain.CurrentDomain.GetAssemblies() - .SelectMany(s => s.GetTypes()) - .Where(p => baseType.IsAssignableFrom(p)); + .SelectMany(asm => asm.GetLoadableTypes().Where(t => baseType.IsAssignableFrom(t))); // Make sure all the events are available to be subscribed to. foreach (Type type in types) diff --git a/src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs b/src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs index d257356ed..7605e776c 100644 --- a/src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs +++ b/src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using Swashbuckle.AspNetCore.SwaggerGen; +using Blockcore.Utilities.Extensions; namespace Blockcore.Features.WebHost { @@ -19,24 +20,12 @@ public static class SwaggerApiDocumentationScaffolder { /// The options. public static void Scaffold(SwaggerGenOptions options) { IEnumerable files = AppDomain.CurrentDomain.GetAssemblies() - .Where(asm => GetLoadableTypes(asm).Any(type => typeof(Controller).IsAssignableFrom(type))) + .Where(asm => asm.GetLoadableTypes().Any(type => typeof(Controller).IsAssignableFrom(type))) .Select(asm => Path.ChangeExtension(asm.Location, "xml")); RegisterFiles(options, files); } - /// - /// Gets the loadable types, ignoring assembly that can't be loaded for any reason. - /// - private static IEnumerable GetLoadableTypes(this Assembly assembly) { - try { - return assembly.GetTypes(); - } - catch (ReflectionTypeLoadException e) { - return e.Types.Where(t => t != null); - } - } - private static void RegisterFiles(SwaggerGenOptions options, IEnumerable files) { foreach (string file in files) { if (File.Exists(file)) { From ebd6cb96b4b23878e461f1048e64199ce0548168 Mon Sep 17 00:00:00 2001 From: SondreB Date: Wed, 13 May 2020 23:43:54 +0200 Subject: [PATCH 05/14] Rename WebHost to NodeHost - Next commit will rename the physical folder. --- src/Blockcore.sln | 2 +- .../Blockcore.Features.NodeHost.csproj | 47 +++++++++++++++++ .../Blockcore.Features.WebHost.csproj | 50 ++----------------- .../CertificateStore.cs | 2 +- .../Events/EventSubscriptionService.cs | 4 +- .../Hubs/EventsHub.cs | 4 +- .../Hubs/NodeHub.cs | 2 +- .../ICertificateStore.cs | 2 +- .../LoggingActionFilter.cs | 2 +- .../MvcBuilderExtensions.cs | 2 +- .../NoCacheMiddleware.cs | 2 +- .../Blockcore.Features.WebHost/Program.cs | 4 +- .../Blockcore.Features.WebHost/Startup.cs | 8 +-- .../SwaggerApiDocumentationScaffolder.cs | 22 ++++---- .../UI/Pages/_Host.cshtml | 2 +- .../UI/_Imports.razor | 2 +- .../WebHostFeature.cs | 34 ++++++------- .../WebHostSettings.cs | 12 ++--- .../Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj | 2 +- src/Networks/Bitcoin/Bitcoin.Cli/Program.cs | 4 +- src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj | 2 +- src/Networks/Bitcoin/Bitcoind/Program.cs | 4 +- src/Networks/City/City.Node/City.Node.csproj | 2 +- src/Networks/City/City.Node/Program.cs | 4 +- src/Networks/Stratis/StratisDns/Program.cs | 6 +-- .../Stratis/StratisDns/StratisDnsD.csproj | 2 +- src/Networks/Stratis/Stratisd/Program.cs | 4 +- src/Networks/Stratis/Stratisd/StratisD.csproj | 2 +- src/Networks/Xds/Xdsd/Program.cs | 4 +- src/Networks/Xds/Xdsd/XdsD.csproj | 2 +- src/Networks/x42/x42.Node/Program.cs | 4 +- src/Networks/x42/x42.Node/x42.Node.csproj | 2 +- src/Node/Blockcore.Node/Blockcore.Node.csproj | 2 +- src/Node/Blockcore.Node/NodeBuilder.cs | 4 +- .../ApiSettingsTest.cs | 38 +++++++------- .../Blockcore.Features.WebHost.Tests.csproj | 2 +- .../ProgramTests.cs | 6 +-- .../Blockcore.IntegrationTests.Common.csproj | 2 +- .../EnvironmentMockUpHelpers/NodeBuilder.cs | 4 +- .../Runners/StratisBitcoinPosRunner.cs | 4 +- .../Runners/StratisBitcoinPowRunner.cs | 4 +- .../API/ApiSteps.cs | 8 +-- .../API/MultiCallTest.cs | 4 +- .../Blockcore.IntegrationTests.csproj | 2 +- .../CustomNodeBuilderTests.cs | 6 +-- .../ProvenHeaderTests.cs | 4 +- .../Wallet/ColdWalletTests.cs | 4 +- .../Blockcore.Tests/Blockcore.Tests.csproj | 2 +- .../NodeConfiguration/NodeSettingsTest.cs | 6 +-- 49 files changed, 178 insertions(+), 171 deletions(-) create mode 100644 src/Features/Blockcore.Features.WebHost/Blockcore.Features.NodeHost.csproj diff --git a/src/Blockcore.sln b/src/Blockcore.sln index dd03e63c7..991afd59c 100644 --- a/src/Blockcore.sln +++ b/src/Blockcore.sln @@ -39,7 +39,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{EAE139C2 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Features", "Features", "{15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.WebHost", "Features\Blockcore.Features.WebHost\Blockcore.Features.WebHost.csproj", "{FB78D861-F3DF-412D-8A3D-D1756ADA39D4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.NodeHost", "Features\Blockcore.Features.WebHost\Blockcore.Features.NodeHost.csproj", "{FB78D861-F3DF-412D-8A3D-D1756ADA39D4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBitcoin", "External\NBitcoin\NBitcoin.csproj", "{2051FCAC-D4C7-498D-B935-2E9E6DEA0C29}" EndProject diff --git a/src/Features/Blockcore.Features.WebHost/Blockcore.Features.NodeHost.csproj b/src/Features/Blockcore.Features.WebHost/Blockcore.Features.NodeHost.csproj new file mode 100644 index 000000000..1fffa3a54 --- /dev/null +++ b/src/Features/Blockcore.Features.WebHost/Blockcore.Features.NodeHost.csproj @@ -0,0 +1,47 @@ + + + + true + Blockcore.Features.NodeHost + Library + Blockcore.Features.NodeHost + False + + library + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj b/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj index 9cbe85552..88a550947 100644 --- a/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj +++ b/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj @@ -1,48 +1,4 @@ - - - - true - Blockcore.Features.WebHost - Library - Blockcore.Features.WebHost - False - - library - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/CertificateStore.cs b/src/Features/Blockcore.Features.WebHost/CertificateStore.cs index 5247ad5df..c6203771f 100644 --- a/src/Features/Blockcore.Features.WebHost/CertificateStore.cs +++ b/src/Features/Blockcore.Features.WebHost/CertificateStore.cs @@ -3,7 +3,7 @@ using System.Security.Cryptography.X509Certificates; using Microsoft.Extensions.Logging; -namespace Blockcore.Features.WebHost +namespace Blockcore.Features.NodeHost { public class CertificateStore : ICertificateStore { diff --git a/src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs b/src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs index f80064dbf..4e3e37751 100644 --- a/src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs +++ b/src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs @@ -6,7 +6,7 @@ using System.Reflection; using Blockcore.Broadcasters; using Blockcore.EventBus; -using Blockcore.Features.WebHost.Hubs; +using Blockcore.Features.NodeHost.Hubs; using Blockcore.Signals; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.DependencyInjection; @@ -14,7 +14,7 @@ using NBitcoin; using Blockcore.Utilities.Extensions; -namespace Blockcore.Features.WebHost.Events +namespace Blockcore.Features.NodeHost.Events { /// /// This class subscribes to Stratis.Bitcoin.EventBus messages and proxy's them diff --git a/src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs b/src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs index 4c8a702bc..de367ef17 100644 --- a/src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs +++ b/src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs @@ -2,12 +2,12 @@ using System.Threading.Tasks; using Blockcore.Broadcasters; using Blockcore.EventBus; -using Blockcore.Features.WebHost.Events; +using Blockcore.Features.NodeHost.Events; using Blockcore.Utilities; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; -namespace Blockcore.Features.WebHost.Hubs +namespace Blockcore.Features.NodeHost.Hubs { public class EventsHub : Hub { diff --git a/src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs b/src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs index 536fb3094..544fdbb06 100644 --- a/src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs +++ b/src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; -namespace Blockcore.Features.WebHost.Hubs +namespace Blockcore.Features.NodeHost.Hubs { /// /// Node Hub can be used to perform many tasks on the node, including the majority of features available in the REST API. diff --git a/src/Features/Blockcore.Features.WebHost/ICertificateStore.cs b/src/Features/Blockcore.Features.WebHost/ICertificateStore.cs index a44142f6e..702429cc5 100644 --- a/src/Features/Blockcore.Features.WebHost/ICertificateStore.cs +++ b/src/Features/Blockcore.Features.WebHost/ICertificateStore.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography.X509Certificates; -namespace Blockcore.Features.WebHost +namespace Blockcore.Features.NodeHost { /// /// An interface providing operations on certificate repositories. diff --git a/src/Features/Blockcore.Features.WebHost/LoggingActionFilter.cs b/src/Features/Blockcore.Features.WebHost/LoggingActionFilter.cs index 98a620ea2..b926377e4 100644 --- a/src/Features/Blockcore.Features.WebHost/LoggingActionFilter.cs +++ b/src/Features/Blockcore.Features.WebHost/LoggingActionFilter.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Logging; -namespace Blockcore.Features.WebHost +namespace Blockcore.Features.NodeHost { /// /// An asynchronous action filter whose role is to log details from the Http requests to the API. diff --git a/src/Features/Blockcore.Features.WebHost/MvcBuilderExtensions.cs b/src/Features/Blockcore.Features.WebHost/MvcBuilderExtensions.cs index c4d464cee..7e7809b0f 100644 --- a/src/Features/Blockcore.Features.WebHost/MvcBuilderExtensions.cs +++ b/src/Features/Blockcore.Features.WebHost/MvcBuilderExtensions.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; -namespace Blockcore.Features.WebHost +namespace Blockcore.Features.NodeHost { public static class MvcBuilderExtensions { diff --git a/src/Features/Blockcore.Features.WebHost/NoCacheMiddleware.cs b/src/Features/Blockcore.Features.WebHost/NoCacheMiddleware.cs index 8a26a9378..25525a557 100644 --- a/src/Features/Blockcore.Features.WebHost/NoCacheMiddleware.cs +++ b/src/Features/Blockcore.Features.WebHost/NoCacheMiddleware.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -namespace Blockcore.Features.WebHost +namespace Blockcore.Features.NodeHost { /// /// Middleware to set the response Cache-Control to no-cache. diff --git a/src/Features/Blockcore.Features.WebHost/Program.cs b/src/Features/Blockcore.Features.WebHost/Program.cs index e289d441a..d42bf7b97 100644 --- a/src/Features/Blockcore.Features.WebHost/Program.cs +++ b/src/Features/Blockcore.Features.WebHost/Program.cs @@ -12,12 +12,12 @@ using Microsoft.Extensions.Options; using Microsoft.Extensions.FileProviders; -namespace Blockcore.Features.WebHost +namespace Blockcore.Features.NodeHost { public class Program { public static IWebHost Initialize(IEnumerable services, FullNode fullNode, - WebHostSettings apiSettings, ICertificateStore store, IWebHostBuilder webHostBuilder) + NodeHostSettings apiSettings, ICertificateStore store, IWebHostBuilder webHostBuilder) { Guard.NotNull(fullNode, nameof(fullNode)); Guard.NotNull(webHostBuilder, nameof(webHostBuilder)); diff --git a/src/Features/Blockcore.Features.WebHost/Startup.cs b/src/Features/Blockcore.Features.WebHost/Startup.cs index 81e26c915..a45fa03de 100644 --- a/src/Features/Blockcore.Features.WebHost/Startup.cs +++ b/src/Features/Blockcore.Features.WebHost/Startup.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Linq; -using Blockcore.Features.WebHost.Hubs; +using Blockcore.Features.NodeHost.Hubs; using Blockcore.Utilities.JsonConverters; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -13,7 +13,7 @@ using Newtonsoft.Json; using Swashbuckle.AspNetCore.SwaggerUI; -namespace Blockcore.Features.WebHost +namespace Blockcore.Features.NodeHost { public class Startup { @@ -42,7 +42,7 @@ public Startup(IWebHostEnvironment env, IFullNode fullNode) // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - WebHostSettings webHostSettings = fullNode.Services.ServiceProvider.GetService(); + NodeHostSettings webHostSettings = fullNode.Services.ServiceProvider.GetService(); services.AddLogging(loggingBuilder => { @@ -143,7 +143,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) // This is needed to access context of the hubs. Provider = app.ApplicationServices; - WebHostSettings webHostSettings = fullNode.Services.ServiceProvider.GetService(); + NodeHostSettings webHostSettings = fullNode.Services.ServiceProvider.GetService(); app.UseStaticFiles(); diff --git a/src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs b/src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs index 7605e776c..534f6db05 100644 --- a/src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs +++ b/src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs @@ -2,23 +2,24 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Reflection; +using Blockcore.Utilities.Extensions; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using Swashbuckle.AspNetCore.SwaggerGen; -using Blockcore.Utilities.Extensions; - -namespace Blockcore.Features.WebHost { +namespace Blockcore.Features.NodeHost +{ /// /// Utility class that adds XML documentation references to the API /// - public static class SwaggerApiDocumentationScaffolder { + public static class SwaggerApiDocumentationScaffolder + { /// /// Scaffolds the folder to obtain documentation related to Controllers. /// /// The options. - public static void Scaffold(SwaggerGenOptions options) { + public static void Scaffold(SwaggerGenOptions options) + { IEnumerable files = AppDomain.CurrentDomain.GetAssemblies() .Where(asm => asm.GetLoadableTypes().Any(type => typeof(Controller).IsAssignableFrom(type))) .Select(asm => Path.ChangeExtension(asm.Location, "xml")); @@ -26,9 +27,12 @@ public static void Scaffold(SwaggerGenOptions options) { RegisterFiles(options, files); } - private static void RegisterFiles(SwaggerGenOptions options, IEnumerable files) { - foreach (string file in files) { - if (File.Exists(file)) { + private static void RegisterFiles(SwaggerGenOptions options, IEnumerable files) + { + foreach (string file in files) + { + if (File.Exists(file)) + { options.IncludeXmlComments(file); } } diff --git a/src/Features/Blockcore.Features.WebHost/UI/Pages/_Host.cshtml b/src/Features/Blockcore.Features.WebHost/UI/Pages/_Host.cshtml index 3198b413c..4cf67e21e 100644 --- a/src/Features/Blockcore.Features.WebHost/UI/Pages/_Host.cshtml +++ b/src/Features/Blockcore.Features.WebHost/UI/Pages/_Host.cshtml @@ -1,5 +1,5 @@ @page "/" -@namespace Blockcore.Features.WebHost.UI.Pages +@namespace Blockcore.Features.NodeHost.UI.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @{ Layout = null; diff --git a/src/Features/Blockcore.Features.WebHost/UI/_Imports.razor b/src/Features/Blockcore.Features.WebHost/UI/_Imports.razor index a43955130..29e85b0da 100644 --- a/src/Features/Blockcore.Features.WebHost/UI/_Imports.razor +++ b/src/Features/Blockcore.Features.WebHost/UI/_Imports.razor @@ -5,4 +5,4 @@ @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web @using Microsoft.JSInterop -@using Blockcore.Features.WebHost.UI.Shared \ No newline at end of file +@using Blockcore.Features.NodeHost.UI.Shared \ No newline at end of file diff --git a/src/Features/Blockcore.Features.WebHost/WebHostFeature.cs b/src/Features/Blockcore.Features.WebHost/WebHostFeature.cs index 920a92cec..2d81cca76 100644 --- a/src/Features/Blockcore.Features.WebHost/WebHostFeature.cs +++ b/src/Features/Blockcore.Features.WebHost/WebHostFeature.cs @@ -7,30 +7,30 @@ using Blockcore.Builder; using Blockcore.Builder.Feature; using Blockcore.EventBus; -using Blockcore.Features.WebHost.Events; -using Blockcore.Features.WebHost.Hubs; +using Blockcore.Features.NodeHost.Events; +using Blockcore.Features.NodeHost.Hubs; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NBitcoin; -namespace Blockcore.Features.WebHost +namespace Blockcore.Features.NodeHost { /// /// Provides an Api to the full node /// - public sealed class WebHostFeature : FullNodeFeature + public sealed class NodeHostFeature : FullNodeFeature { internal static Dictionary eventBroadcasterSettings; - /// How long we are willing to wait for the WebHost to stop. - private const int WebHostStopTimeoutSeconds = 10; + /// How long we are willing to wait for the NodeHost to stop. + private const int NodeHostStopTimeoutSeconds = 10; private readonly IFullNodeBuilder fullNodeBuilder; private readonly FullNode fullNode; - private readonly WebHostSettings settings; + private readonly NodeHostSettings settings; private readonly IEnumerable eventBroadcasters; @@ -42,10 +42,10 @@ public sealed class WebHostFeature : FullNodeFeature private readonly ICertificateStore certificateStore; - public WebHostFeature( + public NodeHostFeature( IFullNodeBuilder fullNodeBuilder, FullNode fullNode, - WebHostSettings apiSettings, + NodeHostSettings apiSettings, ILoggerFactory loggerFactory, ICertificateStore certificateStore, IEnumerable eventBroadcasters, @@ -64,7 +64,7 @@ public WebHostFeature( public override Task InitializeAsync() { - string log = $"WebHost listening on: {Environment.NewLine}{this.settings.ApiUri}{Environment.NewLine} - UI: {this.settings.EnableUI}{Environment.NewLine} - API: {this.settings.EnableAPI}{Environment.NewLine} - WS: {this.settings.EnableWS}"; + string log = $"NodeHost listening on: {Environment.NewLine}{this.settings.ApiUri}{Environment.NewLine} - UI: {this.settings.EnableUI}{Environment.NewLine} - API: {this.settings.EnableAPI}{Environment.NewLine} - WS: {this.settings.EnableWS}"; this.logger.LogInformation(log); this.eventsSubscriptionService.Init(); @@ -87,7 +87,7 @@ public override Task InitializeAsync() /// The network to extract values from. public static void PrintHelp(Network network) { - WebHostSettings.PrintHelp(network); + NodeHostSettings.PrintHelp(network); } /// @@ -97,7 +97,7 @@ public static void PrintHelp(Network network) /// The network to base the defaults off. public static void BuildDefaultConfigurationFile(StringBuilder builder, Network network) { - WebHostSettings.BuildDefaultConfigurationFile(builder, network); + NodeHostSettings.BuildDefaultConfigurationFile(builder, network); } /// @@ -107,7 +107,7 @@ public override void Dispose() if (this.webHost != null) { this.logger.LogInformation("API stopping on URL '{0}'.", this.settings.ApiUri); - this.webHost.StopAsync(TimeSpan.FromSeconds(WebHostStopTimeoutSeconds)).Wait(); + this.webHost.StopAsync(TimeSpan.FromSeconds(NodeHostStopTimeoutSeconds)).Wait(); this.webHost = null; } } @@ -116,18 +116,18 @@ public override void Dispose() /// /// A class providing extension methods for . /// - public static class ApiFeatureExtension + public static class NodeHostFeatureExtension { - public static IFullNodeBuilder UseWebHost(this IFullNodeBuilder fullNodeBuilder) + public static IFullNodeBuilder UseNodeHost(this IFullNodeBuilder fullNodeBuilder) { fullNodeBuilder.ConfigureFeature(features => { features - .AddFeature() + .AddFeature() .FeatureServices(services => { services.AddSingleton(fullNodeBuilder); - services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); }); diff --git a/src/Features/Blockcore.Features.WebHost/WebHostSettings.cs b/src/Features/Blockcore.Features.WebHost/WebHostSettings.cs index c4d4e628d..0fa4ee714 100644 --- a/src/Features/Blockcore.Features.WebHost/WebHostSettings.cs +++ b/src/Features/Blockcore.Features.WebHost/WebHostSettings.cs @@ -6,12 +6,12 @@ using Microsoft.Extensions.Logging; using NBitcoin; -namespace Blockcore.Features.WebHost +namespace Blockcore.Features.NodeHost { /// /// Configuration related to the API interface. /// - public class WebHostSettings + public class NodeHostSettings { /// The default port used by the API when the node runs on the network. public const string DefaultApiHost = "http://localhost"; @@ -31,12 +31,12 @@ public class WebHostSettings public bool EnableWS { get; private set; } /// - /// If true the node will host a UI available in the WebHost. This should never be enabled if node is accessible to the public. + /// If true the node will host a UI available in the NodeHost. This should never be enabled if node is accessible to the public. /// public bool EnableUI { get; private set; } /// - /// If true the node will host a REST API in the WebHost. This should never be enabled if node is accessible to the public. + /// If true the node will host a REST API in the NodeHost. This should never be enabled if node is accessible to the public. /// public bool EnableAPI { get; private set; } @@ -56,11 +56,11 @@ public class WebHostSettings /// Initializes an instance of the object from the node configuration. /// /// The node configuration. - public WebHostSettings(NodeSettings nodeSettings) + public NodeHostSettings(NodeSettings nodeSettings) { Guard.NotNull(nodeSettings, nameof(nodeSettings)); - this.logger = nodeSettings.LoggerFactory.CreateLogger(typeof(WebHostSettings).FullName); + this.logger = nodeSettings.LoggerFactory.CreateLogger(typeof(NodeHostSettings).FullName); TextFileConfiguration config = nodeSettings.ConfigReader; diff --git a/src/Networks/Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj b/src/Networks/Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj index 400fb0854..f0b5a0223 100644 --- a/src/Networks/Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj +++ b/src/Networks/Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Networks/Bitcoin/Bitcoin.Cli/Program.cs b/src/Networks/Bitcoin/Bitcoin.Cli/Program.cs index 44f3b4538..e4c5b3896 100644 --- a/src/Networks/Bitcoin/Bitcoin.Cli/Program.cs +++ b/src/Networks/Bitcoin/Bitcoin.Cli/Program.cs @@ -5,7 +5,7 @@ using System.Net.Http; using System.Text; using Blockcore.Configuration; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.RPC; using Blockcore.Utilities.Extensions; using Flurl; @@ -175,7 +175,7 @@ public static void Main(string[] args) MinProtocolVersion = ProtocolVersion.ALT_PROTOCOL_VERSION }; - var apiSettings = new WebHostSettings(nodeSettings); + var apiSettings = new NodeHostSettings(nodeSettings); string url = $"http://localhost:{apiSettings.ApiPort}/api".AppendPathSegment(command); diff --git a/src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj b/src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj index 6eef48b58..fc94a9bde 100644 --- a/src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj +++ b/src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Networks/Bitcoin/Bitcoind/Program.cs b/src/Networks/Bitcoin/Bitcoind/Program.cs index 997a20db2..60e1a3ff0 100644 --- a/src/Networks/Bitcoin/Bitcoind/Program.cs +++ b/src/Networks/Bitcoin/Bitcoind/Program.cs @@ -3,7 +3,7 @@ using Blockcore; using Blockcore.Builder; using Blockcore.Configuration; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.BlockStore; using Blockcore.Features.Consensus; using Blockcore.Features.MemoryPool; @@ -35,7 +35,7 @@ public static async Task Main(string[] args) .AddMining() .AddRPC() .UseWallet() - .UseWebHost() + .UseNodeHost() .Build(); if (node != null) diff --git a/src/Networks/City/City.Node/City.Node.csproj b/src/Networks/City/City.Node/City.Node.csproj index 723ba3d05..9c4e5d9a7 100644 --- a/src/Networks/City/City.Node/City.Node.csproj +++ b/src/Networks/City/City.Node/City.Node.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Networks/City/City.Node/Program.cs b/src/Networks/City/City.Node/Program.cs index 566d1778b..62e6615fb 100644 --- a/src/Networks/City/City.Node/Program.cs +++ b/src/Networks/City/City.Node/Program.cs @@ -3,7 +3,7 @@ using Blockcore; using Blockcore.Builder; using Blockcore.Configuration; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.BlockStore; using Blockcore.Features.ColdStaking; using Blockcore.Features.Consensus; @@ -36,7 +36,7 @@ public static async Task Main(string[] args) .UseMempool() .UseColdStakingWallet() .AddPowPosMining() - .UseWebHost() + .UseNodeHost() .AddRPC() .UseDiagnosticFeature(); diff --git a/src/Networks/Stratis/StratisDns/Program.cs b/src/Networks/Stratis/StratisDns/Program.cs index 08daaea80..cc733f0da 100644 --- a/src/Networks/Stratis/StratisDns/Program.cs +++ b/src/Networks/Stratis/StratisDns/Program.cs @@ -3,7 +3,7 @@ using Blockcore; using Blockcore.Builder; using Blockcore.Configuration; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.BlockStore; using Blockcore.Features.Consensus; using Blockcore.Features.Dns; @@ -54,7 +54,7 @@ public static async Task Main(string[] args) .UseMempool() .UseWallet() .AddPowPosMining() - .UseWebHost() + .UseNodeHost() .AddRPC() .UseDns() .Build(); @@ -65,7 +65,7 @@ public static async Task Main(string[] args) node = new FullNodeBuilder() .UseNodeSettings(nodeSettings) .UsePosConsensus() - .UseWebHost() + .UseNodeHost() .AddRPC() .UseDns() .Build(); diff --git a/src/Networks/Stratis/StratisDns/StratisDnsD.csproj b/src/Networks/Stratis/StratisDns/StratisDnsD.csproj index f3a4ebabc..724993b95 100644 --- a/src/Networks/Stratis/StratisDns/StratisDnsD.csproj +++ b/src/Networks/Stratis/StratisDns/StratisDnsD.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Networks/Stratis/Stratisd/Program.cs b/src/Networks/Stratis/Stratisd/Program.cs index 9f93b5bfc..88dce23be 100644 --- a/src/Networks/Stratis/Stratisd/Program.cs +++ b/src/Networks/Stratis/Stratisd/Program.cs @@ -3,7 +3,7 @@ using Blockcore; using Blockcore.Builder; using Blockcore.Configuration; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.BlockStore; using Blockcore.Features.ColdStaking; using Blockcore.Features.Consensus; @@ -40,7 +40,7 @@ public static async Task Main(string[] args) .UseMempool() .UseColdStakingWallet() .AddPowPosMining() - .UseWebHost() + .UseNodeHost() .AddRPC() .UseDiagnosticFeature(); diff --git a/src/Networks/Stratis/Stratisd/StratisD.csproj b/src/Networks/Stratis/Stratisd/StratisD.csproj index e8e2961e2..c299212e7 100644 --- a/src/Networks/Stratis/Stratisd/StratisD.csproj +++ b/src/Networks/Stratis/Stratisd/StratisD.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Networks/Xds/Xdsd/Program.cs b/src/Networks/Xds/Xdsd/Program.cs index 5c944af3d..202f8b79e 100644 --- a/src/Networks/Xds/Xdsd/Program.cs +++ b/src/Networks/Xds/Xdsd/Program.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Blockcore.Builder; using Blockcore.Configuration; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.BlockStore; using Blockcore.Features.ColdStaking; using Blockcore.Features.Consensus; @@ -36,7 +36,7 @@ public static async Task Main(string[] args) .UseMempool() .UseColdStakingWallet() .AddPowPosMining() - .UseWebHost() + .UseNodeHost() .AddRPC() .UseDiagnosticFeature(); diff --git a/src/Networks/Xds/Xdsd/XdsD.csproj b/src/Networks/Xds/Xdsd/XdsD.csproj index 5bc1638f0..2ba17d2a8 100644 --- a/src/Networks/Xds/Xdsd/XdsD.csproj +++ b/src/Networks/Xds/Xdsd/XdsD.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Networks/x42/x42.Node/Program.cs b/src/Networks/x42/x42.Node/Program.cs index f94c60de6..2aa881069 100644 --- a/src/Networks/x42/x42.Node/Program.cs +++ b/src/Networks/x42/x42.Node/Program.cs @@ -3,7 +3,7 @@ using Blockcore; using Blockcore.Builder; using Blockcore.Configuration; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.BlockStore; using Blockcore.Features.ColdStaking; using Blockcore.Features.Consensus; @@ -36,7 +36,7 @@ public static async Task Main(string[] args) .UseMempool() .UseColdStakingWallet() .AddPowPosMining() - .UseWebHost() + .UseNodeHost() .AddRPC() .UseDiagnosticFeature(); diff --git a/src/Networks/x42/x42.Node/x42.Node.csproj b/src/Networks/x42/x42.Node/x42.Node.csproj index 3d59d2b46..d93ca6652 100644 --- a/src/Networks/x42/x42.Node/x42.Node.csproj +++ b/src/Networks/x42/x42.Node/x42.Node.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Node/Blockcore.Node/Blockcore.Node.csproj b/src/Node/Blockcore.Node/Blockcore.Node.csproj index 98372cdce..d0d7bc27c 100644 --- a/src/Node/Blockcore.Node/Blockcore.Node.csproj +++ b/src/Node/Blockcore.Node/Blockcore.Node.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Node/Blockcore.Node/NodeBuilder.cs b/src/Node/Blockcore.Node/NodeBuilder.cs index efa3899f5..139fd92cf 100644 --- a/src/Node/Blockcore.Node/NodeBuilder.cs +++ b/src/Node/Blockcore.Node/NodeBuilder.cs @@ -8,7 +8,7 @@ using Blockcore.Features.Miner; using Blockcore.Features.RPC; using Blockcore.Features.Wallet; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; namespace Blockcore.Node { @@ -42,7 +42,7 @@ private static IFullNodeBuilder CreateBaseBuilder(string chain, NodeSettings set .UseNodeSettings(settings) .UseBlockStore() .UseMempool() - .UseWebHost() + .UseNodeHost() .AddRPC() .UseDiagnosticFeature(); diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/ApiSettingsTest.cs b/src/Tests/Blockcore.Features.WebHost.Tests/ApiSettingsTest.cs index ba12bda60..0fb9644be 100644 --- a/src/Tests/Blockcore.Features.WebHost.Tests/ApiSettingsTest.cs +++ b/src/Tests/Blockcore.Features.WebHost.Tests/ApiSettingsTest.cs @@ -7,7 +7,7 @@ using NBitcoin; using Xunit; -namespace Blockcore.Features.WebHost.Tests +namespace Blockcore.Features.NodeHost.Tests { /// /// Tests the settings for the API features. @@ -29,11 +29,11 @@ public void GivenNoApiSettingsAreProvided_AndOnBitcoinNetwork_ThenDefaultSetting var nodeSettings = new NodeSettings(network); // Act. - WebHostSettings settings = FullNodeSetup(nodeSettings); + NodeHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(network.DefaultAPIPort, settings.ApiPort); - Assert.Equal(new Uri($"{WebHostSettings.DefaultApiHost}:{network.DefaultAPIPort}"), settings.ApiUri); + Assert.Equal(new Uri($"{NodeHostSettings.DefaultApiHost}:{network.DefaultAPIPort}"), settings.ApiUri); } /// @@ -47,11 +47,11 @@ public void GivenNoApiSettingsAreProvided_AndOnStratisNetwork_ThenDefaultSetting var nodeSettings = new NodeSettings(network); // Act. - WebHostSettings settings = FullNodeSetup(nodeSettings); + NodeHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(network.DefaultAPIPort, settings.ApiPort); - Assert.Equal(new Uri($"{WebHostSettings.DefaultApiHost}:{network.DefaultAPIPort}"), settings.ApiUri); + Assert.Equal(new Uri($"{NodeHostSettings.DefaultApiHost}:{network.DefaultAPIPort}"), settings.ApiUri); settings.HttpsCertificateFilePath.Should().BeNull(); settings.UseHttps.Should().BeFalse(); @@ -68,11 +68,11 @@ public void GivenApiPortIsProvided_ThenPortIsUsedWithDefaultApiUri() var nodeSettings = new NodeSettings(this.Network, args:new[] { $"-apiport={customPort}" }); // Act. - WebHostSettings settings = FullNodeSetup(nodeSettings); + NodeHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(customPort, settings.ApiPort); - Assert.Equal(new Uri($"{WebHostSettings.DefaultApiHost}:{customPort}"), settings.ApiUri); + Assert.Equal(new Uri($"{NodeHostSettings.DefaultApiHost}:{customPort}"), settings.ApiUri); } /// @@ -87,7 +87,7 @@ public void GivenApiUriIsProvided_AndGivenBitcoinNetwork_ThenApiUriIsUsedWithDef var nodeSettings = new NodeSettings(network, args:new[] { $"-apiuri={customApiUri}" }); // Act. - WebHostSettings settings = FullNodeSetup(nodeSettings); + NodeHostSettings settings = FullNodeSetup(nodeSettings); // Assert. @@ -107,7 +107,7 @@ public void GivenApiUriIsProvided_AndGivenStratisNetwork_ThenApiUriIsUsedWithDef var nodeSettings = new NodeSettings(network, args:new[] { $"-apiuri={customApiUri}" }); // Act. - WebHostSettings settings = FullNodeSetup(nodeSettings); + NodeHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(network.DefaultAPIPort, settings.ApiPort); @@ -127,7 +127,7 @@ public void GivenApiUri_AndApiPortIsProvided_AndGivenBitcoinNetwork_ThenApiUriIs var nodeSettings = new NodeSettings(network, args:new[] { $"-apiuri={customApiUri}", $"-apiport={customPort}" }); // Act. - WebHostSettings settings = FullNodeSetup(nodeSettings); + NodeHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(customPort, settings.ApiPort); @@ -147,7 +147,7 @@ public void GivenApiUriIncludingPortIsProvided_ThenUseThePassedApiUri() var nodeSettings = new NodeSettings(network, args:new[] { $"-apiuri={customApiUri}" }); // Act. - WebHostSettings settings = FullNodeSetup(nodeSettings); + NodeHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(customPort, settings.ApiPort); @@ -164,7 +164,7 @@ public void GivenBitcoinMain_ThenUseTheCorrectPort() NodeSettings nodeSettings = NodeSettings.Default(KnownNetworks.Main); // Act. - WebHostSettings settings = FullNodeSetup(nodeSettings); + NodeHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(KnownNetworks.Main.DefaultAPIPort, settings.ApiPort); @@ -180,7 +180,7 @@ public void GivenBitcoinTestnet_ThenUseTheCorrectPort() NodeSettings nodeSettings = NodeSettings.Default(KnownNetworks.TestNet); // Act. - WebHostSettings settings = FullNodeSetup(nodeSettings); + NodeHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(KnownNetworks.TestNet.DefaultAPIPort, settings.ApiPort); @@ -196,7 +196,7 @@ public void GivenStratisMainnet_ThenUseTheCorrectPort() NodeSettings nodeSettings = NodeSettings.Default(KnownNetworks.StratisMain); // Act. - WebHostSettings settings = FullNodeSetup(nodeSettings); + NodeHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(KnownNetworks.StratisMain.DefaultAPIPort, settings.ApiPort); @@ -212,7 +212,7 @@ public void GivenStratisTestnet_ThenUseTheCorrectPort() NodeSettings nodeSettings = NodeSettings.Default(KnownNetworks.StratisTest); // Act. - WebHostSettings settings = FullNodeSetup(nodeSettings); + NodeHostSettings settings = FullNodeSetup(nodeSettings); // Assert. Assert.Equal(KnownNetworks.StratisTest.DefaultAPIPort, settings.ApiPort); @@ -242,7 +242,7 @@ public void GivenCertificateFilePath_ThenUsesTheCorrectFileName() var nodeSettings = new NodeSettings(KnownNetworks.TestNet, args: new[] { $"-certificatefilepath={certificateFileName}" }); // Act. - WebHostSettings settings = FullNodeSetup(nodeSettings); + NodeHostSettings settings = FullNodeSetup(nodeSettings); // Assert. settings.HttpsCertificateFilePath.Should().Be(certificateFileName); @@ -264,14 +264,14 @@ public void GivenUseHttpsAndNoCertificateFilePath_ThenShouldThrowConfigurationEx settingsAction.Should().Throw(); } - private static WebHostSettings FullNodeSetup(NodeSettings nodeSettings) + private static NodeHostSettings FullNodeSetup(NodeSettings nodeSettings) { return new FullNodeBuilder() .UseNodeSettings(nodeSettings) - .UseWebHost() + .UseNodeHost() .UsePowConsensus() .Build() - .NodeService(); + .NodeService(); } } } diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/Blockcore.Features.WebHost.Tests.csproj b/src/Tests/Blockcore.Features.WebHost.Tests/Blockcore.Features.WebHost.Tests.csproj index caf2f9519..afde26b6d 100644 --- a/src/Tests/Blockcore.Features.WebHost.Tests/Blockcore.Features.WebHost.Tests.csproj +++ b/src/Tests/Blockcore.Features.WebHost.Tests/Blockcore.Features.WebHost.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/ProgramTests.cs b/src/Tests/Blockcore.Features.WebHost.Tests/ProgramTests.cs index eab30b83c..94ea7cfc3 100644 --- a/src/Tests/Blockcore.Features.WebHost.Tests/ProgramTests.cs +++ b/src/Tests/Blockcore.Features.WebHost.Tests/ProgramTests.cs @@ -7,20 +7,20 @@ using Xunit; -namespace Blockcore.Features.WebHost.Tests +namespace Blockcore.Features.NodeHost.Tests { public class ProgramTest { private readonly X509Certificate2 certificateToUse; private readonly ICertificateStore certificateStore; - private readonly WebHostSettings apiSettings; + private readonly NodeHostSettings apiSettings; private readonly IWebHostBuilder webHostBuilder; private X509Certificate2 certificateRetrieved; public ProgramTest() { - this.apiSettings = new WebHostSettings(NodeSettings.Default(KnownNetworks.TestNet)) { UseHttps = true }; + this.apiSettings = new NodeHostSettings(NodeSettings.Default(KnownNetworks.TestNet)) { UseHttps = true }; this.certificateToUse = new X509Certificate2(); this.certificateStore = Substitute.For(); this.webHostBuilder = Substitute.For(); diff --git a/src/Tests/Blockcore.IntegrationTests.Common/Blockcore.IntegrationTests.Common.csproj b/src/Tests/Blockcore.IntegrationTests.Common/Blockcore.IntegrationTests.Common.csproj index 89446bd1e..2127a6df8 100644 --- a/src/Tests/Blockcore.IntegrationTests.Common/Blockcore.IntegrationTests.Common.csproj +++ b/src/Tests/Blockcore.IntegrationTests.Common/Blockcore.IntegrationTests.Common.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Tests/Blockcore.IntegrationTests.Common/EnvironmentMockUpHelpers/NodeBuilder.cs b/src/Tests/Blockcore.IntegrationTests.Common/EnvironmentMockUpHelpers/NodeBuilder.cs index 8073072ee..4b336a88e 100644 --- a/src/Tests/Blockcore.IntegrationTests.Common/EnvironmentMockUpHelpers/NodeBuilder.cs +++ b/src/Tests/Blockcore.IntegrationTests.Common/EnvironmentMockUpHelpers/NodeBuilder.cs @@ -5,7 +5,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Blockcore.Builder; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.BlockStore; using Blockcore.Features.Consensus; using Blockcore.Features.MemoryPool; @@ -149,7 +149,7 @@ public CoreNode CreateStratisCustomPowNode(Network network, NodeConfigParameters .AddMining() .UseWallet() .AddRPC() - .UseWebHost() + .UseNodeHost() .UseTestChainedHeaderTree() .MockIBD()); diff --git a/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPosRunner.cs b/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPosRunner.cs index 08eb470dc..a7584f9b2 100644 --- a/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPosRunner.cs +++ b/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPosRunner.cs @@ -1,7 +1,7 @@ using Blockcore.Base; using Blockcore.Builder; using Blockcore.Configuration; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.BlockStore; using Blockcore.Features.Consensus; using Blockcore.Features.MemoryPool; @@ -43,7 +43,7 @@ public override void BuildNode() .UseWallet() .AddPowPosMining() .AddRPC() - .UseWebHost() + .UseNodeHost() .UseTestChainedHeaderTree() .MockIBD(); diff --git a/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPowRunner.cs b/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPowRunner.cs index 8d86e19d7..05295976d 100644 --- a/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPowRunner.cs +++ b/src/Tests/Blockcore.IntegrationTests.Common/Runners/StratisBitcoinPowRunner.cs @@ -1,7 +1,7 @@ using Blockcore.Base; using Blockcore.Builder; using Blockcore.Configuration; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.BlockStore; using Blockcore.Features.Consensus; using Blockcore.Features.MemoryPool; @@ -41,7 +41,7 @@ public override void BuildNode() .AddMining() .UseWallet() .AddRPC() - .UseWebHost() + .UseNodeHost() .UseTestChainedHeaderTree() .MockIBD(); diff --git a/src/Tests/Blockcore.IntegrationTests/API/ApiSteps.cs b/src/Tests/Blockcore.IntegrationTests/API/ApiSteps.cs index e8bd4bf20..469d022db 100644 --- a/src/Tests/Blockcore.IntegrationTests/API/ApiSteps.cs +++ b/src/Tests/Blockcore.IntegrationTests/API/ApiSteps.cs @@ -9,7 +9,7 @@ using AspNetCore.Http.Extensions; using Blockcore.Connection; using Blockcore.Controllers.Models; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.Miner.Api.Controllers; using Blockcore.Features.Miner.Api.Models; using Blockcore.Features.Miner.Interfaces; @@ -153,7 +153,7 @@ private void a_proof_of_stake_node_with_api_enabled() this.stratisPosApiNode = this.posNodeBuilder.CreateStratisPosNode(this.posNetwork).Start(); this.stratisPosApiNode.FullNode.NodeService(true).Should().NotBeNull(); - this.apiUri = this.stratisPosApiNode.FullNode.NodeService().ApiUri; + this.apiUri = this.stratisPosApiNode.FullNode.NodeService().ApiUri; } private void the_proof_of_stake_node_has_passed_LastPOWBlock() @@ -178,7 +178,7 @@ private void a_proof_of_work_node_with_api_enabled() this.firstStratisPowApiNode.Mnemonic = this.firstStratisPowApiNode.Mnemonic; this.firstStratisPowApiNode.FullNode.Network.Consensus.CoinbaseMaturity = this.maturity; - this.apiUri = this.firstStratisPowApiNode.FullNode.NodeService().ApiUri; + this.apiUri = this.firstStratisPowApiNode.FullNode.NodeService().ApiUri; } private void a_second_proof_of_work_node_with_api_enabled() @@ -488,7 +488,7 @@ private void status_information_is_returned() List featuresNamespaces = statusResponse.FeaturesData.Select(f => f.Namespace).ToList(); featuresNamespaces.Should().Contain("Blockcore.Base.BaseFeature"); - featuresNamespaces.Should().Contain("Blockcore.Features.WebHost.ApiFeature"); + featuresNamespaces.Should().Contain("Blockcore.Features.NodeHost.NodeHostFeature"); featuresNamespaces.Should().Contain("Blockcore.Features.BlockStore.BlockStoreFeature"); featuresNamespaces.Should().Contain("Blockcore.Features.Consensus.PowConsensusFeature"); featuresNamespaces.Should().Contain("Blockcore.Features.MemoryPool.MempoolFeature"); diff --git a/src/Tests/Blockcore.IntegrationTests/API/MultiCallTest.cs b/src/Tests/Blockcore.IntegrationTests/API/MultiCallTest.cs index 22b69615b..2ddf068ec 100644 --- a/src/Tests/Blockcore.IntegrationTests/API/MultiCallTest.cs +++ b/src/Tests/Blockcore.IntegrationTests/API/MultiCallTest.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.Miner.Interfaces; using Blockcore.IntegrationTests.Common.Extensions; using Xunit; @@ -17,7 +17,7 @@ public void CanPerformMultipleParallelCallsToTheSameController() this.stratisPosApiNode = this.posNodeBuilder.CreateStratisPosNode(this.posNetwork).Start(); this.stratisPosApiNode.FullNode.NodeService(true); - this.apiUri = this.stratisPosApiNode.FullNode.NodeService().ApiUri; + this.apiUri = this.stratisPosApiNode.FullNode.NodeService().ApiUri; // With these tests we still need to create the wallets outside of the builder this.stratisPosApiNode.FullNode.WalletManager().CreateWallet(WalletPassword, WalletName, WalletPassphrase); diff --git a/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj b/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj index 0c8bb0f2f..884542823 100644 --- a/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj +++ b/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/Tests/Blockcore.IntegrationTests/CustomNodeBuilderTests.cs b/src/Tests/Blockcore.IntegrationTests/CustomNodeBuilderTests.cs index 8530d82e1..668881d8c 100644 --- a/src/Tests/Blockcore.IntegrationTests/CustomNodeBuilderTests.cs +++ b/src/Tests/Blockcore.IntegrationTests/CustomNodeBuilderTests.cs @@ -1,7 +1,7 @@ using System; using System.IO; using Blockcore.Builder; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.BlockStore; using Blockcore.Features.Consensus; using Blockcore.Features.MemoryPool; @@ -45,7 +45,7 @@ public void CanUnderstandUnknownParams() .AddMining() .UseWallet() .AddRPC() - .UseWebHost() + .UseNodeHost() .MockIBD()); var coreNode = nodeBuilder.CreateCustomNode(buildAction, this.network, @@ -76,7 +76,7 @@ public void CanUseCustomConfigFileFromParams() .AddMining() .UseWallet() .AddRPC() - .UseWebHost() + .UseNodeHost() .MockIBD()); var coreNode = nodeBuilder.CreateCustomNode(buildAction, this.network, ProtocolVersion.PROTOCOL_VERSION, configParameters: extraParams); diff --git a/src/Tests/Blockcore.IntegrationTests/ProvenHeaderTests.cs b/src/Tests/Blockcore.IntegrationTests/ProvenHeaderTests.cs index 0106952be..e78f71347 100644 --- a/src/Tests/Blockcore.IntegrationTests/ProvenHeaderTests.cs +++ b/src/Tests/Blockcore.IntegrationTests/ProvenHeaderTests.cs @@ -1,7 +1,7 @@ using System; using Blockcore.Builder; using Blockcore.Configuration; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.BlockStore; using Blockcore.Features.Consensus; using Blockcore.Features.MemoryPool; @@ -39,7 +39,7 @@ public CoreNode CreateNode(NodeBuilder nodeBuilder, string agent, ProtocolVersio .UsePosConsensus() .UseMempool() .AddRPC() - .UseWebHost() + .UseNodeHost() .UseTestChainedHeaderTree() .MockIBD() ); diff --git a/src/Tests/Blockcore.IntegrationTests/Wallet/ColdWalletTests.cs b/src/Tests/Blockcore.IntegrationTests/Wallet/ColdWalletTests.cs index 20c1415c5..f6eaf8c1f 100644 --- a/src/Tests/Blockcore.IntegrationTests/Wallet/ColdWalletTests.cs +++ b/src/Tests/Blockcore.IntegrationTests/Wallet/ColdWalletTests.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Threading; using Blockcore.Builder; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.BlockStore; using Blockcore.Features.ColdStaking; using Blockcore.Features.Consensus; @@ -89,7 +89,7 @@ private CoreNode CreatePowPosMiningNode(NodeBuilder nodeBuilder, Network network builder .AddPowPosMining() .AddRPC() - .UseWebHost() + .UseNodeHost() .UseTestChainedHeaderTree() .MockIBD(); }); diff --git a/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj b/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj index 2e6920155..eab3511b7 100644 --- a/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj +++ b/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/Tests/Blockcore.Tests/NodeConfiguration/NodeSettingsTest.cs b/src/Tests/Blockcore.Tests/NodeConfiguration/NodeSettingsTest.cs index b3322abe9..3b9fa0b22 100644 --- a/src/Tests/Blockcore.Tests/NodeConfiguration/NodeSettingsTest.cs +++ b/src/Tests/Blockcore.Tests/NodeConfiguration/NodeSettingsTest.cs @@ -1,7 +1,7 @@ using System.IO; using Blockcore.Configuration; using Blockcore.Configuration.Settings; -using Blockcore.Features.WebHost; +using Blockcore.Features.NodeHost; using Blockcore.Features.RPC; using Blockcore.Networks; using Blockcore.Networks.Bitcoin; @@ -162,7 +162,7 @@ public void NodeSettings_CanOverrideOnlyApiPort() var nodeSettings = new NodeSettings(new BitcoinRegTest(), args: new[] { $"-apiport={apiport}" }); - var apiSettings = new WebHostSettings(nodeSettings); + var apiSettings = new NodeHostSettings(nodeSettings); var rpcSettings = new RpcSettings(nodeSettings); var configurationManagerSettings = new ConnectionManagerSettings(nodeSettings); @@ -186,7 +186,7 @@ public void NodeSettings_CanOverrideAllPorts() var nodeSettings = new NodeSettings(new BitcoinRegTest(), args: args); - var apiSettings = new WebHostSettings(nodeSettings); + var apiSettings = new NodeHostSettings(nodeSettings); var rpcSettings = new RpcSettings(nodeSettings); var configurationManagerSettings = new ConnectionManagerSettings(nodeSettings); From 21119931fa74e928db693686739e44c32f6d1e1f Mon Sep 17 00:00:00 2001 From: SondreB Date: Wed, 13 May 2020 23:52:15 +0200 Subject: [PATCH 06/14] Rename WebHost folder to NodeHost - Updates all references, etc. from WebHost to NodeHost. --- src/Blockcore.sln | 4 ++-- .../Blockcore.Features.NodeHost.csproj | 0 .../CertificateStore.cs | 0 .../Events/EventSubscriptionService.cs | 0 .../Hubs/EventsHub.cs | 0 .../Hubs/NodeHub.cs | 0 .../ICertificateStore.cs | 0 .../LoggingActionFilter.cs | 0 .../MvcBuilderExtensions.cs | 0 .../NoCacheMiddleware.cs | 0 .../Program.cs | 0 .../Properties/launchSettings.json | 0 .../Startup.cs | 18 +++++++++--------- .../SwaggerApiDocumentationScaffolder.cs | 0 .../UI/App.razor | 0 .../UI/Pages/Error.razor | 0 .../UI/Pages/Index.razor | 0 .../UI/Pages/Logs.razor | 0 .../UI/Pages/Peers.razor | 0 .../UI/Pages/PeersNodes.razor | 0 .../UI/Pages/_Host.cshtml | 0 .../UI/Shared/MainLayout.razor | 0 .../UI/Shared/NavMenu.razor | 0 .../UI/_Imports.razor | 0 .../wwwroot/css/bootstrap/bootstrap.min.css | 0 .../css/bootstrap/bootstrap.min.css.map | 0 .../UI/wwwroot/css/open-iconic/FONT-LICENSE | 0 .../UI/wwwroot/css/open-iconic/ICON-LICENSE | 0 .../UI/wwwroot/css/open-iconic/README.md | 0 .../font/css/open-iconic-bootstrap.min.css | 0 .../open-iconic/font/fonts/open-iconic.eot | Bin .../open-iconic/font/fonts/open-iconic.otf | Bin .../open-iconic/font/fonts/open-iconic.svg | 0 .../open-iconic/font/fonts/open-iconic.ttf | Bin .../open-iconic/font/fonts/open-iconic.woff | Bin .../UI/wwwroot/css/site.css | 0 .../UI/wwwroot/favicon.ico | Bin .../UI/wwwroot/js/signalr.js | 0 .../UI/wwwroot/js/signalr.min.js | 0 .../UI/wwwroot/ws-ui/index.html | 0 .../UI/wwwroot/ws-ui/node.html | 0 .../WebHostFeature.cs | 0 .../WebHostSettings.cs | 0 .../appsettings.json | 0 .../web.config | 0 .../Blockcore.Features.WebHost.csproj | 4 ---- .../Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj | 2 +- src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj | 2 +- src/Networks/City/City.Node/City.Node.csproj | 2 +- .../Stratis/StratisDns/StratisDnsD.csproj | 2 +- src/Networks/Stratis/Stratisd/StratisD.csproj | 2 +- src/Networks/Xds/Xdsd/XdsD.csproj | 2 +- src/Networks/x42/x42.Node/x42.Node.csproj | 2 +- src/Node/Blockcore.Node/Blockcore.Node.csproj | 2 +- .../ApiSettingsTest.cs | 0 .../Blockcore.Features.NodeHost.Tests.csproj} | 6 +++--- .../Mining.postman_collection.json | 0 .../Node.postman_collection.json | 0 .../Notifications.postman_collection.json | 0 .../RPC.postman_collection.json | 0 .../Wallet.postman_collection.json | 0 .../Watch-Only Wallet.postman_collection.json | 0 .../ProgramTests.cs | 0 .../xunit.runner.json | 0 .../Blockcore.IntegrationTests.Common.csproj | 2 +- .../Blockcore.IntegrationTests.csproj | 2 +- .../Blockcore.Tests/Blockcore.Tests.csproj | 2 +- 67 files changed, 25 insertions(+), 29 deletions(-) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/Blockcore.Features.NodeHost.csproj (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/CertificateStore.cs (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/Events/EventSubscriptionService.cs (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/Hubs/EventsHub.cs (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/Hubs/NodeHub.cs (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/ICertificateStore.cs (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/LoggingActionFilter.cs (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/MvcBuilderExtensions.cs (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/NoCacheMiddleware.cs (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/Program.cs (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/Properties/launchSettings.json (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/Startup.cs (92%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/SwaggerApiDocumentationScaffolder.cs (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/App.razor (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/Pages/Error.razor (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/Pages/Index.razor (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/Pages/Logs.razor (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/Pages/Peers.razor (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/Pages/PeersNodes.razor (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/Pages/_Host.cshtml (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/Shared/MainLayout.razor (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/Shared/NavMenu.razor (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/_Imports.razor (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/css/bootstrap/bootstrap.min.css (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/css/bootstrap/bootstrap.min.css.map (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/css/open-iconic/FONT-LICENSE (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/css/open-iconic/ICON-LICENSE (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/css/open-iconic/README.md (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.eot (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.otf (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.svg (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.woff (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/css/site.css (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/favicon.ico (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/js/signalr.js (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/js/signalr.min.js (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/ws-ui/index.html (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/UI/wwwroot/ws-ui/node.html (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/WebHostFeature.cs (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/WebHostSettings.cs (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/appsettings.json (100%) rename src/Features/{Blockcore.Features.WebHost => Blockcore.Features.NodeHost}/web.config (100%) delete mode 100644 src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj rename src/Tests/{Blockcore.Features.WebHost.Tests => Blockcore.Features.NodeHost.Tests}/ApiSettingsTest.cs (100%) rename src/Tests/{Blockcore.Features.WebHost.Tests/Blockcore.Features.WebHost.Tests.csproj => Blockcore.Features.NodeHost.Tests/Blockcore.Features.NodeHost.Tests.csproj} (86%) rename src/Tests/{Blockcore.Features.WebHost.Tests => Blockcore.Features.NodeHost.Tests}/Postman requests/Mining.postman_collection.json (100%) rename src/Tests/{Blockcore.Features.WebHost.Tests => Blockcore.Features.NodeHost.Tests}/Postman requests/Node.postman_collection.json (100%) rename src/Tests/{Blockcore.Features.WebHost.Tests => Blockcore.Features.NodeHost.Tests}/Postman requests/Notifications.postman_collection.json (100%) rename src/Tests/{Blockcore.Features.WebHost.Tests => Blockcore.Features.NodeHost.Tests}/Postman requests/RPC.postman_collection.json (100%) rename src/Tests/{Blockcore.Features.WebHost.Tests => Blockcore.Features.NodeHost.Tests}/Postman requests/Wallet.postman_collection.json (100%) rename src/Tests/{Blockcore.Features.WebHost.Tests => Blockcore.Features.NodeHost.Tests}/Postman requests/Watch-Only Wallet.postman_collection.json (100%) rename src/Tests/{Blockcore.Features.WebHost.Tests => Blockcore.Features.NodeHost.Tests}/ProgramTests.cs (100%) rename src/Tests/{Blockcore.Features.WebHost.Tests => Blockcore.Features.NodeHost.Tests}/xunit.runner.json (100%) diff --git a/src/Blockcore.sln b/src/Blockcore.sln index 991afd59c..b23c8fcbd 100644 --- a/src/Blockcore.sln +++ b/src/Blockcore.sln @@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Tests", "Tests\Bl EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{1B9A916F-DDAC-4675-B424-EDEDC1A58231}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.WebHost.Tests", "Tests\Blockcore.Features.WebHost.Tests\Blockcore.Features.WebHost.Tests.csproj", "{E538B76A-513F-46D5-9F14-E35E79B484CA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.NodeHost.Tests", "Tests\Blockcore.Features.NodeHost.Tests\Blockcore.Features.NodeHost.Tests.csproj", "{E538B76A-513F-46D5-9F14-E35E79B484CA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.RPC", "Features\Blockcore.Features.RPC\Blockcore.Features.RPC.csproj", "{5E0010F1-50B8-4FC5-A9C2-38D7DF73A0D2}" EndProject @@ -39,7 +39,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{EAE139C2 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Features", "Features", "{15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.NodeHost", "Features\Blockcore.Features.WebHost\Blockcore.Features.NodeHost.csproj", "{FB78D861-F3DF-412D-8A3D-D1756ADA39D4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.NodeHost", "Features\Blockcore.Features.NodeHost\Blockcore.Features.NodeHost.csproj", "{FB78D861-F3DF-412D-8A3D-D1756ADA39D4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBitcoin", "External\NBitcoin\NBitcoin.csproj", "{2051FCAC-D4C7-498D-B935-2E9E6DEA0C29}" EndProject diff --git a/src/Features/Blockcore.Features.WebHost/Blockcore.Features.NodeHost.csproj b/src/Features/Blockcore.Features.NodeHost/Blockcore.Features.NodeHost.csproj similarity index 100% rename from src/Features/Blockcore.Features.WebHost/Blockcore.Features.NodeHost.csproj rename to src/Features/Blockcore.Features.NodeHost/Blockcore.Features.NodeHost.csproj diff --git a/src/Features/Blockcore.Features.WebHost/CertificateStore.cs b/src/Features/Blockcore.Features.NodeHost/CertificateStore.cs similarity index 100% rename from src/Features/Blockcore.Features.WebHost/CertificateStore.cs rename to src/Features/Blockcore.Features.NodeHost/CertificateStore.cs diff --git a/src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs b/src/Features/Blockcore.Features.NodeHost/Events/EventSubscriptionService.cs similarity index 100% rename from src/Features/Blockcore.Features.WebHost/Events/EventSubscriptionService.cs rename to src/Features/Blockcore.Features.NodeHost/Events/EventSubscriptionService.cs diff --git a/src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs b/src/Features/Blockcore.Features.NodeHost/Hubs/EventsHub.cs similarity index 100% rename from src/Features/Blockcore.Features.WebHost/Hubs/EventsHub.cs rename to src/Features/Blockcore.Features.NodeHost/Hubs/EventsHub.cs diff --git a/src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs b/src/Features/Blockcore.Features.NodeHost/Hubs/NodeHub.cs similarity index 100% rename from src/Features/Blockcore.Features.WebHost/Hubs/NodeHub.cs rename to src/Features/Blockcore.Features.NodeHost/Hubs/NodeHub.cs diff --git a/src/Features/Blockcore.Features.WebHost/ICertificateStore.cs b/src/Features/Blockcore.Features.NodeHost/ICertificateStore.cs similarity index 100% rename from src/Features/Blockcore.Features.WebHost/ICertificateStore.cs rename to src/Features/Blockcore.Features.NodeHost/ICertificateStore.cs diff --git a/src/Features/Blockcore.Features.WebHost/LoggingActionFilter.cs b/src/Features/Blockcore.Features.NodeHost/LoggingActionFilter.cs similarity index 100% rename from src/Features/Blockcore.Features.WebHost/LoggingActionFilter.cs rename to src/Features/Blockcore.Features.NodeHost/LoggingActionFilter.cs diff --git a/src/Features/Blockcore.Features.WebHost/MvcBuilderExtensions.cs b/src/Features/Blockcore.Features.NodeHost/MvcBuilderExtensions.cs similarity index 100% rename from src/Features/Blockcore.Features.WebHost/MvcBuilderExtensions.cs rename to src/Features/Blockcore.Features.NodeHost/MvcBuilderExtensions.cs diff --git a/src/Features/Blockcore.Features.WebHost/NoCacheMiddleware.cs b/src/Features/Blockcore.Features.NodeHost/NoCacheMiddleware.cs similarity index 100% rename from src/Features/Blockcore.Features.WebHost/NoCacheMiddleware.cs rename to src/Features/Blockcore.Features.NodeHost/NoCacheMiddleware.cs diff --git a/src/Features/Blockcore.Features.WebHost/Program.cs b/src/Features/Blockcore.Features.NodeHost/Program.cs similarity index 100% rename from src/Features/Blockcore.Features.WebHost/Program.cs rename to src/Features/Blockcore.Features.NodeHost/Program.cs diff --git a/src/Features/Blockcore.Features.WebHost/Properties/launchSettings.json b/src/Features/Blockcore.Features.NodeHost/Properties/launchSettings.json similarity index 100% rename from src/Features/Blockcore.Features.WebHost/Properties/launchSettings.json rename to src/Features/Blockcore.Features.NodeHost/Properties/launchSettings.json diff --git a/src/Features/Blockcore.Features.WebHost/Startup.cs b/src/Features/Blockcore.Features.NodeHost/Startup.cs similarity index 92% rename from src/Features/Blockcore.Features.WebHost/Startup.cs rename to src/Features/Blockcore.Features.NodeHost/Startup.cs index a45fa03de..ec64b67de 100644 --- a/src/Features/Blockcore.Features.WebHost/Startup.cs +++ b/src/Features/Blockcore.Features.NodeHost/Startup.cs @@ -42,7 +42,7 @@ public Startup(IWebHostEnvironment env, IFullNode fullNode) // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - NodeHostSettings webHostSettings = fullNode.Services.ServiceProvider.GetService(); + NodeHostSettings hostSettings = fullNode.Services.ServiceProvider.GetService(); services.AddLogging(loggingBuilder => { @@ -73,7 +73,7 @@ public void ConfigureServices(IServiceCollection services) ); }); - if (webHostSettings.EnableUI) + if (hostSettings.EnableUI) { services.AddRazorPages(); @@ -86,7 +86,7 @@ public void ConfigureServices(IServiceCollection services) }); } - if (webHostSettings.EnableWS) + if (hostSettings.EnableWS) { services.AddSignalR().AddNewtonsoftJsonProtocol(options => { @@ -96,7 +96,7 @@ public void ConfigureServices(IServiceCollection services) }); } - if (webHostSettings.EnableAPI) + if (hostSettings.EnableAPI) { services.AddMvc(options => { @@ -143,7 +143,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) // This is needed to access context of the hubs. Provider = app.ApplicationServices; - NodeHostSettings webHostSettings = fullNode.Services.ServiceProvider.GetService(); + NodeHostSettings hostSettings = fullNode.Services.ServiceProvider.GetService(); app.UseStaticFiles(); @@ -156,25 +156,25 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) app.UseEndpoints(endpoints => { - if (webHostSettings.EnableAPI) + if (hostSettings.EnableAPI) { endpoints.MapControllers(); } - if (webHostSettings.EnableWS) + if (hostSettings.EnableWS) { endpoints.MapHub("/ws-events"); endpoints.MapHub("/ws"); } - if (webHostSettings.EnableUI) + if (hostSettings.EnableUI) { endpoints.MapBlazorHub(); endpoints.MapFallbackToPage("/_Host"); } }); - if (webHostSettings.EnableAPI) + if (hostSettings.EnableAPI) { app.UseSwagger(c => { diff --git a/src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs b/src/Features/Blockcore.Features.NodeHost/SwaggerApiDocumentationScaffolder.cs similarity index 100% rename from src/Features/Blockcore.Features.WebHost/SwaggerApiDocumentationScaffolder.cs rename to src/Features/Blockcore.Features.NodeHost/SwaggerApiDocumentationScaffolder.cs diff --git a/src/Features/Blockcore.Features.WebHost/UI/App.razor b/src/Features/Blockcore.Features.NodeHost/UI/App.razor similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/App.razor rename to src/Features/Blockcore.Features.NodeHost/UI/App.razor diff --git a/src/Features/Blockcore.Features.WebHost/UI/Pages/Error.razor b/src/Features/Blockcore.Features.NodeHost/UI/Pages/Error.razor similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/Pages/Error.razor rename to src/Features/Blockcore.Features.NodeHost/UI/Pages/Error.razor diff --git a/src/Features/Blockcore.Features.WebHost/UI/Pages/Index.razor b/src/Features/Blockcore.Features.NodeHost/UI/Pages/Index.razor similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/Pages/Index.razor rename to src/Features/Blockcore.Features.NodeHost/UI/Pages/Index.razor diff --git a/src/Features/Blockcore.Features.WebHost/UI/Pages/Logs.razor b/src/Features/Blockcore.Features.NodeHost/UI/Pages/Logs.razor similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/Pages/Logs.razor rename to src/Features/Blockcore.Features.NodeHost/UI/Pages/Logs.razor diff --git a/src/Features/Blockcore.Features.WebHost/UI/Pages/Peers.razor b/src/Features/Blockcore.Features.NodeHost/UI/Pages/Peers.razor similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/Pages/Peers.razor rename to src/Features/Blockcore.Features.NodeHost/UI/Pages/Peers.razor diff --git a/src/Features/Blockcore.Features.WebHost/UI/Pages/PeersNodes.razor b/src/Features/Blockcore.Features.NodeHost/UI/Pages/PeersNodes.razor similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/Pages/PeersNodes.razor rename to src/Features/Blockcore.Features.NodeHost/UI/Pages/PeersNodes.razor diff --git a/src/Features/Blockcore.Features.WebHost/UI/Pages/_Host.cshtml b/src/Features/Blockcore.Features.NodeHost/UI/Pages/_Host.cshtml similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/Pages/_Host.cshtml rename to src/Features/Blockcore.Features.NodeHost/UI/Pages/_Host.cshtml diff --git a/src/Features/Blockcore.Features.WebHost/UI/Shared/MainLayout.razor b/src/Features/Blockcore.Features.NodeHost/UI/Shared/MainLayout.razor similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/Shared/MainLayout.razor rename to src/Features/Blockcore.Features.NodeHost/UI/Shared/MainLayout.razor diff --git a/src/Features/Blockcore.Features.WebHost/UI/Shared/NavMenu.razor b/src/Features/Blockcore.Features.NodeHost/UI/Shared/NavMenu.razor similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/Shared/NavMenu.razor rename to src/Features/Blockcore.Features.NodeHost/UI/Shared/NavMenu.razor diff --git a/src/Features/Blockcore.Features.WebHost/UI/_Imports.razor b/src/Features/Blockcore.Features.NodeHost/UI/_Imports.razor similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/_Imports.razor rename to src/Features/Blockcore.Features.NodeHost/UI/_Imports.razor diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/bootstrap/bootstrap.min.css b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/bootstrap/bootstrap.min.css rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/bootstrap/bootstrap.min.css.map b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/bootstrap/bootstrap.min.css.map rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/FONT-LICENSE b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/FONT-LICENSE rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/ICON-LICENSE b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/ICON-LICENSE rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/README.md b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/README.md similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/README.md rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/README.md diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/site.css b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/site.css similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/css/site.css rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/css/site.css diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/favicon.ico b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/favicon.ico similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/favicon.ico rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/favicon.ico diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/js/signalr.js b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/js/signalr.js similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/js/signalr.js rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/js/signalr.js diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/js/signalr.min.js b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/js/signalr.min.js similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/js/signalr.min.js rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/js/signalr.min.js diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-ui/index.html b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/ws-ui/index.html similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-ui/index.html rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/ws-ui/index.html diff --git a/src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-ui/node.html b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/ws-ui/node.html similarity index 100% rename from src/Features/Blockcore.Features.WebHost/UI/wwwroot/ws-ui/node.html rename to src/Features/Blockcore.Features.NodeHost/UI/wwwroot/ws-ui/node.html diff --git a/src/Features/Blockcore.Features.WebHost/WebHostFeature.cs b/src/Features/Blockcore.Features.NodeHost/WebHostFeature.cs similarity index 100% rename from src/Features/Blockcore.Features.WebHost/WebHostFeature.cs rename to src/Features/Blockcore.Features.NodeHost/WebHostFeature.cs diff --git a/src/Features/Blockcore.Features.WebHost/WebHostSettings.cs b/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs similarity index 100% rename from src/Features/Blockcore.Features.WebHost/WebHostSettings.cs rename to src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs diff --git a/src/Features/Blockcore.Features.WebHost/appsettings.json b/src/Features/Blockcore.Features.NodeHost/appsettings.json similarity index 100% rename from src/Features/Blockcore.Features.WebHost/appsettings.json rename to src/Features/Blockcore.Features.NodeHost/appsettings.json diff --git a/src/Features/Blockcore.Features.WebHost/web.config b/src/Features/Blockcore.Features.NodeHost/web.config similarity index 100% rename from src/Features/Blockcore.Features.WebHost/web.config rename to src/Features/Blockcore.Features.NodeHost/web.config diff --git a/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj b/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj deleted file mode 100644 index 88a550947..000000000 --- a/src/Features/Blockcore.Features.WebHost/Blockcore.Features.WebHost.csproj +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Networks/Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj b/src/Networks/Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj index f0b5a0223..c150f83a7 100644 --- a/src/Networks/Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj +++ b/src/Networks/Bitcoin/Bitcoin.Cli/Bitcoin.Cli.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj b/src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj index fc94a9bde..47f6f407d 100644 --- a/src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj +++ b/src/Networks/Bitcoin/Bitcoind/BitcoinD.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Networks/City/City.Node/City.Node.csproj b/src/Networks/City/City.Node/City.Node.csproj index 9c4e5d9a7..5481ae2e0 100644 --- a/src/Networks/City/City.Node/City.Node.csproj +++ b/src/Networks/City/City.Node/City.Node.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Networks/Stratis/StratisDns/StratisDnsD.csproj b/src/Networks/Stratis/StratisDns/StratisDnsD.csproj index 724993b95..a94a0cd96 100644 --- a/src/Networks/Stratis/StratisDns/StratisDnsD.csproj +++ b/src/Networks/Stratis/StratisDns/StratisDnsD.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Networks/Stratis/Stratisd/StratisD.csproj b/src/Networks/Stratis/Stratisd/StratisD.csproj index c299212e7..9b6ef3a64 100644 --- a/src/Networks/Stratis/Stratisd/StratisD.csproj +++ b/src/Networks/Stratis/Stratisd/StratisD.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Networks/Xds/Xdsd/XdsD.csproj b/src/Networks/Xds/Xdsd/XdsD.csproj index 2ba17d2a8..c67ce565a 100644 --- a/src/Networks/Xds/Xdsd/XdsD.csproj +++ b/src/Networks/Xds/Xdsd/XdsD.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Networks/x42/x42.Node/x42.Node.csproj b/src/Networks/x42/x42.Node/x42.Node.csproj index d93ca6652..d52a3341c 100644 --- a/src/Networks/x42/x42.Node/x42.Node.csproj +++ b/src/Networks/x42/x42.Node/x42.Node.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Node/Blockcore.Node/Blockcore.Node.csproj b/src/Node/Blockcore.Node/Blockcore.Node.csproj index d0d7bc27c..d5903b275 100644 --- a/src/Node/Blockcore.Node/Blockcore.Node.csproj +++ b/src/Node/Blockcore.Node/Blockcore.Node.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/ApiSettingsTest.cs b/src/Tests/Blockcore.Features.NodeHost.Tests/ApiSettingsTest.cs similarity index 100% rename from src/Tests/Blockcore.Features.WebHost.Tests/ApiSettingsTest.cs rename to src/Tests/Blockcore.Features.NodeHost.Tests/ApiSettingsTest.cs diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/Blockcore.Features.WebHost.Tests.csproj b/src/Tests/Blockcore.Features.NodeHost.Tests/Blockcore.Features.NodeHost.Tests.csproj similarity index 86% rename from src/Tests/Blockcore.Features.WebHost.Tests/Blockcore.Features.WebHost.Tests.csproj rename to src/Tests/Blockcore.Features.NodeHost.Tests/Blockcore.Features.NodeHost.Tests.csproj index afde26b6d..86c175694 100644 --- a/src/Tests/Blockcore.Features.WebHost.Tests/Blockcore.Features.WebHost.Tests.csproj +++ b/src/Tests/Blockcore.Features.NodeHost.Tests/Blockcore.Features.NodeHost.Tests.csproj @@ -1,8 +1,8 @@  - Blockcore.Feeatures.WebHost.Tests - Blockcore.Features.WebHost.Tests + Blockcore.Feeatures.NodeHost.Tests + Blockcore.Features.NodeHost.Tests true @@ -17,7 +17,7 @@ - + diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/Postman requests/Mining.postman_collection.json b/src/Tests/Blockcore.Features.NodeHost.Tests/Postman requests/Mining.postman_collection.json similarity index 100% rename from src/Tests/Blockcore.Features.WebHost.Tests/Postman requests/Mining.postman_collection.json rename to src/Tests/Blockcore.Features.NodeHost.Tests/Postman requests/Mining.postman_collection.json diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/Postman requests/Node.postman_collection.json b/src/Tests/Blockcore.Features.NodeHost.Tests/Postman requests/Node.postman_collection.json similarity index 100% rename from src/Tests/Blockcore.Features.WebHost.Tests/Postman requests/Node.postman_collection.json rename to src/Tests/Blockcore.Features.NodeHost.Tests/Postman requests/Node.postman_collection.json diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/Postman requests/Notifications.postman_collection.json b/src/Tests/Blockcore.Features.NodeHost.Tests/Postman requests/Notifications.postman_collection.json similarity index 100% rename from src/Tests/Blockcore.Features.WebHost.Tests/Postman requests/Notifications.postman_collection.json rename to src/Tests/Blockcore.Features.NodeHost.Tests/Postman requests/Notifications.postman_collection.json diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/Postman requests/RPC.postman_collection.json b/src/Tests/Blockcore.Features.NodeHost.Tests/Postman requests/RPC.postman_collection.json similarity index 100% rename from src/Tests/Blockcore.Features.WebHost.Tests/Postman requests/RPC.postman_collection.json rename to src/Tests/Blockcore.Features.NodeHost.Tests/Postman requests/RPC.postman_collection.json diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/Postman requests/Wallet.postman_collection.json b/src/Tests/Blockcore.Features.NodeHost.Tests/Postman requests/Wallet.postman_collection.json similarity index 100% rename from src/Tests/Blockcore.Features.WebHost.Tests/Postman requests/Wallet.postman_collection.json rename to src/Tests/Blockcore.Features.NodeHost.Tests/Postman requests/Wallet.postman_collection.json diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/Postman requests/Watch-Only Wallet.postman_collection.json b/src/Tests/Blockcore.Features.NodeHost.Tests/Postman requests/Watch-Only Wallet.postman_collection.json similarity index 100% rename from src/Tests/Blockcore.Features.WebHost.Tests/Postman requests/Watch-Only Wallet.postman_collection.json rename to src/Tests/Blockcore.Features.NodeHost.Tests/Postman requests/Watch-Only Wallet.postman_collection.json diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/ProgramTests.cs b/src/Tests/Blockcore.Features.NodeHost.Tests/ProgramTests.cs similarity index 100% rename from src/Tests/Blockcore.Features.WebHost.Tests/ProgramTests.cs rename to src/Tests/Blockcore.Features.NodeHost.Tests/ProgramTests.cs diff --git a/src/Tests/Blockcore.Features.WebHost.Tests/xunit.runner.json b/src/Tests/Blockcore.Features.NodeHost.Tests/xunit.runner.json similarity index 100% rename from src/Tests/Blockcore.Features.WebHost.Tests/xunit.runner.json rename to src/Tests/Blockcore.Features.NodeHost.Tests/xunit.runner.json diff --git a/src/Tests/Blockcore.IntegrationTests.Common/Blockcore.IntegrationTests.Common.csproj b/src/Tests/Blockcore.IntegrationTests.Common/Blockcore.IntegrationTests.Common.csproj index 2127a6df8..8e8cb94dd 100644 --- a/src/Tests/Blockcore.IntegrationTests.Common/Blockcore.IntegrationTests.Common.csproj +++ b/src/Tests/Blockcore.IntegrationTests.Common/Blockcore.IntegrationTests.Common.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj b/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj index 884542823..9a3264896 100644 --- a/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj +++ b/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj b/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj index eab3511b7..07a6551c6 100644 --- a/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj +++ b/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj @@ -30,7 +30,7 @@ - + From e0eefad386e6dc637832fee41c0b3c6fe594c95d Mon Sep 17 00:00:00 2001 From: dangershony Date: Thu, 14 May 2020 01:32:22 +0100 Subject: [PATCH 07/14] Removing the dependency on a static service provider --- src/Blockcore/Broadcasters/BroadcasterBase.cs | 3 ++- .../IEventsSubscriptionService.cs | 3 +++ .../EventBus/CoreEvents/BlockConnected.cs | 5 ++-- .../CoreEvents/TransactionReceived.cs | 4 ++-- src/Blockcore/EventBus/EventBase.cs | 2 +- .../Events/EventSubscriptionService.cs | 23 +++++++++++-------- .../Blockcore.Features.NodeHost/Startup.cs | 13 +++++------ 7 files changed, 30 insertions(+), 23 deletions(-) diff --git a/src/Blockcore/Broadcasters/BroadcasterBase.cs b/src/Blockcore/Broadcasters/BroadcasterBase.cs index 0af960e9b..cf5f45ec1 100644 --- a/src/Blockcore/Broadcasters/BroadcasterBase.cs +++ b/src/Blockcore/Broadcasters/BroadcasterBase.cs @@ -45,7 +45,8 @@ public void Init(ClientEventBroadcasterSettings broadcasterSettings) } }, this.nodeLifetime.ApplicationStopping, - repeatEvery: TimeSpan.FromSeconds(Math.Max(broadcasterSettings.BroadcastFrequencySeconds, 5))); + repeatEvery: TimeSpan.FromSeconds(Math.Max(broadcasterSettings.BroadcastFrequencySeconds, 5)), + startAfter: TimeSpans.FiveSeconds); } protected abstract IEnumerable GetMessages(); diff --git a/src/Blockcore/Broadcasters/IEventsSubscriptionService.cs b/src/Blockcore/Broadcasters/IEventsSubscriptionService.cs index 297e0b81d..619ba9585 100644 --- a/src/Blockcore/Broadcasters/IEventsSubscriptionService.cs +++ b/src/Blockcore/Broadcasters/IEventsSubscriptionService.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Blockcore.Broadcasters; using Blockcore.EventBus; +using Microsoft.AspNetCore.SignalR; namespace Blockcore.Broadcasters { @@ -15,5 +16,7 @@ public interface IEventsSubscriptionService void UnsubscribeAll(string id); void OnEvent(EventBase @event); + + void SetHub(IHubContext hubContext) where T : Hub; } } \ No newline at end of file diff --git a/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs b/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs index 71f9005ae..dd637f9cc 100644 --- a/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs +++ b/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs @@ -1,4 +1,5 @@ using Blockcore.Primitives; +using NBitcoin; namespace Blockcore.EventBus.CoreEvents { @@ -10,14 +11,14 @@ public class BlockConnected : EventBase { public ChainedHeaderBlock ConnectedBlock { get; } - public string Hash { get; set; } + public uint256 Hash { get; set; } public int Height { get; set; } public BlockConnected(ChainedHeaderBlock connectedBlock) { this.ConnectedBlock = connectedBlock; - this.Hash = this.ConnectedBlock.ChainedHeader.HashBlock.ToString(); + this.Hash = this.ConnectedBlock.ChainedHeader.HashBlock; this.Height = this.ConnectedBlock.ChainedHeader.Height; } } diff --git a/src/Blockcore/EventBus/CoreEvents/TransactionReceived.cs b/src/Blockcore/EventBus/CoreEvents/TransactionReceived.cs index d634a5d96..8b87d5d35 100644 --- a/src/Blockcore/EventBus/CoreEvents/TransactionReceived.cs +++ b/src/Blockcore/EventBus/CoreEvents/TransactionReceived.cs @@ -11,7 +11,7 @@ public class TransactionReceived : EventBase { public Transaction ReceivedTransaction { get; } - public string TxHash { get; set; } + public uint256 TxHash { get; set; } public bool IsCoinbase { get; set; } @@ -21,7 +21,7 @@ public TransactionReceived(Transaction receivedTransaction) { this.ReceivedTransaction = receivedTransaction; - this.TxHash = this.ReceivedTransaction.GetHash().ToString(); + this.TxHash = this.ReceivedTransaction.GetHash(); this.IsCoinbase = this.ReceivedTransaction.IsCoinBase; this.IsCoinstake = this.ReceivedTransaction.IsCoinStake; } diff --git a/src/Blockcore/EventBus/EventBase.cs b/src/Blockcore/EventBus/EventBase.cs index d7f0941ab..6c5375287 100644 --- a/src/Blockcore/EventBus/EventBase.cs +++ b/src/Blockcore/EventBus/EventBase.cs @@ -6,7 +6,7 @@ namespace Blockcore.EventBus /// /// Basic abstract implementation of . /// - /// + /// public abstract class EventBase { public Guid CorrelationId { get; } diff --git a/src/Features/Blockcore.Features.NodeHost/Events/EventSubscriptionService.cs b/src/Features/Blockcore.Features.NodeHost/Events/EventSubscriptionService.cs index 4e3e37751..7e4d8b980 100644 --- a/src/Features/Blockcore.Features.NodeHost/Events/EventSubscriptionService.cs +++ b/src/Features/Blockcore.Features.NodeHost/Events/EventSubscriptionService.cs @@ -13,11 +13,12 @@ using Microsoft.Extensions.Logging; using NBitcoin; using Blockcore.Utilities.Extensions; +using Blockcore.Utilities; namespace Blockcore.Features.NodeHost.Events { /// - /// This class subscribes to Stratis.Bitcoin.EventBus messages and proxy's them + /// This class subscribes to Blockcore.EventBus.EventBus messages and proxy's them /// to SignalR messages. /// public class EventSubscriptionService : IEventsSubscriptionService, IDisposable @@ -59,20 +60,23 @@ public void Init() } } + public void SetHub(IHubContext hubContext) where T : Hub + { + Guard.Assert(hubContext is IHubContext); + + this.HubContext = (IHubContext)hubContext; + } + private IHubContext HubContext { get { - if (this.hubContext == null) - { - if (Startup.Provider != null) - { - this.hubContext = Startup.Provider.GetService>(); - } - } - return this.hubContext; } + set + { + this.hubContext = value; + } } private void SubscribeToEvent(string name) @@ -207,7 +211,6 @@ public void OnEvent(EventBase @event) { this.log.LogError(ex, "Failed to send event to consumer."); } - } } } diff --git a/src/Features/Blockcore.Features.NodeHost/Startup.cs b/src/Features/Blockcore.Features.NodeHost/Startup.cs index ec64b67de..cc7ccc433 100644 --- a/src/Features/Blockcore.Features.NodeHost/Startup.cs +++ b/src/Features/Blockcore.Features.NodeHost/Startup.cs @@ -1,11 +1,14 @@ using System; using System.IO; using System.Linq; +using Blockcore.Broadcasters; +using Blockcore.Features.NodeHost.Events; using Blockcore.Features.NodeHost.Hubs; using Blockcore.Utilities.JsonConverters; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -17,11 +20,6 @@ namespace Blockcore.Features.NodeHost { public class Startup { - /// - /// Provides access to the service provider created by the ASP.NET runtime. - /// - public static IServiceProvider Provider { get; private set; } - public Startup(IWebHostEnvironment env, IFullNode fullNode) { this.fullNode = fullNode; @@ -140,8 +138,9 @@ public void ConfigureServices(IServiceCollection services) // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { - // This is needed to access context of the hubs. - Provider = app.ApplicationServices; + IHubContext hubContext = app.ApplicationServices.GetService>(); + IEventsSubscriptionService eventsSubscriptionService = fullNode.Services.ServiceProvider.GetService(); + eventsSubscriptionService.SetHub(hubContext); NodeHostSettings hostSettings = fullNode.Services.ServiceProvider.GetService(); From 4f8af1b0708fad770dff168a57cad81014ce9cf2 Mon Sep 17 00:00:00 2001 From: SondreB Date: Thu, 14 May 2020 09:31:58 +0200 Subject: [PATCH 08/14] Remove the Hash and Height - We're returning the whole object in the evernt, no longer needed to read out hash and height. --- src/Blockcore/EventBus/CoreEvents/BlockConnected.cs | 6 ------ src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs b/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs index 71f9005ae..e77ba7338 100644 --- a/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs +++ b/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs @@ -10,15 +10,9 @@ public class BlockConnected : EventBase { public ChainedHeaderBlock ConnectedBlock { get; } - public string Hash { get; set; } - - public int Height { get; set; } - public BlockConnected(ChainedHeaderBlock connectedBlock) { this.ConnectedBlock = connectedBlock; - this.Hash = this.ConnectedBlock.ChainedHeader.HashBlock.ToString(); - this.Height = this.ConnectedBlock.ChainedHeader.Height; } } } \ No newline at end of file diff --git a/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs b/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs index 0fa4ee714..a75f8902b 100644 --- a/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs +++ b/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs @@ -26,7 +26,7 @@ public class NodeHostSettings public int ApiPort { get; set; } /// - /// If true then the node will add and start the SignalR feature. This should never be enabled if node is accessible to the public. + /// If true then the node will add and start the Web Socket feature. This should never be enabled if node is accessible to the public. /// public bool EnableWS { get; private set; } From b1794b4233539d9a0027ebe7663a3ec1be2c35e6 Mon Sep 17 00:00:00 2001 From: SondreB Date: Thu, 14 May 2020 09:33:36 +0200 Subject: [PATCH 09/14] Revert "Remove the Hash and Height" This reverts commit 4f8af1b0708fad770dff168a57cad81014ce9cf2. --- src/Blockcore/EventBus/CoreEvents/BlockConnected.cs | 6 ++++++ src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs b/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs index e77ba7338..71f9005ae 100644 --- a/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs +++ b/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs @@ -10,9 +10,15 @@ public class BlockConnected : EventBase { public ChainedHeaderBlock ConnectedBlock { get; } + public string Hash { get; set; } + + public int Height { get; set; } + public BlockConnected(ChainedHeaderBlock connectedBlock) { this.ConnectedBlock = connectedBlock; + this.Hash = this.ConnectedBlock.ChainedHeader.HashBlock.ToString(); + this.Height = this.ConnectedBlock.ChainedHeader.Height; } } } \ No newline at end of file diff --git a/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs b/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs index a75f8902b..0fa4ee714 100644 --- a/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs +++ b/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs @@ -26,7 +26,7 @@ public class NodeHostSettings public int ApiPort { get; set; } /// - /// If true then the node will add and start the Web Socket feature. This should never be enabled if node is accessible to the public. + /// If true then the node will add and start the SignalR feature. This should never be enabled if node is accessible to the public. /// public bool EnableWS { get; private set; } From f1bff6fe6e82007de53a45e7592f091add2ed293 Mon Sep 17 00:00:00 2001 From: SondreB Date: Thu, 14 May 2020 09:39:03 +0200 Subject: [PATCH 10/14] Move the resolving of HubContext so it only runs when WS is enabled - Minor cleanup of events, removing older properties. --- src/Blockcore/EventBus/CoreEvents/BlockConnected.cs | 6 ------ .../EventBus/CoreEvents/TransactionReceived.cs | 10 ---------- .../Events/EventSubscriptionService.cs | 7 +++---- src/Features/Blockcore.Features.NodeHost/Startup.cs | 8 ++++---- .../Blockcore.Features.NodeHost/WebHostSettings.cs | 2 +- 5 files changed, 8 insertions(+), 25 deletions(-) diff --git a/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs b/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs index dd637f9cc..c7cf3881f 100644 --- a/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs +++ b/src/Blockcore/EventBus/CoreEvents/BlockConnected.cs @@ -11,15 +11,9 @@ public class BlockConnected : EventBase { public ChainedHeaderBlock ConnectedBlock { get; } - public uint256 Hash { get; set; } - - public int Height { get; set; } - public BlockConnected(ChainedHeaderBlock connectedBlock) { this.ConnectedBlock = connectedBlock; - this.Hash = this.ConnectedBlock.ChainedHeader.HashBlock; - this.Height = this.ConnectedBlock.ChainedHeader.Height; } } } \ No newline at end of file diff --git a/src/Blockcore/EventBus/CoreEvents/TransactionReceived.cs b/src/Blockcore/EventBus/CoreEvents/TransactionReceived.cs index 8b87d5d35..47cbf7794 100644 --- a/src/Blockcore/EventBus/CoreEvents/TransactionReceived.cs +++ b/src/Blockcore/EventBus/CoreEvents/TransactionReceived.cs @@ -11,19 +11,9 @@ public class TransactionReceived : EventBase { public Transaction ReceivedTransaction { get; } - public uint256 TxHash { get; set; } - - public bool IsCoinbase { get; set; } - - public bool IsCoinstake { get; set; } - public TransactionReceived(Transaction receivedTransaction) { this.ReceivedTransaction = receivedTransaction; - - this.TxHash = this.ReceivedTransaction.GetHash(); - this.IsCoinbase = this.ReceivedTransaction.IsCoinBase; - this.IsCoinstake = this.ReceivedTransaction.IsCoinStake; } } } \ No newline at end of file diff --git a/src/Features/Blockcore.Features.NodeHost/Events/EventSubscriptionService.cs b/src/Features/Blockcore.Features.NodeHost/Events/EventSubscriptionService.cs index 7e4d8b980..ac4dd7a06 100644 --- a/src/Features/Blockcore.Features.NodeHost/Events/EventSubscriptionService.cs +++ b/src/Features/Blockcore.Features.NodeHost/Events/EventSubscriptionService.cs @@ -8,18 +8,17 @@ using Blockcore.EventBus; using Blockcore.Features.NodeHost.Hubs; using Blockcore.Signals; +using Blockcore.Utilities; +using Blockcore.Utilities.Extensions; using Microsoft.AspNetCore.SignalR; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NBitcoin; -using Blockcore.Utilities.Extensions; -using Blockcore.Utilities; namespace Blockcore.Features.NodeHost.Events { /// /// This class subscribes to Blockcore.EventBus.EventBus messages and proxy's them - /// to SignalR messages. + /// to Web Socket messages. /// public class EventSubscriptionService : IEventsSubscriptionService, IDisposable { diff --git a/src/Features/Blockcore.Features.NodeHost/Startup.cs b/src/Features/Blockcore.Features.NodeHost/Startup.cs index cc7ccc433..d1fe9a4e1 100644 --- a/src/Features/Blockcore.Features.NodeHost/Startup.cs +++ b/src/Features/Blockcore.Features.NodeHost/Startup.cs @@ -138,10 +138,6 @@ public void ConfigureServices(IServiceCollection services) // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { - IHubContext hubContext = app.ApplicationServices.GetService>(); - IEventsSubscriptionService eventsSubscriptionService = fullNode.Services.ServiceProvider.GetService(); - eventsSubscriptionService.SetHub(hubContext); - NodeHostSettings hostSettings = fullNode.Services.ServiceProvider.GetService(); app.UseStaticFiles(); @@ -162,6 +158,10 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) if (hostSettings.EnableWS) { + IHubContext hubContext = app.ApplicationServices.GetService>(); + IEventsSubscriptionService eventsSubscriptionService = fullNode.Services.ServiceProvider.GetService(); + eventsSubscriptionService.SetHub(hubContext); + endpoints.MapHub("/ws-events"); endpoints.MapHub("/ws"); } diff --git a/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs b/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs index 0fa4ee714..a75f8902b 100644 --- a/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs +++ b/src/Features/Blockcore.Features.NodeHost/WebHostSettings.cs @@ -26,7 +26,7 @@ public class NodeHostSettings public int ApiPort { get; set; } /// - /// If true then the node will add and start the SignalR feature. This should never be enabled if node is accessible to the public. + /// If true then the node will add and start the Web Socket feature. This should never be enabled if node is accessible to the public. /// public bool EnableWS { get; private set; } From 9aa82cad276b73ba119143126454ed740b7e3acf Mon Sep 17 00:00:00 2001 From: SondreB Date: Thu, 14 May 2020 11:29:20 +0200 Subject: [PATCH 11/14] Remove hardcoded URL to JS and WS endpoints - Update to use relative path when hosted on the NodeHost. - Add JsonIgnore on objects that can't serialize. This needs to be added to more. --- src/Blockcore/Base/InitialBlockDownloadState.cs | 6 +++--- src/Blockcore/EventBus/CoreEvents/Peer/PeerEventBase.cs | 2 ++ .../EventBus/CoreEvents/Peer/PeerMessageSendFailure.cs | 2 ++ .../Blockcore.Features.NodeHost.csproj | 7 ------- src/Features/Blockcore.Features.NodeHost/Startup.cs | 6 +++++- .../UI/wwwroot/ws-ui/index.html | 6 +++--- .../Blockcore.Features.NodeHost/UI/wwwroot/ws-ui/node.html | 4 ++-- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/Blockcore/Base/InitialBlockDownloadState.cs b/src/Blockcore/Base/InitialBlockDownloadState.cs index c52741f1c..fdc6e70b1 100644 --- a/src/Blockcore/Base/InitialBlockDownloadState.cs +++ b/src/Blockcore/Base/InitialBlockDownloadState.cs @@ -53,13 +53,13 @@ public InitialBlockDownloadState(IChainState chainState, Network network, Consen /// public bool IsInitialBlockDownload() { - if (this.lastCheckpointHeight > this.chainState.ConsensusTip.Height) + if (this.lastCheckpointHeight > this.chainState.ConsensusTip?.Height) return true; - if (this.chainState.ConsensusTip.Header.BlockTime < (this.dateTimeProvider.GetUtcNow().AddSeconds(-this.consensusSettings.MaxTipAge))) + if (this.chainState.ConsensusTip?.Header.BlockTime < (this.dateTimeProvider.GetUtcNow().AddSeconds(-this.consensusSettings.MaxTipAge))) return true; - if (this.chainState.ConsensusTip.ChainWork < this.minimumChainWork) + if (this.chainState.ConsensusTip?.ChainWork < this.minimumChainWork) return true; return false; diff --git a/src/Blockcore/EventBus/CoreEvents/Peer/PeerEventBase.cs b/src/Blockcore/EventBus/CoreEvents/Peer/PeerEventBase.cs index 03b31c764..c654088db 100644 --- a/src/Blockcore/EventBus/CoreEvents/Peer/PeerEventBase.cs +++ b/src/Blockcore/EventBus/CoreEvents/Peer/PeerEventBase.cs @@ -1,4 +1,5 @@ using System.Net; +using Newtonsoft.Json; namespace Blockcore.EventBus.CoreEvents.Peer { @@ -14,6 +15,7 @@ public abstract class PeerEventBase : EventBase /// /// The peer end point. /// + [JsonIgnore] public IPEndPoint PeerEndPoint { get; } public PeerEventBase(IPEndPoint peerEndPoint) diff --git a/src/Blockcore/EventBus/CoreEvents/Peer/PeerMessageSendFailure.cs b/src/Blockcore/EventBus/CoreEvents/Peer/PeerMessageSendFailure.cs index 0caa21291..940fd7f2b 100644 --- a/src/Blockcore/EventBus/CoreEvents/Peer/PeerMessageSendFailure.cs +++ b/src/Blockcore/EventBus/CoreEvents/Peer/PeerMessageSendFailure.cs @@ -1,5 +1,6 @@ using System.Net; using Blockcore.P2P.Protocol; +using Newtonsoft.Json; namespace Blockcore.EventBus.CoreEvents.Peer { @@ -14,6 +15,7 @@ public class PeerMessageSendFailure : PeerEventBase /// public Message Message { get; } + [JsonIgnore] public System.Exception Exception { get; } public PeerMessageSendFailure(IPEndPoint peerEndPoint, Message message, System.Exception exception) : base(peerEndPoint) diff --git a/src/Features/Blockcore.Features.NodeHost/Blockcore.Features.NodeHost.csproj b/src/Features/Blockcore.Features.NodeHost/Blockcore.Features.NodeHost.csproj index 1fffa3a54..18bce4098 100644 --- a/src/Features/Blockcore.Features.NodeHost/Blockcore.Features.NodeHost.csproj +++ b/src/Features/Blockcore.Features.NodeHost/Blockcore.Features.NodeHost.csproj @@ -37,11 +37,4 @@ - - - - - - - \ No newline at end of file diff --git a/src/Features/Blockcore.Features.NodeHost/Startup.cs b/src/Features/Blockcore.Features.NodeHost/Startup.cs index d1fe9a4e1..7088f8d75 100644 --- a/src/Features/Blockcore.Features.NodeHost/Startup.cs +++ b/src/Features/Blockcore.Features.NodeHost/Startup.cs @@ -91,6 +91,7 @@ public void ConfigureServices(IServiceCollection services) var settings = new JsonSerializerSettings(); Serializer.RegisterFrontConverters(settings); options.PayloadSerializerSettings = settings; + options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; }); } @@ -101,7 +102,10 @@ public void ConfigureServices(IServiceCollection services) options.Filters.Add(typeof(LoggingActionFilter)); }) // add serializers for NBitcoin objects - .AddNewtonsoftJson(options => Serializer.RegisterFrontConverters(options.SerializerSettings)) + .AddNewtonsoftJson(options => { + Serializer.RegisterFrontConverters(options.SerializerSettings); + options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; + }) .AddControllers(this.fullNode.Services.Features, services); services.AddSwaggerGen( diff --git a/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/ws-ui/index.html b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/ws-ui/index.html index 447c7b6e9..5a159cf71 100644 --- a/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/ws-ui/index.html +++ b/src/Features/Blockcore.Features.NodeHost/UI/wwwroot/ws-ui/index.html @@ -4,7 +4,7 @@ Blockcore: Web Socket Events - +