Add assembly to plugin info

TianMengLucky · TianMengLucky · commit 77f34c3777f2 · 2025-02-28T16:04:34.000+08:00
diff --git a/src/Impostor.Api.Extension/packages.lock.json b/src/Impostor.Api.Extension/packages.lock.json
@@ -105,8 +105,8 @@
       },
       "NextFast.Hazel.Abstractions": {
         "type": "Transitive",
-        "resolved": "1.0.2-ci.7",
-        "contentHash": "YFTuYOB9UjNj4NelmATDQCJbhAyW4wpRli11HIoBz9b9YVYJOBRGrzP41iih37PB1InlCMlQlP4g/TUJHQ2oqg=="
+        "resolved": "1.0.2-ci.8",
+        "contentHash": "eaYyO/+c1l48bjq7ZbGRRohn6FIkDnyMrN8/zO4rxwVeIl6Tbdmw9FnrXXg7BxHzDcuSJP8AZcjXmfq6L8ovvQ=="
       },
       "Serilog": {
         "type": "Transitive",
@@ -123,7 +123,7 @@
         "dependencies": {
           "Microsoft.Extensions.Hosting.Abstractions": "[9.0.2, )",
           "Microsoft.Extensions.Logging.Abstractions": "[9.0.2, )",
-          "NextFast.Hazel.Abstractions": "[1.0.2-ci.7, )",
+          "NextFast.Hazel.Abstractions": "[1.0.2-ci.8, )",
           "Serilog": "[4.2.1-dev-02340, )"
         }
       }
diff --git a/src/Impostor.Api/Impostor.Api.csproj b/src/Impostor.Api/Impostor.Api.csproj
@@ -25,16 +25,11 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2"/>
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.2"/>
-    <PackageReference Include="NextFast.Hazel.Abstractions" Version="1.0.2-ci.7"/>
+    <PackageReference Include="NextFast.Hazel.Abstractions" Version="1.0.2-ci.8"/>
     <PackageReference Include="Serilog" Version="4.2.1-dev-02340"/>
 
     <ProjectReference Include="..\Impostor.Api.Generator\Impostor.Api.Generator.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
     <AdditionalFiles Include="Innersloth/Data/**/*.json"/>
     <AdditionalFiles Include="Languages/*.json"/>
   </ItemGroup>
-
-  <ItemGroup>
-    <Compile Remove="Config\DebugConfig.cs"/>
-    <Compile Remove="Plugins\PluginBase.cs"/>
-  </ItemGroup>
 </Project>
diff --git a/src/Impostor.Api/packages.lock.json b/src/Impostor.Api/packages.lock.json
@@ -26,9 +26,9 @@
       },
       "NextFast.Hazel.Abstractions": {
         "type": "Direct",
-        "requested": "[1.0.2-ci.7, )",
-        "resolved": "1.0.2-ci.7",
-        "contentHash": "YFTuYOB9UjNj4NelmATDQCJbhAyW4wpRli11HIoBz9b9YVYJOBRGrzP41iih37PB1InlCMlQlP4g/TUJHQ2oqg=="
+        "requested": "[1.0.2-ci.8, )",
+        "resolved": "1.0.2-ci.8",
+        "contentHash": "eaYyO/+c1l48bjq7ZbGRRohn6FIkDnyMrN8/zO4rxwVeIl6Tbdmw9FnrXXg7BxHzDcuSJP8AZcjXmfq6L8ovvQ=="
       },
       "Serilog": {
         "type": "Direct",
diff --git a/src/Impostor.Server/Controllers/PublicController.cs b/src/Impostor.Server/Controllers/PublicController.cs
@@ -4,6 +4,7 @@
 using Impostor.Api.Games.Managers;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net.Manager;
+using Impostor.Server.Utils;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Impostor.Server.Controllers;
@@ -37,6 +38,17 @@ public IActionResult GameList()
             Host = game.Host?.Client.Name ?? "Unknown",
         });
 
-        return Ok(JsonSerializer.Serialize(list));
+        return list.OkJson();
+    }
+
+    [HttpGet]
+    public IActionResult ImpostorInfo()
+    {
+        return new
+        {
+            DotnetUtils.Version,
+            DotnetUtils.Environment,
+            DotnetUtils.IsDev,
+        }.OkJson();
     }
 }
diff --git a/src/Impostor.Server/Impostor.Server.csproj b/src/Impostor.Server/Impostor.Server.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.2"/>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2"/>
     <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.2"/>
-    <PackageReference Include="NextFast.Hazel" Version="1.0.2-ci.7"/>
+    <PackageReference Include="NextFast.Hazel" Version="1.0.2-ci.8"/>
     <PackageReference Include="Scalar.AspNetCore" Version="2.0.18" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.1-dev-02307" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.1-dev-02317"/>
