feat: changes how to serve client app files

.github/workflows/build.yml

@@ -34,6 +34,11 @@ jobs:
       with:
         dotnet-version: 3.1.403
 
+    - name: Use Node 14.x
+      uses: actions/setup-node@v1
+      with:
+        node-version: '14.x'
+
     - name: Build
       run: dotnet build ./src/KafkaFlow.sln -c Release
 

samples/KafkaFlow.Sample.Dashboard/Startup.cs

@@ -31,7 +31,6 @@ public void ConfigureServices(IServiceCollection services)
             );
 
             services
-                .AddKafkaFlowDashboard()
                 .AddControllers();
         }
 

src/KafkaFlow.Admin.Dashboard/ApplicationBuilderExtensions.cs

@@ -1,6 +1,9 @@
 namespace KafkaFlow.Admin.Dashboard
 {
+    using System.Reflection;
     using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.Extensions.FileProviders;
 
     /// <summary>
     /// Extension methods over IApplicationBuilder
@@ -14,8 +17,25 @@ public static class ApplicationBuilderExtensions
         /// <returns></returns>
         public static IApplicationBuilder UseKafkaFlowDashboard(this IApplicationBuilder app)
         {
-            app
-                .UseMiddleware<ServeClientFilesMiddleware>();
+            app.Map(
+                "/kafka-flow",
+                builder =>
+                {
+                    var provider = new ManifestEmbeddedFileProvider(
+                        Assembly.GetAssembly(typeof(ApplicationBuilderExtensions)),
+                        "ClientApp/dist");
+
+                    builder.UseStaticFiles(new StaticFileOptions { FileProvider = provider });
+
+                    builder.Run(
+                        async context =>
+                        {
+                            if (context.Request.Path == "/")
+                            {
+                                await context.Response.SendFileAsync(provider.GetFileInfo("index.html"));
+                            }
+                        });
+                });
 
             return app;
         }

src/KafkaFlow.Admin.Dashboard/KafkaFlow.Admin.Dashboard.csproj

@@ -5,7 +5,8 @@
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <IsPackable>true</IsPackable>
-    <OutputType>Library</OutputType>    
+    <OutputType>Library</OutputType>
+    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,4 +15,8 @@
     <EmbeddedResource Include="ClientApp\dist\*.js" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.16" />
+  </ItemGroup>
+
 </Project>

src/KafkaFlow.Admin/Extensions/ClusterConfigurationBuilderExtensions.cs

@@ -1,14 +1,10 @@
 namespace KafkaFlow
 {
     using System;
-    using System.Linq;
     using System.Reflection;
     using KafkaFlow.Admin;
     using KafkaFlow.Admin.Handlers;
-    using KafkaFlow.Admin.Messages;
     using KafkaFlow.Configuration;
-    using KafkaFlow.Consumers;
-    using KafkaFlow.Producers;
     using KafkaFlow.Serializer;
     using KafkaFlow.TypedHandler;
     using Microsoft.Extensions.Caching.Memory;
@@ -30,10 +26,8 @@ public static IClusterConfigurationBuilder EnableAdminMessages(
             string adminTopic,
             string adminConsumerGroup)
         {
-            cluster.DependencyConfigurator.AddSingleton<IAdminProducer, AdminProducer>();
-
-            cluster.DependencyConfigurator.AddSingleton<IMemoryCache, MemoryCache>();
-            cluster.DependencyConfigurator.AddSingleton<ITelemetryStorage, MemoryCacheTelemetryStorage>();
+            cluster.DependencyConfigurator
+                .AddSingleton<IAdminProducer, AdminProducer>();
 
             return cluster
                 .AddProducer<AdminProducer>(
@@ -80,8 +74,10 @@ public static IClusterConfigurationBuilder EnableTelemetry(
             string topicName,
             string consumerGroup)
         {
-            cluster.DependencyConfigurator.AddSingleton<IMemoryCache, MemoryCache>();
-            cluster.DependencyConfigurator.AddSingleton<ITelemetryStorage, MemoryCacheTelemetryStorage>();
+            cluster.DependencyConfigurator
+                .AddSingleton<IMemoryCache, MemoryCache>()
+                .AddSingleton<ITelemetryStorage, MemoryCacheTelemetryStorage>()
+                .AddSingleton<ITelemetryScheduler, TelemetryScheduler>();
 
             var groupId = $"{consumerGroup}-{Environment.MachineName}-{Convert.ToBase64String(Guid.NewGuid().ToByteArray())}";
             var name = $"telemetry-{Convert.ToBase64String(Guid.NewGuid().ToByteArray())}";

src/KafkaFlow.Admin/TelemetryScheduler.cs

@@ -25,40 +25,18 @@ public void Start(string key, string topicName)
             var consumers = this.dependencyResolver
                 .Resolve<IConsumerAccessor>()
                 .All
-                .Where(c => !c.ManagementDisabled &&
-                            c.ClusterName.Equals(this.dependencyResolver
-                                .Resolve<IConsumerAccessor>()[key]
-                                .ClusterName));
+                .Where(
+                    c => !c.ManagementDisabled &&
+                         c.ClusterName.Equals(
+                             this.dependencyResolver
+                                 .Resolve<IConsumerAccessor>()[key]
+                                 .ClusterName))
+                .ToList();
 
             var producer = this.dependencyResolver.Resolve<IProducerAccessor>().GetProducer(key);
 
             this.timers[key] = new Timer(
-                _ =>
-                {
-                    producer.BatchProduceAsync(
-                            consumers.SelectMany(c => c.Assignment.Select(a =>
-                                    new BatchProduceItem(
-                                        topicName,
-                                        Guid.NewGuid(),
-                                        new ConsumerMetric()
-                                        {
-                                            ConsumerName = c.ConsumerName,
-                                            Topic = a.Topic,
-                                            GroupId = c.GroupId,
-                                            InstanceName = $"{Environment.MachineName}-{c.MemberId}",
-                                            PausedPartitions = c.PausedPartitions
-                                                .Where(p => p.Topic == a.Topic)
-                                                .Select(p => p.Partition.Value),
-                                            RunningPartitions = c.RunningPartitions
-                                                .Where(p => p.Topic == a.Topic)
-                                                .Select(p => p.Partition.Value),
-                                            SentAt = DateTime.Now,
-                                        },
-                                        null)))
-                                .ToList())
-                        .GetAwaiter()
-                        .GetResult();
-                },
+                _ => ProduceTelemetry(topicName, consumers, producer),
                 null,
                 TimeSpan.Zero,
                 TimeSpan.FromSeconds(1));
@@ -72,5 +50,33 @@ public void Stop(string key)
                 this.timers.Remove(key);
             }
         }
+
+        private static void ProduceTelemetry(
+            string topicName,
+            IReadOnlyCollection<IMessageConsumer> consumers,
+            IMessageProducer producer)
+        {
+            var items = consumers.SelectMany(
+                c => c.Assignment.Select(
+                    a => new ConsumerMetric()
+                    {
+                        ConsumerName = c.ConsumerName,
+                        Topic = a.Topic,
+                        GroupId = c.GroupId,
+                        InstanceName = $"{Environment.MachineName}-{c.MemberId}",
+                        PausedPartitions = c.PausedPartitions
+                            .Where(p => p.Topic == a.Topic)
+                            .Select(p => p.Partition.Value),
+                        RunningPartitions = c.RunningPartitions
+                            .Where(p => p.Topic == a.Topic)
+                            .Select(p => p.Partition.Value),
+                        SentAt = DateTime.Now,
+                    }));
+
+            foreach (var item in items)
+            {
+                producer.Produce(topicName, Guid.NewGuid().ToByteArray(), item);
+            }
+        }
     }
-}
+}