refactor: 优化部分代码

SALTWOOD · SALTWOOD · commit a5c1f91c1d2f · 2025-09-20T21:26:35.000+09:00
diff --git a/CSharp-OpenBMCLAPI/Modules/AvroParser.cs b/CSharp-OpenBMCLAPI/Modules/AvroParser.cs
@@ -3,19 +3,12 @@
 
 namespace CSharpOpenBMCLAPI.Modules
 {
-    public class AvroParser
+    public class AvroParser(byte[] data)
     {
-        private MemoryStream _stream;
-        private List<ApiFileInfo> _files;
+        private MemoryStream _stream = new(data);
+        private List<ApiFileInfo> _files = new();
         private byte[] data;
 
-        public AvroParser(byte[] data)
-        {
-            this.data = data;
-            this._stream = new MemoryStream(data);
-            this._files = new List<ApiFileInfo>();
-        }
-
         public List<ApiFileInfo> Parse()
         {
             this._files.Clear();
@@ -56,7 +49,7 @@ public long ReadLong()
         public string ReadString()
         {
             byte[] buffer = new byte[this.ReadLong()];
-            this._stream.Read(buffer, 0, buffer.Length);
+            this._stream.ReadExactly(buffer, 0, buffer.Length);
             return Encoding.UTF8.GetString(buffer);
         }
     }
diff --git a/CSharp-OpenBMCLAPI/Modules/Cluster.cs b/CSharp-OpenBMCLAPI/Modules/Cluster.cs
diff --git a/CSharp-OpenBMCLAPI/Modules/ClusterInfo.cs b/CSharp-OpenBMCLAPI/Modules/ClusterInfo.cs
@@ -3,14 +3,9 @@
     /// <summary>
     /// 负责存储 Cluster 的 secret 和 id
     /// </summary>
-    public struct ClusterInfo
+    public struct ClusterInfo(string id, string secret)
     {
-        public string ClusterID, ClusterSecret;
-
-        public ClusterInfo(string id, string secret)
-        {
-            this.ClusterID = id;
-            this.ClusterSecret = secret;
-        }
+        public readonly string clusterId = id;
+        public readonly string clusterSecret = secret;
     }
 }
diff --git a/CSharp-OpenBMCLAPI/Modules/ClusterRequiredData.cs b/CSharp-OpenBMCLAPI/Modules/ClusterRequiredData.cs
diff --git a/CSharp-OpenBMCLAPI/Modules/HttpRequest.cs b/CSharp-OpenBMCLAPI/Modules/HttpRequest.cs
@@ -11,11 +11,11 @@ static HttpRequest()
             client = new HttpClient()
             {
                 // 设置基础地址
-                BaseAddress = new Uri(ClusterRequiredData.Config.CenterServerAddress),
+                BaseAddress = new Uri(PublicData.Config.CenterServerAddress),
                 Timeout = TimeSpan.FromMinutes(5)
             };
             // 添加UserAgent，用于标识请求来源
-            string ua = $"openbmclapi-cluster/{ClusterRequiredData.Config.clusterVersion} (CSharp-OpenBMCLAPI; .NET runtime v{Environment.Version}; {Environment.OSVersion}, {System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture}; {System.Globalization.CultureInfo.InstalledUICulture.Name})";
+            string ua = $"openbmclapi-cluster/{PublicData.Config.clusterVersion} (CSharp-OpenBMCLAPI; .NET runtime v{Environment.Version}; {Environment.OSVersion}, {System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture}; {System.Globalization.CultureInfo.InstalledUICulture.Name})";
             client.DefaultRequestHeaders.Add("User-Agent", ua);
             Console.WriteLine($"User-Agent: {ua}");
         }