diff --git a/src/Impostor.Server/Plugins/Informations/PluginInformation.cs b/src/Impostor.Server/Plugins/Informations/PluginInformation.cs
@@ -10,11 +10,10 @@ public class PluginInformation
 {
     private readonly ImpostorPluginAttribute _attribute;
 
-    public PluginInformation(IPluginStartup? startup, Type pluginType)
+    public PluginInformation(IPluginStartup? startup, Type pluginType, Assembly assembly)
     {
         _attribute = pluginType.GetCustomAttribute<ImpostorPluginAttribute>()!;
-
-        var assembly = pluginType.Assembly;
+        
         Name = _attribute.Name ??
                assembly.GetCustomAttribute<AssemblyTitleAttribute>()?.Title ?? assembly.GetName().Name!;
         Author = _attribute.Author ?? assembly.GetCustomAttribute<AssemblyCompanyAttribute>()?.Company ?? string.Empty;
@@ -26,6 +25,7 @@ public PluginInformation(IPluginStartup? startup, Type pluginType)
             .Select(t => new DependencyInformation(t)).ToList();
         Startup = startup;
         PluginType = pluginType;
+        Assembly = assembly;
     }
 
     public string Id
diff --git a/src/Impostor.Server/Plugins/PluginLoader.cs b/src/Impostor.Server/Plugins/PluginLoader.cs
@@ -135,10 +135,7 @@ public static IHostBuilder UsePluginLoader(this IHostBuilder builder, PluginConf
                     .Select(Activator.CreateInstance)
                     .Cast<IPluginStartup>()
                     .FirstOrDefault(),
-                plugin.Single())
-            {
-                Assembly = assembly,
-            });
+                plugin.Single(), assembly));
         }
 
         AllPluginLoad = LoadOrderPlugins(plugins);
diff --git a/src/Impostor.Server/Utils/DotnetUtils.cs b/src/Impostor.Server/Utils/DotnetUtils.cs
@@ -1,4 +1,6 @@
 ﻿using System.Reflection;
+using System.Text.Json;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Hosting;
 
 namespace Impostor.Server.Utils;
@@ -7,6 +9,11 @@ public static class DotnetUtils
 {
     private static string? _version;
 
+    public static IActionResult OkJson<T>(this T content)
+    {
+        return new OkObjectResult(JsonSerializer.Serialize(content));
+    }
+
     public static string Version
     {
         get
diff --git a/src/Impostor.Server/packages.lock.json b/src/Impostor.Server/packages.lock.json
@@ -73,14 +73,14 @@
       },
       "NextFast.Hazel": {
         "type": "Direct",
-        "requested": "[1.0.2-ci.7, )",
-        "resolved": "1.0.2-ci.7",
-        "contentHash": "DMkvup+qwilMhG1BGWKkzpqNRswp7FbyUu6nQMfF1I7rtAw5yTKxH6eJPDlhq4qlJZWYbMlDCLSqbiAGEOOB6w==",
+        "requested": "[1.0.2-ci.8, )",
+        "resolved": "1.0.2-ci.8",
+        "contentHash": "y1m+ZDYmqGORe0dsYpPblcWt9kin/LKBZTtGGPiPc2704giUUXEhTWrnAqZMfvGQZmtBRlF/KnxxuQn/63cOVg==",
         "dependencies": {
           "BouncyCastle.Cryptography": "2.5.1",
           "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.2",
           "Microsoft.Extensions.ObjectPool": "9.0.2",
-          "NextFast.Hazel.Abstractions": "1.0.2-ci.7",
+          "NextFast.Hazel.Abstractions": "1.0.2-ci.8",
           "Serilog": "4.2.1-dev-02340"
         }
       },
@@ -481,8 +481,8 @@
       },
       "NextFast.Hazel.Abstractions": {
         "type": "Transitive",
-        "resolved": "1.0.2-ci.7",
-        "contentHash": "YFTuYOB9UjNj4NelmATDQCJbhAyW4wpRli11HIoBz9b9YVYJOBRGrzP41iih37PB1InlCMlQlP4g/TUJHQ2oqg=="
+        "resolved": "1.0.2-ci.8",
+        "contentHash": "eaYyO/+c1l48bjq7ZbGRRohn6FIkDnyMrN8/zO4rxwVeIl6Tbdmw9FnrXXg7BxHzDcuSJP8AZcjXmfq6L8ovvQ=="
       },
       "Serilog": {
         "type": "Transitive",
@@ -522,7 +522,7 @@
         "dependencies": {
           "Microsoft.Extensions.Hosting.Abstractions": "[9.0.2, )",
           "Microsoft.Extensions.Logging.Abstractions": "[9.0.2, )",
-          "NextFast.Hazel.Abstractions": "[1.0.2-ci.7, )",
+          "NextFast.Hazel.Abstractions": "[1.0.2-ci.8, )",
           "Serilog": "[4.2.1-dev-02340, )"
         }
       },
