Benchmark: Added a way to mass load all available profiles -- current…

…ly not working. HeadlessServer: Added --loadonly flag to only attempt to load the class profile then exit. Core: FrameConfig: Added a way to just Load the config. Core: DependencyInjection: When loading the FrameConfig be more verbose about the error messages.
Xian55 · Sep 8, 2024 · f5395a6 · f5395a6
1 parent f61cc88
commit f5395a6
Show file tree

Hide file tree

Showing 11 changed files with 183 additions and 62 deletions.
diff --git a/.bat/json_find_most_requirement_count.ps1 b/.bat/json_find_most_requirement_count.ps1
@@ -0,0 +1,32 @@
+# Define the folder path
+$folderPath = "..\JSON\class"
+
+# Initialize a variable to store the result
+$maxCount = 0
+$maxFile = ""
+
+# Get all files in the folder
+$files = Get-ChildItem -Path $folderPath -File
+
+# Iterate through each file
+foreach ($file in $files) {
+    # Read the file content
+    $content = Get-Content -Path $file.FullName
+
+    # Count occurrences of the word "Requirement"
+    $count = [regex]::Matches($content, "Requirement", [System.Text.RegularExpressions.RegexOptions]::IgnoreCase).Count
+
+    # Check if this file has more occurrences than the current maximum
+    if ($count -gt $maxCount) {
+        $maxCount = $count
+        $maxFile = $file.FullName
+    }
+}
+
+# Output the result
+if ($maxFile -ne "") {
+    Write-Output "File with the most occurrences of 'Requirement': $maxFile"
+    Write-Output "Occurrences count: $maxCount"
+} else {
+    Write-Output "No files found in the specified folder."
+}
diff --git a/.bat/link_json_to_benchmark_release.bat b/.bat/link_json_to_benchmark_release.bat
@@ -0,0 +1,2 @@
+mklink /J "..\Benchmarks\bin\Release\Json" "..\Json"
+PAUSE
diff --git a/Benchmarks/Benchmarks.csproj b/Benchmarks/Benchmarks.csproj
@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
+    <ProjectReference Include="..\HeadlessServer\HeadlessServer.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Benchmarks/ClassProfile/LoadAllProfiles.cs b/Benchmarks/ClassProfile/LoadAllProfiles.cs
@@ -0,0 +1,43 @@
+using BenchmarkDotNet.Attributes;
+
+using HeadlessServer;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using WinAPI;
+
+namespace Benchmarks.ClassProfile;
+
+public class LoadAllProfiles
+{
+    [Benchmark]
+    [ArgumentsSource(nameof(GetProfileNames))]
+    public void LoadProfile(string profileName)
+    {
+        // TODO: fix loading error frame_config.json not exists
+        HeadlessServer.Program.Main([$"{profileName}", "-m Local", "--loadonly"]);
+    }
+
+    public static IEnumerable<string> GetProfileNames()
+    {
+        var dataConfig = DataConfig.Load();
+
+        Directory.SetCurrentDirectory("..\\..\\..\\..\\HeadlessServer");
+
+        var root = Path.Join(dataConfig.Class, Path.DirectorySeparatorChar.ToString());
+        var files = Directory.EnumerateFiles(root, "*.json*", SearchOption.AllDirectories)
+            .Select(path => path.Replace(root, string.Empty))
+            .OrderBy(x => x, new NaturalStringComparer());
+
+        yield return files.First();
+
+        //foreach (var fileName in files)
+        //{
+        //    yield return fileName;
+        //}
+    }
+}
diff --git a/Core/DataFrame/FrameConfig.cs b/Core/DataFrame/FrameConfig.cs
@@ -25,7 +25,7 @@ public static bool IsValid(Rectangle rect, Version addonVersion)
     {
         try
         {
-            var config = JsonConvert.DeserializeObject<DataFrameConfig>(File.ReadAllText(FrameConfigMeta.DefaultFilename));
+            var config = Load();
 
             bool sameVersion = config.Version == FrameConfigMeta.Version;
             bool sameAddonVersion = config.AddonVersion == addonVersion;
@@ -38,11 +38,16 @@ public static bool IsValid(Rectangle rect, Version addonVersion)
         }
     }
 