diff --git a/CSharp-OpenBMCLAPI/Modules/HttpServiceProvider.cs b/CSharp-OpenBMCLAPI/Modules/HttpServiceProvider.cs
@@ -15,7 +15,7 @@ public class HttpServiceProvider
         /// <returns></returns>
         public static void LogAccess(HttpContext context)
         {
-            if (!ClusterRequiredData.Config.DisableAccessLog)
+            if (!PublicData.Config.DisableAccessLog)
             {
                 context.Request.Headers.TryGetValue("user-agent", out StringValues value);
                 Logger.Instance.LogInfo($"{context.Request.Method} {context.Request.Path.Value} {context.Request.Protocol} <{context.Response.StatusCode}> - [{context.Connection.RemoteIpAddress}] {value.FirstOrDefault()}");
@@ -32,7 +32,7 @@ public static async Task Measure(HttpContext context, Cluster cluster, int size)
             context.Request.Query.TryGetValue("s", out StringValues s);
             context.Request.Query.TryGetValue("e", out StringValues e);
             bool valid = Utils.CheckSign(context.Request.Path.Value?.Split('?').First()
-                , cluster.requiredData.ClusterInfo.ClusterSecret
+                , cluster.requiredData.ClusterInfo.clusterSecret
                 , s.FirstOrDefault()
                 , e.FirstOrDefault()
             );
@@ -68,7 +68,7 @@ public static async Task<FileAccessInfo> DownloadHash(HttpContext context, Clust
             context.Request.Query.TryGetValue("s", out StringValues s);
             context.Request.Query.TryGetValue("e", out StringValues e);
 
-            bool isValid = Utils.CheckSign(hash, cluster.clusterInfo.ClusterSecret, s.FirstOrDefault(), e.FirstOrDefault());
+            bool isValid = Utils.CheckSign(hash, cluster.clusterInfo.clusterSecret, s.FirstOrDefault(), e.FirstOrDefault());
 
             if (!isValid)
             {
diff --git a/CSharp-OpenBMCLAPI/Modules/PublicData.cs b/CSharp-OpenBMCLAPI/Modules/PublicData.cs
@@ -0,0 +1,13 @@
+﻿namespace CSharpOpenBMCLAPI.Modules
+{
+    public class PublicData(ClusterInfo info)
+    {
+        public static Config Config { get; set; } = new Config();
+        public Logger Logger => Logger.Instance;
+        public ClusterInfo ClusterInfo { get; set; } = info;
+        public TokenManager Token { get; set; } = new(info);
+        public SemaphoreSlim SemaphoreSlim { get; set; } = new SemaphoreSlim(0);
+
+        internal int maxThreadCount;
+    }
+}
diff --git a/CSharp-OpenBMCLAPI/Modules/Storage/AlistStorage.cs b/CSharp-OpenBMCLAPI/Modules/Storage/AlistStorage.cs
@@ -14,8 +14,8 @@ public AlistStorage()
         {
             this.client = new HttpClient();
             this.baseAddr = "BMCLAPI/cache";
-            this.client.BaseAddress = new Uri(ClusterRequiredData.Config.clusterFileDirectory);
-            this.user = ClusterRequiredData.Config.storageUser;
+            this.client.BaseAddress = new Uri(PublicData.Config.clusterFileDirectory);
+            this.user = PublicData.Config.storageUser;
         }
 
         public bool Exists(string hashPath)
diff --git a/CSharp-OpenBMCLAPI/Modules/Storage/CachedStorage.cs b/CSharp-OpenBMCLAPI/Modules/Storage/CachedStorage.cs
@@ -38,7 +38,7 @@ public class CachedStorage : ICachedStorage
         public CachedStorage(IStorage storage)
         {
             this.storage = storage;
-            if (ClusterRequiredData.Config.maxCachedMemory == 0) this.cacheEnabled = false;
+            if (PublicData.Config.maxCachedMemory == 0) this.cacheEnabled = false;
         }
 
         public bool Exists(string hashPath)
@@ -146,17 +146,17 @@ public void Initialize()
         public void MemoryWatchdog()
         {
             double memory = GetCachedMemory();
-            if (memory > 0 && memory > ClusterRequiredData.Config.maxCachedMemory * 1048576)
+            if (memory > 0 && memory > PublicData.Config.maxCachedMemory * 1048576)
             {
-                Logger.Instance.LogWarn($"缓存存储已大于 {ClusterRequiredData.Config.maxCachedMemory}（当前 {memory / 1048576}），已开始清理缓存");
+                Logger.Instance.LogWarn($"缓存存储已大于 {PublicData.Config.maxCachedMemory}（当前 {memory / 1048576}），已开始清理缓存");
                 int count = 0;
                 do
                 {
                     string biggestFileKey = this.cache.OrderBy(kvp => kvp.Value.content.Length).Last().Key;
                     this.cache.Remove(biggestFileKey);
                     count++;
                 }
-                while (GetCachedMemory() > ClusterRequiredData.Config.maxCachedMemory || count <= 5); // 限制只有清理到内存低于指定值，并且清理次数大于五次才停止
+                while (GetCachedMemory() > PublicData.Config.maxCachedMemory || count <= 5); // 限制只有清理到内存低于指定值，并且清理次数大于五次才停止
             }
         }
 
diff --git a/CSharp-OpenBMCLAPI/Modules/Storage/FileStorage.cs b/CSharp-OpenBMCLAPI/Modules/Storage/FileStorage.cs
@@ -17,7 +17,7 @@ public FileStorage(string workingDirectory)
             this.workingDirectory = workingDirectory;
             if (workingDirectory.StartsWith(@"\\"))
             {
-                StorageUser user = ClusterRequiredData.Config.storageUser;
+                StorageUser user = PublicData.Config.storageUser;
                 this.connection = new SambaConnection(user.UserName, user.Password, Regex.Match(workingDirectory, @"\\\\(.*?)\\").Groups[1].Value);
             }
         }
diff --git a/CSharp-OpenBMCLAPI/Modules/Storage/WebDavStorage.cs b/CSharp-OpenBMCLAPI/Modules/Storage/WebDavStorage.cs
@@ -12,10 +12,10 @@ public class WebDavStorage : IStorage
 
         public WebDavStorage()
         {
-            this.client = new(ClusterRequiredData.Config.clusterFileDirectory);
+            this.client = new(PublicData.Config.clusterFileDirectory);
             this.baseAddr = "BMCLAPI/cache";
             this.writeLock = new object();
-            this.user = ClusterRequiredData.Config.storageUser;
+            this.user = PublicData.Config.storageUser;
         }
 
         public bool Exists(string hashPath)
diff --git a/CSharp-OpenBMCLAPI/Modules/Tasks.cs b/CSharp-OpenBMCLAPI/Modules/Tasks.cs
@@ -3,6 +3,6 @@
     internal class Tasks
     {
         public static Task? KeepAlive { get; set; }
-        public static Task? CheckFile { get; set; }
+        public static Timer? CheckFile { get; set; }
     }
 }
diff --git a/CSharp-OpenBMCLAPI/Modules/TokenManager.cs b/CSharp-OpenBMCLAPI/Modules/TokenManager.cs
@@ -22,8 +22,8 @@ public class TokenManager
 
         public TokenManager(ClusterInfo info)
         {
-            this.CLUSTER_ID = info.ClusterID;
-            this.CLUSTER_SECRET = info.ClusterSecret;
+            this.CLUSTER_ID = info.clusterId;
+            this.CLUSTER_SECRET = info.clusterSecret;
         }
 
         /// <summary>
@@ -62,7 +62,7 @@ public async Task<Token> FetchToken()
 
                 this._updateTask = Task.Run(() =>
                 {
-                    Thread.Sleep(this.token.ttl - ClusterRequiredData.Config.refreshTokenTime);
+                    Thread.Sleep(this.token.ttl - PublicData.Config.refreshTokenTime);
                     RefreshToken();
                 });
             }
diff --git a/CSharp-OpenBMCLAPI/Modules/Utils.cs b/CSharp-OpenBMCLAPI/Modules/Utils.cs
@@ -217,7 +217,7 @@ public static bool CheckSign(string? hash, string? secret, string? s, string? e)
             var sign = ToUrlSafeBase64String(sha1.ComputeHash(Encoding.UTF8.GetBytes($"{secret}{hash}{e}")));
             var timestamp = DateTimeOffset.Now.ToUnixTimeSeconds();
             var a = timestamp < (ToDecimal(e) / 1000);
-            return (sign == s && timestamp < (ToDecimal(e) / 1000)) || ClusterRequiredData.Config.NoSignatureVerifying;
+            return (sign == s && timestamp < (ToDecimal(e) / 1000)) || PublicData.Config.NoSignatureVerifying;
         }
 
         public static bool IsAdministrator()