diff --git a/src/Plugins/SelfHttpMatchmaker/Controllers/TokenController.cs b/src/Plugins/SelfHttpMatchmaker/Controllers/TokenController.cs
@@ -54,8 +54,10 @@ public class TokenRequest
     /// </summary>
     public sealed class Token
     {
+        // 定义一个名为Content的属性，类型为TokenPayload，使用JsonPropertyName特性指定序列化时的名称为"Content"
         [JsonPropertyName("Content")] public required TokenPayload Content { get; init; }
 
+        // 定义一个名为Hash的属性，类型为string，使用JsonPropertyName特性指定序列化时的名称为"Hash"
         [JsonPropertyName("Hash")] public required string Hash { get; init; }
     }
 
diff --git a/src/Plugins/SelfHttpMatchmaker/packages.lock.json b/src/Plugins/SelfHttpMatchmaker/packages.lock.json
@@ -683,8 +683,8 @@
       },
       "NextFast.Hazel.Abstractions": {
         "type": "Transitive",
-        "resolved": "1.0.2-ci.7",
-        "contentHash": "YFTuYOB9UjNj4NelmATDQCJbhAyW4wpRli11HIoBz9b9YVYJOBRGrzP41iih37PB1InlCMlQlP4g/TUJHQ2oqg=="
+        "resolved": "1.0.2-ci.8",
+        "contentHash": "eaYyO/+c1l48bjq7ZbGRRohn6FIkDnyMrN8/zO4rxwVeIl6Tbdmw9FnrXXg7BxHzDcuSJP8AZcjXmfq6L8ovvQ=="
       },
       "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
         "type": "Transitive",
@@ -1632,7 +1632,7 @@
         "dependencies": {
           "Microsoft.Extensions.Hosting.Abstractions": "[9.0.2, )",
           "Microsoft.Extensions.Logging.Abstractions": "[9.0.2, )",
-          "NextFast.Hazel.Abstractions": "[1.0.2-ci.7, )",
+          "NextFast.Hazel.Abstractions": "[1.0.2-ci.8, )",
           "Serilog": "[4.2.1-dev-02340, )"
         }
       },

Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,10 @@ public class PluginInformation`
`10`	`10`	`{`
`11`	`11`	`private readonly ImpostorPluginAttribute _attribute;`
`12`	`12`
`13`		`- public PluginInformation(IPluginStartup? startup, Type pluginType)`
	`13`	`+ public PluginInformation(IPluginStartup? startup, Type pluginType, Assembly assembly)`
`14`	`14`	`{`
`15`	`15`	`_attribute = pluginType.GetCustomAttribute<ImpostorPluginAttribute>()!;`
`16`		`-`
`17`		`- var assembly = pluginType.Assembly;`
	`16`	`+`
`18`	`17`	`Name = _attribute.Name ??`
`19`	`18`	`assembly.GetCustomAttribute<AssemblyTitleAttribute>()?.Title ?? assembly.GetName().Name!;`
`20`	`19`	`Author = _attribute.Author ?? assembly.GetCustomAttribute<AssemblyCompanyAttribute>()?.Company ?? string.Empty;`
`@@ -26,6 +25,7 @@ public PluginInformation(IPluginStartup? startup, Type pluginType)`
`26`	`25`	`.Select(t => new DependencyInformation(t)).ToList();`
`27`	`26`	`Startup = startup;`
`28`	`27`	`PluginType = pluginType;`
	`28`	`+ Assembly = assembly;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public string Id`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,10 @@ public class TokenRequest`
`54`	`54`	`/// </summary>`
`55`	`55`	`public sealed class Token`
`56`	`56`	`{`
	`57`	`+ // 定义一个名为Content的属性，类型为TokenPayload，使用JsonPropertyName特性指定序列化时的名称为"Content"`
`57`	`58`	`[JsonPropertyName("Content")] public required TokenPayload Content { get; init; }`
`58`	`59`
	`60`	`+ // 定义一个名为Hash的属性，类型为string，使用JsonPropertyName特性指定序列化时的名称为"Hash"`
`59`	`61`	`[JsonPropertyName("Hash")] public required string Hash { get; init; }`
`60`	`62`	`}`
`61`	`63`