feat: add React UI

- generate TypeScript client by kiota and dotnet swagger - migrate to .NET 8 - update Microsoft.Diagnostics.Runtime
Ne4to · Jan 17, 2024 · bc9b652 · bc9b652
1 parent 57243dc
commit bc9b652
Show file tree

Hide file tree

Showing 51 changed files with 2,429 additions and 204 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "microsoft.openapi.kiota": {
+      "version": "1.10.1",
+      "commands": [
+        "kiota"
+      ]
+    },
+    "swashbuckle.aspnetcore.cli": {
+      "version": "6.5.0",
+      "commands": [
+        "swagger"
+      ]
+    }
+  }
+}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/scripts/update-ts-client.ps1 b/scripts/update-ts-client.ps1
@@ -0,0 +1,28 @@
+$ErrorActionPreference = "Stop"
+
+$RepositoryRoot = Split-Path $PSScriptRoot
+$FrontendRoot = Join-Path $RepositoryRoot 'src/Heartbeat.WebUI/ClientApp'
+$ContractPath = Join-Path $FrontendRoot 'api.yml'
+$DllPath = Join-Path $RepositoryRoot 'src/Heartbeat.WebUI/bin/Debug/net8.0/Heartbeat.WebUI.dll'
+
+Push-Location
+try
+{
+    Set-Location $RepositoryRoot
+
+    dotnet tool restore
+    dotnet build --configuration Debug
+
+    Set-Location $FrontendRoot
+    dotnet swagger tofile --yaml --output $ContractPath $DllPath Heartbeat
+    dotnet kiota generate -l typescript --openapi $ContractPath -c HeartbeatClient -o ./src/client
+
+    # TODO try  --serializer  Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory --deserializer Microsoft.Kiota.Serialization.Json.JsonParseNodeFactory
+}
+catch {
+    Write-Host 'Generate client - FAILED!' -ForegroundColor Red
+    throw
+}
+finally {
+    Pop-Location
+}
diff --git a/src/.config/dotnet-tools.json b/src/.config/dotnet-tools.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "microsoft.openapi.kiota": {
+      "version": "1.10.1",
+      "commands": [
+        "kiota"
+      ]
+    },
+    "swashbuckle.aspnetcore.cli": {
+      "version": "6.5.0",
+      "commands": [
+        "swagger"
+      ]
+    }
+  }
+}
diff --git a/src/DebugHost/DebugHost.csproj b/src/DebugHost/DebugHost.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.3.405304" />
+      <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.456101" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Heartbeat.Domain/Size.cs b/src/Heartbeat.Domain/Size.cs
@@ -6,6 +6,8 @@ public readonly record struct Size(ulong Bytes) : IComparable<Size>, IComparable
     private const ulong _mb = _k * _k;
     private const ulong _gb = _mb * _k;
 