+    public static DataFrameConfig Load()
+    {
+        return JsonConvert.DeserializeObject<DataFrameConfig>(File.ReadAllText(FrameConfigMeta.DefaultFilename));
+    }
+
     public static DataFrame[] LoadFrames()
     {
         if (Exists())
         {
-            var config = JsonConvert.DeserializeObject<DataFrameConfig>(File.ReadAllText(FrameConfigMeta.DefaultFilename));
+            var config = Load();
             if (config.Version == FrameConfigMeta.Version)
                 return config.Frames;
         }
@@ -52,7 +57,7 @@ public static DataFrame[] LoadFrames()
 
     public static DataFrameMeta LoadMeta()
     {
-        var config = JsonConvert.DeserializeObject<DataFrameConfig>(File.ReadAllText(FrameConfigMeta.DefaultFilename));
+        var config = Load();
         if (config.Version == FrameConfigMeta.Version)
             return config.Meta;
 

diff --git a/Core/DependencyInjection.cs b/Core/DependencyInjection.cs
@@ -254,15 +254,27 @@ public static bool AddWoWProcess(
         }
 
         NativeMethods.GetWindowRect(process.MainWindowHandle, out Rectangle rect);
-        if (FrameConfig.Exists() && !FrameConfig.IsValid(rect, installVersion))
+        if (!FrameConfig.Exists())
+        {
+            log.LogError($"{nameof(FrameConfig)} doesn't exists!");
+
+            return false;
+        }
+
+        if (!FrameConfig.IsValid(rect, installVersion))
         {
             // At this point the webpage never loads so fallback to configuration page
             FrameConfig.Delete();
-            log.LogError($"{nameof(FrameConfig)} doesn't exists or window rect is different then config!");
+
+            log.LogError($"{nameof(FrameConfig)} window rect is different then config!");
+            log.LogError($"{nameof(FrameConfig)} {rect}");
+            log.LogError($"{nameof(FrameConfig)} {installVersion}");
+            log.LogError($"{nameof(FrameConfig)} {FrameConfig.Load()}");
 
             return false;
         }
 
+
         return true;
     }
 

diff --git a/HeadlessServer/HeadlessServer.cs b/HeadlessServer/HeadlessServer.cs
@@ -1,5 +1,7 @@
 using CommandLine;
+
 using Core;
+
 using Microsoft.Extensions.Logging;
 
 namespace HeadlessServer;
@@ -23,7 +25,8 @@ public HeadlessServer(ILogger<HeadlessServer> logger,
         SpellBookReader spellBookReader,
         BagReader bagReader,
         ExecGameCommand exec,
-        AddonConfigurator addonConfigurator, Wait wait)
+        AddonConfigurator addonConfigurator,
+        Wait wait)
     {
         this.logger = logger;
         this.botController = botController;
@@ -45,6 +48,11 @@ public void Run(ParserResult<RunOptions> options)
         botController.ToggleBotStatus();
     }
 
+    public void RunLoadOnly(ParserResult<RunOptions> options)
+    {
+        botController.LoadClassProfile(options.Value.ClassConfig!);
+    }
+
     private void InitState()
     {
         addonReader.FullReset();

diff --git a/HeadlessServer/HeadlessServer.csproj b/HeadlessServer/HeadlessServer.csproj
@@ -1,59 +1,62 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Platforms>AnyCPU;x64;x86</Platforms>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<ApplicationManifest>app.manifest</ApplicationManifest>
+		<Platforms>AnyCPU;x64;x86</Platforms>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="headless_appsettings.Development.json" />
-    <None Remove="headless_appsettings.json" />
-  </ItemGroup>
+	<ItemGroup>
+		<None Remove="headless_appsettings.Development.json" />
+		<None Remove="headless_appsettings.json" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Include="headless_appsettings.Development.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="headless_appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
+	<ItemGroup>
+		<Content Include="headless_appsettings.Development.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+		</Content>
+		<Content Include="headless_appsettings.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+		</Content>
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="CommandLineParser" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
-    <PackageReference Include="Serilog.Expressions" />
-    <PackageReference Include="Serilog.Extensions.Logging" />
-    <PackageReference Include="Serilog.Settings.Configuration" />
-    <PackageReference Include="Serilog.Sinks.Console" />
-    <PackageReference Include="Serilog.Sinks.Debug" />
-    <PackageReference Include="Serilog.Sinks.File" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="CommandLineParser" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" />
+		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
+		<PackageReference Include="Serilog.Expressions" />
+		<PackageReference Include="Serilog.Extensions.Logging" />
+		<PackageReference Include="Serilog.Settings.Configuration" />
+		<PackageReference Include="Serilog.Sinks.Console" />
+		<PackageReference Include="Serilog.Sinks.Debug" />
+		<PackageReference Include="Serilog.Sinks.File" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Core\Core.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Core\Core.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Update="addon_config.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="data_config.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<None Update="addon_config.json">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="data_config.json">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="frame_config.json">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
 </Project>
diff --git a/HeadlessServer/Program.cs b/HeadlessServer/Program.cs
@@ -13,9 +13,9 @@
 
 namespace HeadlessServer;
 
-internal sealed class Program
+public sealed class Program
 {
-    private static void Main(string[] args)
+    public static void Main(string[] args)
     {
         var environmentName = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
 
@@ -108,9 +108,17 @@ private static void Main(string[] args)
             logger.LogError(e, e.Message);
         };
 
-        provider
-            .GetRequiredService<HeadlessServer>()
-            .Run(options);
+        HeadlessServer headlessServer = provider.GetRequiredService<HeadlessServer>();
+
+        if (options.Value.LoadOnly)
+        {
+            headlessServer.RunLoadOnly(options);
+            Environment.Exit(0);
+        }
+        else
+        {
+            headlessServer.Run(options);
+        }
 
     Exit:
         Console.ReadKey();

diff --git a/HeadlessServer/RunOptions.cs b/HeadlessServer/RunOptions.cs
@@ -93,4 +93,10 @@ public sealed class RunOptions
         Default = false,
         HelpText = $"Disable PathVisualization in RemoteV1")]
     public bool PathVisualizer { get; set; }
+
+    [Option("loadonly",
+        Required = false,
+        Default = false,
+        HelpText = $"Loads the class profile then exists")]
+    public bool LoadOnly { get; set; }
 }
diff --git a/README.md b/README.md
@@ -306,6 +306,7 @@ In order to run `HeadlessServer` please look at the `HeadlessServer\run.bat`.
 | `-t`<br>`-otargeting` | While overlay enabled, show Targeting points | `false` | - |
 | `-s`<br>`-oskinning` | While overlay enabled, show Skinning points | `false` | - |
 | `-v`<br>`-otargetvsadd` | While overlay enabled, show Target vs Add points | `false` | - |
+| `--loadonly` | Loads the given class profile then exists | `false` | - |
 
 e.g. run from Powershell without any optional parameter
 ```ps
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		mklink /J "..\Benchmarks\bin\Release\Json" "..\Json"
		PAUSE