diff --git a/CSharp-OpenBMCLAPI/Program.cs b/CSharp-OpenBMCLAPI/Program.cs
@@ -11,7 +11,7 @@ public Program() : base() { }
 
         static void Main(string[] args)
         {
-            Logger.Instance.LogSystem($"Starting CSharp-OpenBMCLAPI v{ClusterRequiredData.Config.clusterVersion}");
+            Logger.Instance.LogSystem($"Starting CSharp-OpenBMCLAPI v{PublicData.Config.clusterVersion}");
             Logger.Instance.LogSystem("高性能、低メモリ占有！");
             Logger.Instance.LogSystem($"运行时环境：{Utils.GetRuntime()}");
             Program program = new Program();
@@ -22,7 +22,7 @@ static void Main(string[] args)
         protected Config GetConfig()
         {
             const string configFileName = "config.yml";
-            string configPath = Path.Combine(ClusterRequiredData.Config.clusterWorkingDirectory, configFileName);
+            string configPath = Path.Combine(PublicData.Config.clusterWorkingDirectory, configFileName);
             if (!File.Exists(configPath))
             {
                 Config config = new Config();
@@ -54,11 +54,11 @@ protected override int Run(string[] args)
         {
             try
             {
-                Directory.CreateDirectory(ClusterRequiredData.Config.clusterWorkingDirectory);
+                Directory.CreateDirectory(PublicData.Config.clusterWorkingDirectory);
                 Directory.CreateDirectory("working");
                 const string bsonFile = "totals.bson";
-                string bsonFilePath = Path.Combine(ClusterRequiredData.Config.clusterWorkingDirectory, bsonFile);
-                ClusterRequiredData.Config = GetConfig();
+                string bsonFilePath = Path.Combine(PublicData.Config.clusterWorkingDirectory, bsonFile);
+                PublicData.Config = GetConfig();
 
                 int returns = 0;
 
@@ -68,8 +68,8 @@ protected override int Run(string[] args)
 
                 // 从 .env.json 读取密钥然后 FetchToken
                 ClusterInfo info = JsonConvert.DeserializeObject<ClusterInfo>(File.ReadAllTextAsync(environment).Result);
-                ClusterRequiredData requiredData = new(info);
-                Logger.Instance.LogSystem($"Cluster id: {info.ClusterID}");
+                PublicData requiredData = new(info);
+                Logger.Instance.LogSystem($"Cluster id: {info.clusterId}");
                 TokenManager token = new TokenManager(info);
                 token.FetchToken().Wait();
 

Original file line number	Diff line number	Diff line change
`@@ -3,19 +3,12 @@`
`3`	`3`
`4`	`4`	`namespace CSharpOpenBMCLAPI.Modules`
`5`	`5`	`{`
`6`		`- public class AvroParser`
	`6`	`+ public class AvroParser(byte[] data)`
`7`	`7`	`{`
`8`		`- private MemoryStream _stream;`
`9`		`- private List<ApiFileInfo> _files;`
	`8`	`+ private MemoryStream _stream = new(data);`
	`9`	`+ private List<ApiFileInfo> _files = new();`
`10`	`10`	`private byte[] data;`
`11`	`11`
`12`		`- public AvroParser(byte[] data)`
`13`		`- {`
`14`		`- this.data = data;`
`15`		`- this._stream = new MemoryStream(data);`
`16`		`- this._files = new List<ApiFileInfo>();`
`17`		`- }`
`18`		`-`
`19`	`12`	`public List<ApiFileInfo> Parse()`
`20`	`13`	`{`
`21`	`14`	`this._files.Clear();`
`@@ -56,7 +49,7 @@ public long ReadLong()`
`56`	`49`	`public string ReadString()`
`57`	`50`	`{`
`58`	`51`	`byte[] buffer = new byte[this.ReadLong()];`
`59`		`- this._stream.Read(buffer, 0, buffer.Length);`
	`52`	`+ this._stream.ReadExactly(buffer, 0, buffer.Length);`
`60`	`53`	`return Encoding.UTF8.GetString(buffer);`
`61`	`54`	`}`
`62`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,9 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// 负责存储 Cluster 的 secret 和 id`
`5`	`5`	`/// </summary>`
`6`		`- public struct ClusterInfo`
	`6`	`+ public struct ClusterInfo(string id, string secret)`
`7`	`7`	`{`
`8`		`- public string ClusterID, ClusterSecret;`
`9`		`-`
`10`		`- public ClusterInfo(string id, string secret)`
`11`		`- {`
`12`		`- this.ClusterID = id;`
`13`		`- this.ClusterSecret = secret;`
`14`		`- }`
	`8`	`+ public readonly string clusterId = id;`
	`9`	`+ public readonly string clusterSecret = secret;`
`15`	`10`	`}`
`16`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@ static HttpRequest()`
`11`	`11`	`client = new HttpClient()`
`12`	`12`	`{`
`13`	`13`	`// 设置基础地址`
`14`		`- BaseAddress = new Uri(ClusterRequiredData.Config.CenterServerAddress),`
	`14`	`+ BaseAddress = new Uri(PublicData.Config.CenterServerAddress),`
`15`	`15`	`Timeout = TimeSpan.FromMinutes(5)`
`16`	`16`	`};`
`17`	`17`	`// 添加UserAgent，用于标识请求来源`
`18`		`- string ua = $"openbmclapi-cluster/{ClusterRequiredData.Config.clusterVersion} (CSharp-OpenBMCLAPI; .NET runtime v{Environment.Version}; {Environment.OSVersion}, {System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture}; {System.Globalization.CultureInfo.InstalledUICulture.Name})";`
	`18`	`+ string ua = $"openbmclapi-cluster/{PublicData.Config.clusterVersion} (CSharp-OpenBMCLAPI; .NET runtime v{Environment.Version}; {Environment.OSVersion}, {System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture}; {System.Globalization.CultureInfo.InstalledUICulture.Name})";`
`19`	`19`	`client.DefaultRequestHeaders.Add("User-Agent", ua);`
`20`	`20`	`Console.WriteLine($"User-Agent: {ua}");`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ public AlistStorage()`
`14`	`14`	`{`
`15`	`15`	`this.client = new HttpClient();`
`16`	`16`	`this.baseAddr = "BMCLAPI/cache";`
`17`		`- this.client.BaseAddress = new Uri(ClusterRequiredData.Config.clusterFileDirectory);`
`18`		`- this.user = ClusterRequiredData.Config.storageUser;`
	`17`	`+ this.client.BaseAddress = new Uri(PublicData.Config.clusterFileDirectory);`
	`18`	`+ this.user = PublicData.Config.storageUser;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public bool Exists(string hashPath)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class CachedStorage : ICachedStorage`
`38`	`38`	`public CachedStorage(IStorage storage)`
`39`	`39`	`{`
`40`	`40`	`this.storage = storage;`
`41`		`- if (ClusterRequiredData.Config.maxCachedMemory == 0) this.cacheEnabled = false;`
	`41`	`+ if (PublicData.Config.maxCachedMemory == 0) this.cacheEnabled = false;`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public bool Exists(string hashPath)`
`@@ -146,17 +146,17 @@ public void Initialize()`
`146`	`146`	`public void MemoryWatchdog()`
`147`	`147`	`{`
`148`	`148`	`double memory = GetCachedMemory();`
`149`		`- if (memory > 0 && memory > ClusterRequiredData.Config.maxCachedMemory * 1048576)`
	`149`	`+ if (memory > 0 && memory > PublicData.Config.maxCachedMemory * 1048576)`
`150`	`150`	`{`
`151`		`- Logger.Instance.LogWarn($"缓存存储已大于 {ClusterRequiredData.Config.maxCachedMemory}（当前 {memory / 1048576}），已开始清理缓存");`
	`151`	`+ Logger.Instance.LogWarn($"缓存存储已大于 {PublicData.Config.maxCachedMemory}（当前 {memory / 1048576}），已开始清理缓存");`
`152`	`152`	`int count = 0;`
`153`	`153`	`do`
`154`	`154`	`{`
`155`	`155`	`string biggestFileKey = this.cache.OrderBy(kvp => kvp.Value.content.Length).Last().Key;`
`156`	`156`	`this.cache.Remove(biggestFileKey);`
`157`	`157`	`count++;`
`158`	`158`	`}`
`159`		`- while (GetCachedMemory() > ClusterRequiredData.Config.maxCachedMemory \|\| count <= 5); // 限制只有清理到内存低于指定值，并且清理次数大于五次才停止`
	`159`	`+ while (GetCachedMemory() > PublicData.Config.maxCachedMemory \|\| count <= 5); // 限制只有清理到内存低于指定值，并且清理次数大于五次才停止`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public FileStorage(string workingDirectory)`
`17`	`17`	`this.workingDirectory = workingDirectory;`
`18`	`18`	`if (workingDirectory.StartsWith(@"\\"))`
`19`	`19`	`{`
`20`		`- StorageUser user = ClusterRequiredData.Config.storageUser;`
	`20`	`+ StorageUser user = PublicData.Config.storageUser;`
`21`	`21`	`this.connection = new SambaConnection(user.UserName, user.Password, Regex.Match(workingDirectory, @"\\\\(.*?)\\").Groups[1].Value);`
`22`	`22`	`}`
`23`	`23`	`}`