+    public static implicit operator ulong(Size bytes) => bytes.Bytes;
+
     public override string ToString()
     {
         if (Bytes >= _gb)

diff --git a/src/Heartbeat.Runtime/Analyzers/AsyncStateMachineAnalyzer.cs b/src/Heartbeat.Runtime/Analyzers/AsyncStateMachineAnalyzer.cs
@@ -176,7 +176,8 @@ from clrObject in Context.EnumerateObjects(TraversingHeapMode)
 
         foreach (var (_, token) in coreLibModule.EnumerateTypeDefToMethodTableMap())
         {
-            var clrType = coreLibModule.ResolveToken(token);
+            // TODO var clrType = coreLibModule.ResolveToken(token);
+            ClrType? clrType = null;
             if (clrType?.Name == null)
             {
                 continue;

diff --git a/src/Heartbeat.Runtime/Extensions/ClrHeapExtensions.cs b/src/Heartbeat.Runtime/Extensions/ClrHeapExtensions.cs
@@ -15,8 +15,8 @@ public static class ClrHeapExtensions
             {
                 if (mt == methodTable)
                 {
-                    var clrType = module.ResolveToken(token);
-                    return clrType;
+                    // TODO var clrType = module.ResolveToken(token);
+                    // return clrType;
                 }
             }
         }

diff --git a/src/Heartbeat.Runtime/Extensions/ClrTypeExtensions.cs b/src/Heartbeat.Runtime/Extensions/ClrTypeExtensions.cs
@@ -8,8 +8,9 @@ public static string GetClrTypeName(this ClrType clrType)
     {
         return !string.IsNullOrWhiteSpace(clrType.Name)
             ? clrType.Name
-            : (clrType.IsInternal
-                ? $"Internal {clrType.Module}"
-                : $"UNKNOWN {clrType.Module}");
+            : $"UNKNOWN {clrType.Module}";
+        // TODO : (clrType.IsInternal
+        //     ? $"Internal {clrType.Module}"
+        //     : $"UNKNOWN {clrType.Module}");
     }
 }
diff --git a/src/Heartbeat.Runtime/HeapIndex.cs b/src/Heartbeat.Runtime/HeapIndex.cs
@@ -1,23 +1,20 @@
-using Heartbeat.Runtime.Proxies;
-
 using Microsoft.Diagnostics.Runtime;
-using Microsoft.Diagnostics.Runtime.Implementation;
 
 namespace Heartbeat.Runtime;
 
 public sealed class HeapIndex
 {
-    private readonly ObjectSet _roots;
-    private readonly ObjectSet _walkableFromRoot;
+    private readonly HashSet<ulong> _roots;
+    private readonly HashSet<ulong> _walkableFromRoot;
     private readonly Dictionary<ulong, List<ulong>> _referencesToObject = new(100000);
 
     public HeapIndex(ClrHeap heap)
     {
         // Evaluation stack
         Stack<ulong> eval = new();
 
-        _roots = new ObjectSet(heap);
-        _walkableFromRoot = new ObjectSet(heap);
+        _roots = new HashSet<ulong>();
+        _walkableFromRoot = new HashSet<ulong>();
 
         foreach (var clrRoot in heap.EnumerateRoots())
         {

diff --git a/src/Heartbeat.Runtime/Heartbeat.Runtime.csproj b/src/Heartbeat.Runtime/Heartbeat.Runtime.csproj
@@ -9,9 +9,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.3.405304" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.33">
+        <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.456101" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/src/Heartbeat.Runtime/LogExtensions.cs b/src/Heartbeat.Runtime/LogExtensions.cs
@@ -22,7 +22,7 @@ public static void LogHeapSegments(this ClrHeap heap, ILogger logger)
                 $"\t{segment} ObjectRange: {segment.ObjectRange} {Size.ToString(segment.ObjectRange.Length)} " +
                 $"CommittedMemory: {segment.CommittedMemory} {Size.ToString(segment.CommittedMemory.Length)} " +
                 $"ReservedMemory: {segment.ReservedMemory} {Size.ToString(segment.ReservedMemory.Length)} " +
-                $"IsEphemeralSegment: {segment.IsEphemeralSegment}, IsLargeObjectSegment: {segment.IsLargeObjectSegment}");
+                $"IsEphemeralSegment: {segment.Kind == GCSegmentKind.Ephemeral}, IsLargeObjectSegment: {segment.Kind == GCSegmentKind.Large}");
 
             totalSize += segment.Length;
         }
@@ -584,9 +584,9 @@ public static void LogThreads(
                 string[] propNames =
                 {
                     nameof(ClrThread.IsAlive),
-                    nameof(ClrThread.IsBackground),
+                    // nameof(ClrThread.IsBackground),
                     nameof(ClrThread.IsFinalizer),
-                    nameof(ClrThread.IsDebugSuspended),
+                    // nameof(ClrThread.IsDebugSuspended),
                 };
 
                 var logLineBuilder = new StringBuilder();
@@ -760,7 +760,7 @@ from clrObject in heap.EnumerateObjects()
             where type != null
                   && !type.IsFree
                   //                            && !type.IsString
-                  && !type.IsInternal
+                  // && !type.IsInternal
             orderby clrObject.Size descending
             select clrObject;
 

diff --git a/src/Heartbeat.Web/Pages/Index.razor b/src/Heartbeat.Web/Pages/Index.razor
@@ -57,9 +57,9 @@
         Segments = Context.Heap.Segments.Select(s => new HeapSegment(
                 new Address(s.Start),
                 new Address(s.End),
-                s.IsEphemeralSegment,
-                s.IsLargeObjectSegment,
-                s.IsPinnedObjectSegment)).ToArray();
+                s.Kind == GCSegmentKind.Ephemeral,
+                s.Kind == GCSegmentKind.Large,
+                s.Kind == GCSegmentKind.Pinned)).ToArray();
     }
 
 }
diff --git a/src/Heartbeat.WebUI/ClientApp/.env b/src/Heartbeat.WebUI/ClientApp/.env
@@ -1 +1,3 @@
 BROWSER=none
+# https://stackoverflow.com/questions/70599784/failed-to-parse-source-map
+GENERATE_SOURCEMAP=false