From 734d69e7879801988d42864f5b3ee1f969f17a2e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 14 Nov 2025 07:42:54 +0000
Subject: [PATCH 1/7] Initial plan
From ef09653139b0bda0ad67bfcb162b17c29255d62c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 14 Nov 2025 07:55:19 +0000
Subject: [PATCH 2/7] Implement MachineInfo class with Windows, Linux, and
macOS support
Co-authored-by: Soar360 <15421284+Soar360@users.noreply.github.com>
---
src/LuYao.Common/Devices/MachineInfo.Linux.cs | 344 ++++++++++++++++++
src/LuYao.Common/Devices/MachineInfo.MacOS.cs | 229 ++++++++++++
.../Devices/MachineInfo.Network.cs | 67 ++++
.../Devices/MachineInfo.Windows.cs | 309 ++++++++++++++++
src/LuYao.Common/Devices/MachineInfo.cs | 204 +++++++++--
.../Devices/MachineInfoTests.cs | 193 ++++++++++
6 files changed, 1321 insertions(+), 25 deletions(-)
create mode 100644 src/LuYao.Common/Devices/MachineInfo.Linux.cs
create mode 100644 src/LuYao.Common/Devices/MachineInfo.MacOS.cs
create mode 100644 src/LuYao.Common/Devices/MachineInfo.Network.cs
create mode 100644 src/LuYao.Common/Devices/MachineInfo.Windows.cs
create mode 100644 tests/LuYao.Common.UnitTests/Devices/MachineInfoTests.cs
diff --git a/src/LuYao.Common/Devices/MachineInfo.Linux.cs b/src/LuYao.Common/Devices/MachineInfo.Linux.cs
new file mode 100644
index 0000000..66474f5
--- /dev/null
+++ b/src/LuYao.Common/Devices/MachineInfo.Linux.cs
@@ -0,0 +1,344 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+
+#if NET5_0_OR_GREATER
+using System.Runtime.Versioning;
+#endif
+
+namespace LuYao.Devices;
+
+///
+/// MachineInfo 的 Linux 平台实现部分
+///
+public partial class MachineInfo
+{
+#if NET5_0_OR_GREATER
+ [SupportedOSPlatform("linux")]
+#endif
+ private void LoadLinuxInfo()
+ {
+ var str = GetLinuxName();
+ if (!String.IsNullOrEmpty(str)) OSName = str;
+
+ // 读取 /proc/cpuinfo
+ var cpuinfo = ReadInfo("/proc/cpuinfo");
+ if (cpuinfo != null)
+ {
+ if (cpuinfo.TryGetValue("Hardware", out str) ||
+ cpuinfo.TryGetValue("cpu model", out str) ||
+ cpuinfo.TryGetValue("model name", out str))
+ {
+ Processor = str;
+ if (Processor != null && Processor.StartsWith("vendor "))
+ Processor = Processor.Substring(7);
+ }
+
+ if (cpuinfo.TryGetValue("Model", out str))
+ Product = str;
+
+ if (cpuinfo.TryGetValue("vendor_id", out str))
+ Vendor = str;
+
+ if (cpuinfo.TryGetValue("Serial", out str) &&
+ !String.IsNullOrEmpty(str) &&
+ str.Trim('0') != "")
+ UUID = str;
+ }
+
+ // 读取 machine-id
+ var mid = "/etc/machine-id";
+ if (!File.Exists(mid)) mid = "/var/lib/dbus/machine-id";
+ if (TryRead(mid, out var value))
+ Guid = value;
+
+ // 读取 UUID
+ var uuid = "";
+ var file = "/sys/class/dmi/id/product_uuid";
+ if (!File.Exists(file)) file = "/etc/uuid";
+ if (!File.Exists(file)) file = "/proc/serial_num";
+ if (TryRead(file, out value))
+ uuid = value;
+ if (!String.IsNullOrEmpty(uuid)) UUID = uuid;
+
+ // 从release文件读取产品
+ var prd = GetProductByRelease();
+ if (!String.IsNullOrEmpty(prd)) Product = prd;
+
+ if (String.IsNullOrEmpty(prd) && TryRead("/sys/class/dmi/id/product_name", out var product_name))
+ {
+ Product = product_name;
+ }
+
+ if (TryRead("/sys/class/dmi/id/sys_vendor", out var sys_vendor))
+ {
+ Vendor = sys_vendor;
+ }
+
+ if (TryRead("/sys/class/dmi/id/board_serial", out var board_serial))
+ {
+ Board = board_serial;
+ }
+
+ if (TryRead("/sys/class/dmi/id/product_serial", out var product_serial))
+ {
+ Serial = product_serial;
+ }
+
+ // 获取内存信息
+ var meminfo = ReadInfo("/proc/meminfo");
+ if (meminfo != null)
+ {
+ if (meminfo.TryGetValue("MemTotal", out str))
+ {
+ var match = System.Text.RegularExpressions.Regex.Match(str, @"(\d+)");
+ if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var mem))
+ Memory = mem * 1024; // kB to Bytes
+ }
+ }
+ }
+
+#if NET5_0_OR_GREATER
+ [SupportedOSPlatform("linux")]
+#endif
+ private void RefreshLinux()
+ {
+ // 刷新内存信息
+ var meminfo = ReadInfo("/proc/meminfo");
+ if (meminfo != null)
+ {
+ if (meminfo.TryGetValue("MemTotal", out var str))
+ {
+ var match = System.Text.RegularExpressions.Regex.Match(str, @"(\d+)");
+ if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var mem))
+ Memory = mem * 1024;
+ }
+
+ if (meminfo.TryGetValue("MemAvailable", out str))
+ {
+ var match = System.Text.RegularExpressions.Regex.Match(str, @"(\d+)");
+ if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var mem))
+ AvailableMemory = mem * 1024;
+ }
+
+ if (meminfo.TryGetValue("MemFree", out str))
+ {
+ var match = System.Text.RegularExpressions.Regex.Match(str, @"(\d+)");
+ if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var mem))
+ FreeMemory = mem * 1024;
+ }
+ }
+
+ // 获取CPU使用率
+ try
+ {
+ var stat = File.ReadAllText("/proc/stat");
+ var lines = stat.Split('\n');
+ foreach (var line in lines)
+ {
+ if (line.StartsWith("cpu "))
+ {
+ var parts = line.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+ if (parts.Length >= 5)
+ {
+ var user = Int64.Parse(parts[1]);
+ var nice = Int64.Parse(parts[2]);
+ var system = Int64.Parse(parts[3]);
+ var idle = Int64.Parse(parts[4]);
+
+ var total = user + nice + system + idle;
+
+ if (_systemTime != null)
+ {
+ var idleDelta = idle - _systemTime.IdleTime;
+ var totalDelta = total - _systemTime.TotalTime;
+
+ if (totalDelta > 0)
+ {
+ CpuRate = 1.0 - ((double)idleDelta / totalDelta);
+ if (CpuRate < 0) CpuRate = 0;
+ if (CpuRate > 1) CpuRate = 1;
+ }
+ }
+
+ _systemTime = new SystemTime { IdleTime = idle, TotalTime = total };
+ }
+ break;
+ }
+ }
+ }
+ catch
+ {
+ // 忽略CPU使用率获取错误
+ }
+ }
+
+ #region Linux辅助方法
+ /// 获取Linux发行版名称
+ /// Linux发行版名称
+ private static String? GetLinuxName()
+ {
+ var fr = "/etc/redhat-release";
+ if (TryRead(fr, out var value)) return value;
+
+ var dr = "/etc/debian-release";
+ if (TryRead(dr, out value)) return value;
+
+ var sr = "/etc/os-release";
+ if (TryRead(sr, out value))
+ {
+ var dic = SplitAsDictionary(value, "=", "\n");
+ if (dic.TryGetValue("PRETTY_NAME", out var pretty) && !String.IsNullOrEmpty(pretty))
+ return pretty.Trim('"');
+ if (dic.TryGetValue("NAME", out var name) && !String.IsNullOrEmpty(name))
+ return name.Trim('"');
+ }
+
+ try
+ {
+ var psi = new ProcessStartInfo
+ {
+ FileName = "uname",
+ Arguments = "-sr",
+ RedirectStandardOutput = true,
+ UseShellExecute = false,
+ CreateNoWindow = true
+ };
+
+ using var process = Process.Start(psi);
+ if (process != null)
+ {
+ var uname = process.StandardOutput.ReadToEnd()?.Trim();
+ process.WaitForExit();
+
+ if (!String.IsNullOrEmpty(uname))
+ {
+ // 支持Android系统名
+ var ss = uname.Split('-');
+ foreach (var item in ss)
+ {
+ if (!String.IsNullOrEmpty(item) &&
+ item.StartsWith("Android", StringComparison.OrdinalIgnoreCase))
+ return item;
+ }
+ return uname;
+ }
+ }
+ }
+ catch
+ {
+ // 忽略错误
+ }
+
+ return null;
+ }
+
+ private static String? GetProductByRelease()
+ {
+ try
+ {
+ if (!Directory.Exists("/etc/")) return null;
+
+ var files = Directory.GetFiles("/etc/", "*-release");
+ foreach (var file in files)
+ {
+ var fileName = Path.GetFileName(file);
+ if (!fileName.Equals("redhat-release", StringComparison.OrdinalIgnoreCase) &&
+ !fileName.Equals("debian-release", StringComparison.OrdinalIgnoreCase) &&
+ !fileName.Equals("os-release", StringComparison.OrdinalIgnoreCase) &&
+ !fileName.Equals("system-release", StringComparison.OrdinalIgnoreCase))
+ {
+ var content = File.ReadAllText(file);
+ var dic = SplitAsDictionary(content, "=", "\n");
+ if (dic.TryGetValue("BOARD", out var str)) return str;
+ if (dic.TryGetValue("BOARD_NAME", out str)) return str;
+ }
+ }
+ }
+ catch
+ {
+ // 忽略错误
+ }
+
+ return null;
+ }
+
+ private static Boolean TryRead(String fileName, out String? value)
+ {
+ value = null;
+
+ if (!File.Exists(fileName)) return false;
+
+ try
+ {
+ value = File.ReadAllText(fileName)?.Trim();
+ if (String.IsNullOrEmpty(value)) return false;
+ }
+ catch { return false; }
+
+ return true;
+ }
+
+ /// 读取文件信息，分割为字典
+ /// 文件路径
+ /// 分隔符
+ /// 解析后的字典
+ private static Dictionary? ReadInfo(String file, Char separate = ':')
+ {
+ if (String.IsNullOrEmpty(file) || !File.Exists(file)) return null;
+
+ var dic = new Dictionary(StringComparer.OrdinalIgnoreCase);
+
+ try
+ {
+ using var reader = new StreamReader(file);
+ while (!reader.EndOfStream)
+ {
+ var line = reader.ReadLine();
+ if (line != null)
+ {
+ var p = line.IndexOf(separate);
+ if (p > 0)
+ {
+ var key = line.Substring(0, p).Trim();
+ var value = line.Substring(p + 1).Trim();
+ dic[key] = Clean(value);
+ }
+ }
+ }
+ }
+ catch
+ {
+ return null;
+ }
+
+ return dic;
+ }
+
+ private static Dictionary SplitAsDictionary(String content, String keyValueSeparator, String lineSeparator)
+ {
+ var dic = new Dictionary(StringComparer.OrdinalIgnoreCase);
+
+ if (String.IsNullOrEmpty(content)) return dic;
+
+ var lines = content.Split(new[] { lineSeparator }, StringSplitOptions.RemoveEmptyEntries);
+ foreach (var line in lines)
+ {
+ var parts = line.Split(new[] { keyValueSeparator }, 2, StringSplitOptions.None);
+ if (parts.Length == 2)
+ {
+ var key = parts[0].Trim();
+ var value = parts[1].Trim().Trim('"');
+ if (!String.IsNullOrEmpty(key))
+ dic[key] = value;
+ }
+ }
+
+ return dic;
+ }
+ #endregion
+}
diff --git a/src/LuYao.Common/Devices/MachineInfo.MacOS.cs b/src/LuYao.Common/Devices/MachineInfo.MacOS.cs
new file mode 100644
index 0000000..d9ae23a
--- /dev/null
+++ b/src/LuYao.Common/Devices/MachineInfo.MacOS.cs
@@ -0,0 +1,229 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+
+#if NET5_0_OR_GREATER
+using System.Runtime.Versioning;
+#endif
+
+namespace LuYao.Devices;
+
+///
+/// MachineInfo 的 macOS 平台实现部分
+///
+public partial class MachineInfo
+{
+#if NET5_0_OR_GREATER
+ [SupportedOSPlatform("macos")]
+#endif
+ private void LoadMacInfo()
+ {
+ try
+ {
+ // 获取硬件信息
+ var hardware = ExecuteCommand("system_profiler", "SPHardwareDataType");
+ if (!String.IsNullOrEmpty(hardware))
+ {
+ var lines = hardware.Split('\n');
+ foreach (var line in lines)
+ {
+ var trimmed = line.Trim();
+
+ if (trimmed.StartsWith("Model Name:"))
+ Product = trimmed.Substring("Model Name:".Length).Trim();
+ else if (trimmed.StartsWith("Model Identifier:") && String.IsNullOrEmpty(Product))
+ Product = trimmed.Substring("Model Identifier:".Length).Trim();
+ else if (trimmed.StartsWith("Processor Name:"))
+ Processor = trimmed.Substring("Processor Name:".Length).Trim();
+ else if (trimmed.StartsWith("Chip:") && String.IsNullOrEmpty(Processor))
+ Processor = trimmed.Substring("Chip:".Length).Trim();
+ else if (trimmed.StartsWith("Serial Number (system):"))
+ Serial = trimmed.Substring("Serial Number (system):".Length).Trim();
+ else if (trimmed.StartsWith("Hardware UUID:"))
+ UUID = trimmed.Substring("Hardware UUID:".Length).Trim();
+ else if (trimmed.StartsWith("Memory:"))
+ {
+ var memStr = trimmed.Substring("Memory:".Length).Trim();
+ // Parse memory like "16 GB" or "8 GB"
+ var parts = memStr.Split(' ');
+ if (parts.Length >= 2 && Double.TryParse(parts[0], out var memValue))
+ {
+ if (parts[1].Equals("GB", StringComparison.OrdinalIgnoreCase))
+ Memory = (UInt64)(memValue * 1024 * 1024 * 1024);
+ else if (parts[1].Equals("MB", StringComparison.OrdinalIgnoreCase))
+ Memory = (UInt64)(memValue * 1024 * 1024);
+ }
+ }
+ }
+ }
+
+ // 获取软件信息
+ var software = ExecuteCommand("system_profiler", "SPSoftwareDataType");
+ if (!String.IsNullOrEmpty(software))
+ {
+ var lines = software.Split('\n');
+ foreach (var line in lines)
+ {
+ var trimmed = line.Trim();
+
+ if (trimmed.StartsWith("System Version:"))
+ {
+ OSName = trimmed.Substring("System Version:".Length).Trim();
+ // Extract version number
+ var versionStart = OSName.IndexOf('(');
+ if (versionStart > 0)
+ {
+ OSVersion = OSName.Substring(0, versionStart).Trim();
+ }
+ }
+ }
+ }
+
+ // 获取 UUID（如果上面没有获取到）
+ if (String.IsNullOrEmpty(UUID))
+ {
+ UUID = ExecuteCommand("ioreg", "-rd1 -c IOPlatformExpertDevice | grep IOPlatformUUID")?.Trim();
+ if (!String.IsNullOrEmpty(UUID))
+ {
+ var match = System.Text.RegularExpressions.Regex.Match(UUID, @"""([A-F0-9-]+)""");
+ if (match.Success)
+ UUID = match.Groups[1].Value;
+ }
+ }
+ }
+ catch
+ {
+ // 忽略错误
+ }
+
+ if (String.IsNullOrEmpty(OSName))
+ {
+#if NETFRAMEWORK
+ OSName = Environment.OSVersion.Platform.ToString();
+#else
+ OSName = RuntimeInformation.OSDescription;
+#endif
+ }
+ }
+
+#if NET5_0_OR_GREATER
+ [SupportedOSPlatform("macos")]
+#endif
+ private void RefreshMacOS()
+ {
+ // 获取内存信息
+ try
+ {
+ var vmStat = ExecuteCommand("vm_stat", "");
+ if (!String.IsNullOrEmpty(vmStat))
+ {
+ var pageSize = 4096UL; // macOS typical page size
+ var lines = vmStat.Split('\n');
+
+ UInt64 free = 0, active = 0, inactive = 0, wired = 0;
+
+ foreach (var line in lines)
+ {
+ if (line.Contains("page size of"))
+ {
+ var match = System.Text.RegularExpressions.Regex.Match(line, @"(\d+)");
+ if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var ps))
+ pageSize = ps;
+ }
+ else if (line.StartsWith("Pages free:"))
+ {
+ var match = System.Text.RegularExpressions.Regex.Match(line, @"(\d+)");
+ if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var pages))
+ free = pages * pageSize;
+ }
+ else if (line.StartsWith("Pages active:"))
+ {
+ var match = System.Text.RegularExpressions.Regex.Match(line, @"(\d+)");
+ if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var pages))
+ active = pages * pageSize;
+ }
+ else if (line.StartsWith("Pages inactive:"))
+ {
+ var match = System.Text.RegularExpressions.Regex.Match(line, @"(\d+)");
+ if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var pages))
+ inactive = pages * pageSize;
+ }
+ else if (line.StartsWith("Pages wired down:"))
+ {
+ var match = System.Text.RegularExpressions.Regex.Match(line, @"(\d+)");
+ if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var pages))
+ wired = pages * pageSize;
+ }
+ }
+
+ FreeMemory = free;
+ AvailableMemory = free + inactive;
+ }
+ }
+ catch
+ {
+ // 忽略错误
+ }
+
+ // 获取CPU使用率
+ try
+ {
+ var top = ExecuteCommand("top", "-l 1 -n 0");
+ if (!String.IsNullOrEmpty(top))
+ {
+ var lines = top.Split('\n');
+ foreach (var line in lines)
+ {
+ if (line.Contains("CPU usage:"))
+ {
+ // Parse "CPU usage: 3.57% user, 14.28% sys, 82.14% idle"
+ var match = System.Text.RegularExpressions.Regex.Match(line, @"(\d+\.?\d*)%\s+idle");
+ if (match.Success && Double.TryParse(match.Groups[1].Value, out var idle))
+ {
+ CpuRate = (100.0 - idle) / 100.0;
+ }
+ break;
+ }
+ }
+ }
+ }
+ catch
+ {
+ // 忽略错误
+ }
+ }
+
+ #region macOS辅助方法
+ private static String? ExecuteCommand(String command, String arguments)
+ {
+ try
+ {
+ var psi = new ProcessStartInfo
+ {
+ FileName = command,
+ Arguments = arguments,
+ RedirectStandardOutput = true,
+ UseShellExecute = false,
+ CreateNoWindow = true
+ };
+
+ using var process = Process.Start(psi);
+ if (process != null)
+ {
+ var output = process.StandardOutput.ReadToEnd();
+ process.WaitForExit();
+ return output;
+ }
+ }
+ catch
+ {
+ // 忽略错误
+ }
+
+ return null;
+ }
+ #endregion
+}
diff --git a/src/LuYao.Common/Devices/MachineInfo.Network.cs b/src/LuYao.Common/Devices/MachineInfo.Network.cs
new file mode 100644
index 0000000..f0b7f98
--- /dev/null
+++ b/src/LuYao.Common/Devices/MachineInfo.Network.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Linq;
+using System.Net.NetworkInformation;
+
+namespace LuYao.Devices;
+
+///
+/// MachineInfo 的网络监控部分
+///
+public partial class MachineInfo
+{
+ private Int64 _lastTime;
+ private Int64 _lastSent;
+ private Int64 _lastReceived;
+
+ ///
+ /// 刷新网络速度信息
+ ///
+ public void RefreshSpeed()
+ {
+ try
+ {
+ var interfaces = NetworkInterface.GetAllNetworkInterfaces();
+
+ Int64 sent = 0;
+ Int64 received = 0;
+
+ foreach (var ni in interfaces)
+ {
+ // 只统计活动的物理网络接口
+ if (ni.OperationalStatus == OperationalStatus.Up &&
+ ni.NetworkInterfaceType != NetworkInterfaceType.Loopback &&
+ ni.NetworkInterfaceType != NetworkInterfaceType.Tunnel)
+ {
+ var stats = ni.GetIPv4Statistics();
+ sent += stats.BytesSent;
+ received += stats.BytesReceived;
+ }
+ }
+
+ var now = (Int64)(DateTimeOffset.UtcNow - new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero)).TotalSeconds;
+
+ if (_lastTime > 0)
+ {
+ var elapsed = now - _lastTime;
+ if (elapsed > 0)
+ {
+ var sentDiff = sent - _lastSent;
+ var receivedDiff = received - _lastReceived;
+
+ if (sentDiff >= 0)
+ UplinkSpeed = (UInt64)(sentDiff / elapsed);
+ if (receivedDiff >= 0)
+ DownlinkSpeed = (UInt64)(receivedDiff / elapsed);
+ }
+ }
+
+ _lastSent = sent;
+ _lastReceived = received;
+ _lastTime = now;
+ }
+ catch
+ {
+ // 忽略网络统计错误
+ }
+ }
+}
diff --git a/src/LuYao.Common/Devices/MachineInfo.Windows.cs b/src/LuYao.Common/Devices/MachineInfo.Windows.cs
new file mode 100644
index 0000000..7a7ea10
--- /dev/null
+++ b/src/LuYao.Common/Devices/MachineInfo.Windows.cs
@@ -0,0 +1,309 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Text;
+
+#if NET5_0_OR_GREATER
+using System.Runtime.Versioning;
+#endif
+
+#if NETFRAMEWORK || NET5_0_OR_GREATER
+using Microsoft.Win32;
+#endif
+
+namespace LuYao.Devices;
+
+///
+/// MachineInfo 的 Windows 平台实现部分
+///
+public partial class MachineInfo
+{
+#if NET5_0_OR_GREATER
+ [SupportedOSPlatform("windows")]
+#endif
+ private void LoadWindowsInfo()
+ {
+ var str = "";
+
+ // 从注册表读取 MachineGuid
+#if NETFRAMEWORK || NET6_0_OR_GREATER
+ try
+ {
+ var reg = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Cryptography");
+ if (reg != null) str = reg.GetValue("MachineGuid")?.ToString() ?? "";
+ if (String.IsNullOrEmpty(str))
+ {
+ reg = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64);
+ reg = reg?.OpenSubKey(@"SOFTWARE\Microsoft\Cryptography");
+ if (reg != null) str = reg.GetValue("MachineGuid")?.ToString() ?? "";
+ }
+
+ if (!String.IsNullOrEmpty(str)) Guid = str;
+
+ reg = Registry.LocalMachine.OpenSubKey(@"SYSTEM\HardwareConfig");
+ if (reg != null)
+ {
+ str = (reg.GetValue("LastConfig")?.ToString() ?? "")?.Trim('{', '}').ToUpper();
+
+ // UUID取不到时返回 FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF
+ if (!String.IsNullOrEmpty(str) && !str.Equals("FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF", StringComparison.OrdinalIgnoreCase))
+ UUID = str;
+ }
+
+ reg = Registry.LocalMachine.OpenSubKey(@"HARDWARE\DESCRIPTION\System\BIOS");
+ reg ??= Registry.LocalMachine.OpenSubKey(@"SYSTEM\HardwareConfig\Current");
+ if (reg != null)
+ {
+ Product = (reg.GetValue("SystemProductName")?.ToString() ?? "").Replace("System Product Name", "");
+ if (String.IsNullOrEmpty(Product)) Product = reg.GetValue("BaseBoardProduct")?.ToString() ?? "";
+
+ Vendor = reg.GetValue("SystemManufacturer")?.ToString() ?? "";
+ if (String.IsNullOrEmpty(Vendor)) Vendor = reg.GetValue("BaseBoardManufacturer")?.ToString() ?? "";
+ }
+
+ reg = Registry.LocalMachine.OpenSubKey(@"HARDWARE\DESCRIPTION\System\CentralProcessor\0");
+ if (reg != null) Processor = reg.GetValue("ProcessorNameString")?.ToString() ?? "";
+ }
+ catch
+ {
+ // 忽略注册表访问错误
+ }
+#endif
+
+ // 旧版系统（如win2008）没有UUID的注册表项，需要用wmic查询
+ if (String.IsNullOrEmpty(UUID) || UUID == Guid || String.IsNullOrEmpty(Vendor))
+ {
+ var csproduct = ReadWmic("csproduct", "Name", "UUID", "Vendor");
+ if (csproduct != null)
+ {
+ if (csproduct.TryGetValue("Name", out str) && !String.IsNullOrEmpty(str) && String.IsNullOrEmpty(Product))
+ Product = str;
+ if (csproduct.TryGetValue("UUID", out str) && !String.IsNullOrEmpty(str))
+ UUID = str;
+ if (csproduct.TryGetValue("Vendor", out str) && !String.IsNullOrEmpty(str))
+ Vendor = str;
+ }
+ }
+
+ // 获取操作系统名称和版本
+ try
+ {
+#if NETFRAMEWORK || NET6_0_OR_GREATER
+ var reg = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion");
+ if (reg != null)
+ {
+ OSName = reg.GetValue("ProductName")?.ToString() ?? "";
+ var releaseId = reg.GetValue("ReleaseId")?.ToString() ?? "";
+ if (!String.IsNullOrEmpty(releaseId))
+ OSVersion = releaseId;
+ }
+#endif
+ }
+ catch
+ {
+ // 使用默认值
+ }
+
+ // 通过 wmic 获取更多信息
+ var os = ReadWmic("os", "Caption", "Version");
+ if (os != null && os.Count > 0)
+ {
+ if (os.TryGetValue("Caption", out str))
+ OSName = str.Replace("Microsoft", "").Trim();
+ if (os.TryGetValue("Version", out str))
+ OSVersion = str;
+ }
+
+ // 获取磁盘信息
+ var disk = ReadWmic("diskdrive where mediatype=\"Fixed hard disk media\"", "serialnumber");
+ if (disk != null && disk.TryGetValue("serialnumber", out str))
+ DiskID = str?.Trim();
+
+ // 获取BIOS序列号
+ var bios = ReadWmic("bios", "serialnumber");
+ if (bios != null && bios.TryGetValue("serialnumber", out str) &&
+ !str.Equals("System Serial Number", StringComparison.OrdinalIgnoreCase))
+ Serial = str?.Trim();
+
+ // 获取主板序列号
+ var board = ReadWmic("baseboard", "serialnumber");
+ if (board != null && board.TryGetValue("serialnumber", out str))
+ Board = str?.Trim();
+
+ if (String.IsNullOrEmpty(OSName))
+ {
+#if NETFRAMEWORK
+ OSName = Environment.OSVersion.Platform.ToString().Replace("Microsoft", "").Trim();
+#else
+ OSName = RuntimeInformation.OSDescription.Replace("Microsoft", "").Trim();
+#endif
+ }
+ if (String.IsNullOrEmpty(OSVersion))
+ OSVersion = Environment.OSVersion.Version.ToString();
+ }
+
+#if NET5_0_OR_GREATER
+ [SupportedOSPlatform("windows")]
+#endif
+ private void RefreshWindows()
+ {
+ // 获取内存信息
+ try
+ {
+ var memStatus = new MEMORYSTATUSEX();
+ memStatus.Init();
+ if (GlobalMemoryStatusEx(ref memStatus))
+ {
+ Memory = memStatus.ullTotalPhys;
+ AvailableMemory = memStatus.ullAvailPhys;
+ }
+ }
+ catch
+ {
+ // 忽略内存获取错误
+ }
+
+ // 获取CPU使用率
+ try
+ {
+ if (GetSystemTimes(out var idleTime, out var kernelTime, out var userTime))
+ {
+ var idle = idleTime.ToLong();
+ var kernel = kernelTime.ToLong();
+ var user = userTime.ToLong();
+ var total = kernel + user;
+
+ if (_systemTime != null)
+ {
+ var idleDelta = idle - _systemTime.IdleTime;
+ var totalDelta = total - _systemTime.TotalTime;
+
+ if (totalDelta > 0)
+ {
+ CpuRate = 1.0 - ((double)idleDelta / totalDelta);
+ if (CpuRate < 0) CpuRate = 0;
+ if (CpuRate > 1) CpuRate = 1;
+ }
+ }
+
+ _systemTime = new SystemTime { IdleTime = idle, TotalTime = total };
+ }
+ }
+ catch
+ {
+ // 忽略CPU使用率获取错误
+ }
+ }
+
+ #region Windows API
+ [DllImport("Kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+ [SecurityCritical]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ internal static extern Boolean GlobalMemoryStatusEx(ref MEMORYSTATUSEX lpBuffer);
+
+ internal struct MEMORYSTATUSEX
+ {
+ internal UInt32 dwLength;
+ internal UInt32 dwMemoryLoad;
+ internal UInt64 ullTotalPhys;
+ internal UInt64 ullAvailPhys;
+ internal UInt64 ullTotalPageFile;
+ internal UInt64 ullAvailPageFile;
+ internal UInt64 ullTotalVirtual;
+ internal UInt64 ullAvailVirtual;
+ internal UInt64 ullAvailExtendedVirtual;
+
+ internal void Init() => dwLength = checked((UInt32)Marshal.SizeOf(typeof(MEMORYSTATUSEX)));
+ }
+
+ [DllImport("kernel32.dll", SetLastError = true)]
+ private static extern Boolean GetSystemTimes(out FILETIME idleTime, out FILETIME kernelTime, out FILETIME userTime);
+
+ private struct FILETIME
+ {
+ public UInt32 Low;
+ public UInt32 High;
+
+ public FILETIME(Int64 time)
+ {
+ Low = (UInt32)time;
+ High = (UInt32)(time >> 32);
+ }
+
+ public Int64 ToLong() => (Int64)(((UInt64)High << 32) | Low);
+ }
+ #endregion
+
+ #region Windows辅助方法
+ /// 通过WMIC命令读取信息
+ /// WMI类型
+ /// 查询字段
+ /// 解析后的字典
+ private static Dictionary ReadWmic(String type, params String[] keys)
+ {
+ var dic = new Dictionary>(StringComparer.OrdinalIgnoreCase);
+ var dic2 = new Dictionary(StringComparer.OrdinalIgnoreCase);
+
+ try
+ {
+ var args = $"{type} get {String.Join(",", keys)} /format:list";
+ var psi = new ProcessStartInfo
+ {
+ FileName = "wmic",
+ Arguments = args,
+ RedirectStandardOutput = true,
+ UseShellExecute = false,
+ CreateNoWindow = true
+ };
+
+ using var process = Process.Start(psi);
+ if (process != null)
+ {
+ var output = process.StandardOutput.ReadToEnd();
+ process.WaitForExit();
+
+ if (!String.IsNullOrEmpty(output))
+ {
+ var lines = output.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
+ foreach (var line in lines)
+ {
+ var parts = line.Split('=');
+ if (parts.Length >= 2)
+ {
+ var key = parts[0].Trim();
+ var value = parts[1].Trim();
+
+ // 清理不可见字符
+ value = Clean(value) ?? "";
+
+ if (!String.IsNullOrEmpty(key) && !String.IsNullOrEmpty(value))
+ {
+ if (!dic.TryGetValue(key, out var list))
+ dic[key] = list = new List();
+
+ list.Add(value);
+ }
+ }
+ }
+ }
+ }
+
+ // 排序，避免多个磁盘序列号时，顺序变动
+ foreach (var item in dic)
+ {
+ dic2[item.Key] = String.Join(",", item.Value.OrderBy(e => e));
+ }
+ }
+ catch
+ {
+ // 忽略错误
+ }
+
+ return dic2;
+ }
+ #endregion
+}
diff --git a/src/LuYao.Common/Devices/MachineInfo.cs b/src/LuYao.Common/Devices/MachineInfo.cs
index caee936..e4673fe 100644
--- a/src/LuYao.Common/Devices/MachineInfo.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.cs
@@ -1,83 +1,237 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.IO;
using System.Linq;
+using System.Net.NetworkInformation;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
namespace LuYao.Devices;
+///
+/// 机器信息类，用于获取和存储机器的硬件和系统信息
+///
+///
+/// 该类提供了跨平台的机器信息获取功能，包括操作系统信息、硬件标识、性能指标等。
+/// 支持 Windows、Linux 和 macOS 操作系统。
+/// 刷新信息成本较高，建议采用单例模式或缓存机制。
+///
public partial class MachineInfo
{
- public static MachineInfo Get()
- {
- var info = new MachineInfo();
- info.Reload();
- return info;
- }
+ #region 属性
/// 系统名称
+ [DisplayName("系统名称")]
public String? OSName { get; set; }
/// 系统版本
+ [DisplayName("系统版本")]
public String? OSVersion { get; set; }
/// 产品名称
+ [DisplayName("产品名称")]
public String? Product { get; set; }
/// 制造商
+ [DisplayName("制造商")]
public String? Vendor { get; set; }
/// 处理器型号
+ [DisplayName("处理器型号")]
public String? Processor { get; set; }
+
+ /// 硬件唯一标识。取主板编码，部分品牌存在重复
+ [DisplayName("硬件唯一标识")]
+ public String? UUID { get; set; }
+
+ /// 软件唯一标识。系统标识，操作系统重装后更新，Linux系统的machine_id，Android的android_id，Ghost系统存在重复
+ [DisplayName("软件唯一标识")]
+ public String? Guid { get; set; }
+
/// 计算机序列号。适用于品牌机，跟笔记本标签显示一致
+ [DisplayName("计算机序列号")]
public String? Serial { get; set; }
/// 主板。序列号或家族信息
+ [DisplayName("主板")]
public String? Board { get; set; }
/// 磁盘序列号
+ [DisplayName("磁盘序列号")]
public String? DiskID { get; set; }
- private void Reset()
+
+ /// 内存总量。单位Byte
+ [DisplayName("内存总量")]
+ public UInt64 Memory { get; set; }
+
+ /// 可用内存。单位Byte
+ [DisplayName("可用内存")]
+ public UInt64 AvailableMemory { get; set; }
+
+ /// 空闲内存。在Linux上空闲内存不一定可用，单位Byte
+ [DisplayName("空闲内存")]
+ public UInt64 FreeMemory { get; set; }
+
+ /// CPU占用率
+ [DisplayName("CPU占用率")]
+ public Double CpuRate { get; set; }
+
+ /// 网络上行速度。字节每秒，初始化后首次读取为0
+ [DisplayName("网络上行速度")]
+ public UInt64 UplinkSpeed { get; set; }
+
+ /// 网络下行速度。字节每秒，初始化后首次读取为0
+ [DisplayName("网络下行速度")]
+ public UInt64 DownlinkSpeed { get; set; }
+
+ /// 温度。单位度
+ [DisplayName("温度")]
+ public Double Temperature { get; set; }
+
+ /// 电池剩余。小于1的小数，常用百分比表示
+ [DisplayName("电池剩余")]
+ public Double Battery { get; set; }
+
+ private readonly Dictionary _items = new Dictionary();
+
+ /// 获取 或 设置 扩展属性数据
+ /// 属性键名
+ /// 属性值
+ public Object? this[String key]
+ {
+ get => _items.TryGetValue(key, out var obj) ? obj : null;
+ set => _items[key] = value;
+ }
+ #endregion
+
+ #region 静态方法
+ ///
+ /// 获取机器信息的静态实例
+ ///
+ /// 初始化后的机器信息实例
+ public static MachineInfo Get()
{
- this.OSName = Environment.OSVersion.Platform.ToString();
- this.OSVersion = Environment.OSVersion.VersionString;
+ var info = new MachineInfo();
+ info.Init();
+ return info;
}
- public void Reload()
+ #endregion
+
+ #region 初始化和刷新
+ ///
+ /// 初始化机器信息，加载静态硬件信息
+ ///
+ public void Init()
{
- this.Reset();
+ Reset();
+
+#if NETFRAMEWORK
+ // .NET Framework only runs on Windows
+ LoadWindowsInfo();
+#else
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
- MachineInfoWindows.Reload(this);
+ LoadWindowsInfo();
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
- MachineInfoLinux.Reload(this);
+ LoadLinuxInfo();
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
- MachineInfoMacOS.Reload(this);
+ LoadMacInfo();
}
- }
+#endif
- private static class MachineInfoWindows
- {
- public static void Reload(MachineInfo info)
+ // 清理数据
+ OSName = Clean(OSName);
+ OSVersion = Clean(OSVersion);
+ Product = Clean(Product);
+ Vendor = Clean(Vendor);
+ Processor = Clean(Processor);
+ UUID = Clean(UUID);
+ Guid = Clean(Guid);
+ Serial = Clean(Serial);
+ Board = Clean(Board);
+ DiskID = Clean(DiskID);
+
+ // 无法读取系统标识时，随机生成一个guid
+ if (String.IsNullOrEmpty(Guid))
+ Guid = "0-" + System.Guid.NewGuid().ToString();
+ if (String.IsNullOrEmpty(UUID))
+ UUID = "0-" + System.Guid.NewGuid().ToString();
+
+ try
+ {
+ Refresh();
+ }
+ catch
{
- throw new NotImplementedException();
+ // 忽略刷新错误
}
}
- private static class MachineInfoLinux
+
+ ///
+ /// 刷新动态性能信息（CPU、内存、网络等）
+ ///
+ public void Refresh()
{
- public static void Reload(MachineInfo info)
+#if NETFRAMEWORK
+ // .NET Framework only runs on Windows
+ RefreshWindows();
+#else
+ if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+ {
+ RefreshWindows();
+ }
+ else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+ {
+ RefreshLinux();
+ }
+ else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
- throw new NotImplementedException();
+ RefreshMacOS();
}
+#endif
+
+ RefreshSpeed();
+ }
+
+ private void Reset()
+ {
+#if NETFRAMEWORK
+ OSName = Environment.OSVersion.Platform.ToString();
+ OSVersion = Environment.OSVersion.VersionString;
+#else
+ OSName = RuntimeInformation.OSDescription;
+ OSVersion = Environment.OSVersion.VersionString;
+#endif
}
- private static class MachineInfoMacOS
+
+ /// 裁剪不可见字符并去除两端空白
+ private static String? Clean(String? value)
{
- public static void Reload(MachineInfo info)
+ if (String.IsNullOrEmpty(value)) return value;
+
+ var sb = new StringBuilder();
+ foreach (var c in value)
{
- throw new NotImplementedException();
+ if (c >= 32 && c != 127) // 过滤控制字符
+ sb.Append(c);
}
+ return sb.ToString().Trim();
+ }
+ #endregion
+
+ #region 平台相关私有类
+ private class SystemTime
+ {
+ public Int64 IdleTime;
+ public Int64 TotalTime;
}
+
+ private SystemTime? _systemTime;
+ #endregion
}
diff --git a/tests/LuYao.Common.UnitTests/Devices/MachineInfoTests.cs b/tests/LuYao.Common.UnitTests/Devices/MachineInfoTests.cs
new file mode 100644
index 0000000..8084563
--- /dev/null
+++ b/tests/LuYao.Common.UnitTests/Devices/MachineInfoTests.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+using LuYao.Devices;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LuYao.Common.UnitTests.Devices;
+
+///
+/// MachineInfo 类的单元测试
+///
+[TestClass]
+public class MachineInfoTests
+{
+ [TestMethod]
+ public void Get_ShouldReturnMachineInfo()
+ {
+ // Act
+ var machineInfo = MachineInfo.Get();
+
+ // Assert
+ Assert.IsNotNull(machineInfo);
+ }
+
+ [TestMethod]
+ public void OSName_ShouldNotBeNullOrEmpty()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+
+ // Assert
+ Assert.IsFalse(String.IsNullOrEmpty(machineInfo.OSName), "OSName should not be null or empty");
+ }
+
+ [TestMethod]
+ public void OSVersion_ShouldNotBeNullOrEmpty()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+
+ // Assert
+ Assert.IsFalse(String.IsNullOrEmpty(machineInfo.OSVersion), "OSVersion should not be null or empty");
+ }
+
+ [TestMethod]
+ public void Guid_ShouldNotBeNullOrEmpty()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+
+ // Assert
+ Assert.IsFalse(String.IsNullOrEmpty(machineInfo.Guid), "Guid should not be null or empty");
+ }
+
+ [TestMethod]
+ public void UUID_ShouldNotBeNullOrEmpty()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+
+ // Assert
+ Assert.IsFalse(String.IsNullOrEmpty(machineInfo.UUID), "UUID should not be null or empty");
+ }
+
+ [TestMethod]
+ public void Memory_ShouldBeGreaterThanZero()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+
+ // Assert
+ Assert.IsTrue(machineInfo.Memory > 0, "Memory should be greater than 0");
+ }
+
+ [TestMethod]
+ public void Refresh_ShouldUpdateDynamicProperties()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+ var initialMemory = machineInfo.Memory;
+
+ // Act
+ machineInfo.Refresh();
+
+ // Assert - Memory should still be > 0 after refresh
+ Assert.IsTrue(machineInfo.Memory > 0, "Memory should be greater than 0 after refresh");
+ }
+
+ [TestMethod]
+ public void CpuRate_ShouldBeInValidRange()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+
+ // Need to refresh twice to get CPU rate
+ machineInfo.Refresh();
+ Thread.Sleep(1000);
+ machineInfo.Refresh();
+
+ // Assert - CPU rate should be between 0 and 1
+ Assert.IsTrue(machineInfo.CpuRate >= 0 && machineInfo.CpuRate <= 1,
+ $"CPU rate should be between 0 and 1, got {machineInfo.CpuRate}");
+ }
+
+ [TestMethod]
+ public void ExtensionProperties_ShouldWork()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+
+ // Act
+ machineInfo["TestKey"] = "TestValue";
+ var value = machineInfo["TestKey"];
+
+ // Assert
+ Assert.AreEqual("TestValue", value);
+ }
+
+ [TestMethod]
+ public void ExtensionProperties_ShouldReturnNullForNonExistentKey()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+
+ // Act
+ var value = machineInfo["NonExistentKey"];
+
+ // Assert
+ Assert.IsNull(value);
+ }
+
+ [TestMethod]
+ public void RefreshSpeed_ShouldNotThrow()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+
+ // Act & Assert - Should not throw
+ machineInfo.RefreshSpeed();
+ Thread.Sleep(1000);
+ machineInfo.RefreshSpeed();
+
+ // Network speeds should be non-negative
+ Assert.IsTrue(machineInfo.UplinkSpeed >= 0, "Uplink speed should be non-negative");
+ Assert.IsTrue(machineInfo.DownlinkSpeed >= 0, "Downlink speed should be non-negative");
+ }
+
+ [TestMethod]
+ public void Processor_ShouldNotBeNull()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+
+ // Assert - Processor might be null on some platforms, but usually isn't
+ // Just checking it doesn't throw
+ var processor = machineInfo.Processor;
+ Assert.IsTrue(true); // Test passes if we get here
+ }
+
+ [TestMethod]
+ public void AvailableMemory_ShouldBeLessThanOrEqualToTotalMemory()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+
+ // Act
+ machineInfo.Refresh();
+
+ // Assert
+ if (machineInfo.AvailableMemory > 0)
+ {
+ Assert.IsTrue(machineInfo.AvailableMemory <= machineInfo.Memory,
+ $"Available memory ({machineInfo.AvailableMemory}) should be <= total memory ({machineInfo.Memory})");
+ }
+ }
+
+ [TestMethod]
+ public void FreeMemory_ShouldBeLessThanOrEqualToTotalMemory()
+ {
+ // Arrange
+ var machineInfo = MachineInfo.Get();
+
+ // Act
+ machineInfo.Refresh();
+
+ // Assert
+ if (machineInfo.FreeMemory > 0)
+ {
+ Assert.IsTrue(machineInfo.FreeMemory <= machineInfo.Memory,
+ $"Free memory ({machineInfo.FreeMemory}) should be <= total memory ({machineInfo.Memory})");
+ }
+ }
+}
From ce98dbce77b2bbacc1098c91b374c766fe858fa8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 14 Nov 2025 07:57:10 +0000
Subject: [PATCH 3/7] Add MachineInfo documentation in Chinese and English
Co-authored-by: Soar360 <15421284+Soar360@users.noreply.github.com>
---
docs/MachineInfo-EN.md | 346 +++++++++++++++++++++++++++++++++++++++++
docs/MachineInfo.md | 346 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 692 insertions(+)
create mode 100644 docs/MachineInfo-EN.md
create mode 100644 docs/MachineInfo.md
diff --git a/docs/MachineInfo-EN.md b/docs/MachineInfo-EN.md
new file mode 100644
index 0000000..3090c04
--- /dev/null
+++ b/docs/MachineInfo-EN.md
@@ -0,0 +1,346 @@
+# MachineInfo Class Documentation
+
+## Overview
+
+The `MachineInfo` class is used to retrieve and store machine hardware and system information. It provides cross-platform functionality for gathering machine information, supporting Windows, Linux, and macOS operating systems.
+
+## Key Features
+
+### Static Information
+- **Operating System Info**: OS name and version
+- **Hardware Identifiers**: UUID, GUID, serial numbers, and other unique identifiers
+- **Hardware Info**: Processor model, manufacturer, product name, etc.
+- **Storage Info**: Disk serial number, motherboard information
+
+### Dynamic Information
+- **Memory Status**: Total memory, available memory, free memory
+- **CPU Usage**: Real-time CPU utilization
+- **Network Speed**: Uplink and downlink network speeds
+- **Other Metrics**: Temperature, battery level (for supported devices)
+
+## Usage Examples
+
+### Basic Usage
+
+```csharp
+using LuYao.Devices;
+
+// Get machine information instance
+var machineInfo = MachineInfo.Get();
+
+// Access basic information
+Console.WriteLine($"OS: {machineInfo.OSName}");
+Console.WriteLine($"Version: {machineInfo.OSVersion}");
+Console.WriteLine($"Processor: {machineInfo.Processor}");
+Console.WriteLine($"Vendor: {machineInfo.Vendor}");
+Console.WriteLine($"Product: {machineInfo.Product}");
+```
+
+### View Hardware Identifiers
+
+```csharp
+var machineInfo = MachineInfo.Get();
+
+// Hardware unique identifier (motherboard UUID)
+Console.WriteLine($"UUID: {machineInfo.UUID}");
+
+// Software unique identifier (system GUID)
+Console.WriteLine($"GUID: {machineInfo.Guid}");
+
+// Computer serial number
+Console.WriteLine($"Serial: {machineInfo.Serial}");
+
+// Disk serial number
+Console.WriteLine($"Disk ID: {machineInfo.DiskID}");
+```
+
+### Monitor System Performance
+
+```csharp
+using LuYao.Devices;
+using LuYao.Globalization;
+
+var machineInfo = MachineInfo.Get();
+
+// Refresh dynamic information
+machineInfo.Refresh();
+
+// Memory information
+Console.WriteLine($"Total Memory: {SizeHelper.ToReadable(machineInfo.Memory)}");
+Console.WriteLine($"Available: {SizeHelper.ToReadable(machineInfo.AvailableMemory)}");
+Console.WriteLine($"Free: {SizeHelper.ToReadable(machineInfo.FreeMemory)}");
+
+// CPU usage (requires two refreshes for accurate value)
+System.Threading.Thread.Sleep(1000);
+machineInfo.Refresh();
+Console.WriteLine($"CPU Usage: {machineInfo.CpuRate:P2}");
+```
+
+### Monitor Network Speed
+
+```csharp
+var machineInfo = MachineInfo.Get();
+
+// First call establishes baseline
+machineInfo.RefreshSpeed();
+
+// Wait for a period
+System.Threading.Thread.Sleep(1000);
+
+// Call again to get speed
+machineInfo.RefreshSpeed();
+
+Console.WriteLine($"Upload: {SizeHelper.ToReadable(machineInfo.UplinkSpeed)}/s");
+Console.WriteLine($"Download: {SizeHelper.ToReadable(machineInfo.DownlinkSpeed)}/s");
+```
+
+### Using Extension Properties
+
+```csharp
+var machineInfo = MachineInfo.Get();
+
+// Set custom properties
+machineInfo["ApplicationVersion"] = "1.0.0";
+machineInfo["DeploymentDate"] = DateTime.Now;
+
+// Read custom properties
+var version = machineInfo["ApplicationVersion"];
+var deployDate = machineInfo["DeploymentDate"];
+
+Console.WriteLine($"App Version: {version}");
+Console.WriteLine($"Deploy Date: {deployDate}");
+```
+
+### Complete Example: System Monitoring
+
+```csharp
+using System;
+using System.Threading;
+using LuYao.Devices;
+using LuYao.Globalization;
+
+class Program
+{
+ static void Main()
+ {
+ var machineInfo = MachineInfo.Get();
+
+ // Display static information
+ Console.WriteLine("=== System Information ===");
+ Console.WriteLine($"OS: {machineInfo.OSName}");
+ Console.WriteLine($"Version: {machineInfo.OSVersion}");
+ Console.WriteLine($"Processor: {machineInfo.Processor}");
+ Console.WriteLine($"Vendor: {machineInfo.Vendor}");
+ Console.WriteLine($"Product: {machineInfo.Product}");
+ Console.WriteLine($"UUID: {machineInfo.UUID}");
+ Console.WriteLine($"GUID: {machineInfo.Guid}");
+ Console.WriteLine();
+
+ // Monitor dynamic information
+ Console.WriteLine("=== Performance Monitor (Press Ctrl+C to exit) ===");
+ machineInfo.RefreshSpeed(); // Establish network speed baseline
+
+ while (true)
+ {
+ machineInfo.Refresh();
+ machineInfo.RefreshSpeed();
+
+ Console.Clear();
+ Console.WriteLine($"Time: {DateTime.Now:yyyy-MM-dd HH:mm:ss}");
+ Console.WriteLine();
+
+ Console.WriteLine($"CPU Usage: {machineInfo.CpuRate:P2}");
+ Console.WriteLine($"Total Memory: {SizeHelper.ToReadable(machineInfo.Memory)}");
+ Console.WriteLine($"Available: {SizeHelper.ToReadable(machineInfo.AvailableMemory)}");
+ Console.WriteLine($"Usage: {(1.0 - (double)machineInfo.AvailableMemory / machineInfo.Memory):P2}");
+ Console.WriteLine();
+
+ Console.WriteLine($"Upload: {SizeHelper.ToReadable(machineInfo.UplinkSpeed)}/s");
+ Console.WriteLine($"Download: {SizeHelper.ToReadable(machineInfo.DownlinkSpeed)}/s");
+
+ Thread.Sleep(1000);
+ }
+ }
+}
+```
+
+## Property Reference
+
+### System Properties
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `OSName` | `string?` | Operating system name (e.g., "Windows 11", "Ubuntu 22.04") |
+| `OSVersion` | `string?` | Operating system version number |
+
+### Hardware Identifiers
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `UUID` | `string?` | Hardware unique identifier, motherboard UUID (may duplicate on some brands) |
+| `Guid` | `string?` | Software unique identifier, updates after OS reinstall |
+| `Serial` | `string?` | Computer serial number, suitable for branded machines |
+| `DiskID` | `string?` | Disk serial number |
+| `Board` | `string?` | Motherboard serial number or family information |
+
+### Hardware Information
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `Product` | `string?` | Product name (e.g., "ThinkPad X1 Carbon") |
+| `Vendor` | `string?` | Manufacturer (e.g., "Lenovo", "Dell") |
+| `Processor` | `string?` | Processor model (e.g., "Intel Core i7-10750H") |
+
+### Memory Information
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `Memory` | `ulong` | Total memory in bytes |
+| `AvailableMemory` | `ulong` | Available memory in bytes |
+| `FreeMemory` | `ulong` | Free memory in bytes (may differ from available on Linux) |
+
+### Performance Metrics
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `CpuRate` | `double` | CPU usage rate, range 0.0 ~ 1.0 |
+| `UplinkSpeed` | `ulong` | Network upload speed in bytes per second |
+| `DownlinkSpeed` | `ulong` | Network download speed in bytes per second |
+
+### Other Properties
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `Temperature` | `double` | Temperature in degrees (hardware dependent) |
+| `Battery` | `double` | Battery remaining, range 0.0 ~ 1.0 (device dependent) |
+
+### Extension Properties
+
+```csharp
+// Indexer for storing and retrieving custom properties
+object? this[string key] { get; set; }
+```
+
+## Method Reference
+
+### Get()
+
+Static method to get and initialize a new `MachineInfo` instance.
+
+```csharp
+var machineInfo = MachineInfo.Get();
+```
+
+### Init()
+
+Initialize machine information and load static hardware information. This method is automatically called in `Get()`.
+
+```csharp
+machineInfo.Init();
+```
+
+### Refresh()
+
+Refresh dynamic performance information (CPU, memory, etc.). Recommended to call periodically for latest performance data.
+
+```csharp
+machineInfo.Refresh();
+```
+
+### RefreshSpeed()
+
+Refresh network speed information. Requires at least two calls to calculate speed.
+
+```csharp
+machineInfo.RefreshSpeed();
+Thread.Sleep(1000);
+machineInfo.RefreshSpeed(); // Now can get accurate speed
+```
+
+## Platform Support
+
+### Windows
+- Supports .NET Framework 4.5+ and .NET Core 3.0+
+- Gets hardware info via registry and WMIC
+- Uses Win32 API for memory and CPU information
+
+### Linux
+- Supports .NET Core 3.0+
+- Reads system files like `/proc/cpuinfo`, `/proc/meminfo`, `/proc/stat`
+- Reads DMI information from `/sys/class/dmi/id/`
+- Reads `/etc/machine-id` for system GUID
+
+### macOS
+- Supports .NET Core 3.0+
+- Uses `system_profiler` for hardware information
+- Uses `vm_stat` for memory information
+- Uses `top` for CPU usage
+
+## Important Notes
+
+1. **Performance Impact**: Some operations (like WMIC queries on Windows) may be time-consuming. Consider caching the `MachineInfo` instance.
+
+2. **CPU Usage**: Requires two `Refresh()` calls (with at least 1 second interval) for accurate CPU usage.
+
+3. **Network Speed**: Similarly requires two `RefreshSpeed()` calls to calculate speed.
+
+4. **Permission Requirements**:
+ - Windows: Some registry keys may require administrator privileges
+ - Linux: Reading some system files may require root permissions
+ - macOS: Some system commands may require appropriate permissions
+
+5. **Unique Identifiers**:
+ - `UUID` and `Guid` may not be obtainable or unique in some environments (VMs, Ghost systems)
+ - Random GUIDs are automatically generated when unavailable
+
+6. **Cross-platform Compatibility**: Not all properties are available on all platforms. Check for `null` or empty strings before use.
+
+## Best Practices
+
+1. **Singleton Pattern**: Use singleton pattern to cache `MachineInfo` instance and avoid repeated initialization.
+
+```csharp
+public class SystemMonitor
+{
+ private static readonly Lazy _instance =
+ new Lazy(() => MachineInfo.Get());
+
+ public static MachineInfo Instance => _instance.Value;
+}
+```
+
+2. **Periodic Refresh**: Use a timer to periodically refresh performance data.
+
+```csharp
+var timer = new System.Timers.Timer(1000); // 1 second
+timer.Elapsed += (sender, e) =>
+{
+ machineInfo.Refresh();
+ machineInfo.RefreshSpeed();
+ UpdateUI(machineInfo);
+};
+timer.Start();
+```
+
+3. **Exception Handling**: Some operations may fail, handle exceptions appropriately.
+
+```csharp
+try
+{
+ var machineInfo = MachineInfo.Get();
+ machineInfo.Refresh();
+}
+catch (Exception ex)
+{
+ Console.WriteLine($"Failed to get machine info: {ex.Message}");
+}
+```
+
+## Reference
+
+This implementation is based on the MachineInfo implementation from the [NewLifeX](https://github.com/NewLifeX/X) project.
+
+## Related Documentation
+
+- [SizeHelper Documentation](SizeHelper-EN.md) - For formatting byte sizes
+- [UnitConverter Documentation](UnitConverter-EN.md) - Unit conversion tool
diff --git a/docs/MachineInfo.md b/docs/MachineInfo.md
new file mode 100644
index 0000000..7b65784
--- /dev/null
+++ b/docs/MachineInfo.md
@@ -0,0 +1,346 @@
+# MachineInfo 类文档
+
+## 概述
+
+`MachineInfo` 类用于获取和存储机器的硬件和系统信息。该类提供了跨平台的机器信息获取功能，支持 Windows、Linux 和 macOS 操作系统。
+
+## 主要功能
+
+### 静态信息
+- **操作系统信息**：操作系统名称和版本
+- **硬件标识**：UUID、GUID、序列号等唯一标识
+- **硬件信息**：处理器型号、制造商、产品名称等
+- **存储信息**：磁盘序列号、主板信息
+
+### 动态信息
+- **内存状态**：总内存、可用内存、空闲内存
+- **CPU 使用率**：实时 CPU 占用率
+- **网络速度**：上行和下行网络速度
+- **其他指标**：温度、电池剩余（适用于支持的设备）
+
+## 使用示例
+
+### 基本使用
+
+```csharp
+using LuYao.Devices;
+
+// 获取机器信息实例
+var machineInfo = MachineInfo.Get();
+
+// 访问基本信息
+Console.WriteLine($"操作系统: {machineInfo.OSName}");
+Console.WriteLine($"系统版本: {machineInfo.OSVersion}");
+Console.WriteLine($"处理器: {machineInfo.Processor}");
+Console.WriteLine($"制造商: {machineInfo.Vendor}");
+Console.WriteLine($"产品名称: {machineInfo.Product}");
+```
+
+### 查看硬件标识
+
+```csharp
+var machineInfo = MachineInfo.Get();
+
+// 硬件唯一标识（主板UUID）
+Console.WriteLine($"UUID: {machineInfo.UUID}");
+
+// 软件唯一标识（系统GUID）
+Console.WriteLine($"GUID: {machineInfo.Guid}");
+
+// 计算机序列号
+Console.WriteLine($"序列号: {machineInfo.Serial}");
+
+// 磁盘序列号
+Console.WriteLine($"磁盘ID: {machineInfo.DiskID}");
+```
+
+### 监控系统性能
+
+```csharp
+using LuYao.Devices;
+using LuYao.Globalization;
+
+var machineInfo = MachineInfo.Get();
+
+// 刷新动态信息
+machineInfo.Refresh();
+
+// 内存信息
+Console.WriteLine($"总内存: {SizeHelper.ToReadable(machineInfo.Memory)}");
+Console.WriteLine($"可用内存: {SizeHelper.ToReadable(machineInfo.AvailableMemory)}");
+Console.WriteLine($"空闲内存: {SizeHelper.ToReadable(machineInfo.FreeMemory)}");
+
+// CPU 占用率（需要两次刷新才能获得准确值）
+System.Threading.Thread.Sleep(1000);
+machineInfo.Refresh();
+Console.WriteLine($"CPU 占用率: {machineInfo.CpuRate:P2}");
+```
+
+### 监控网络速度
+
+```csharp
+var machineInfo = MachineInfo.Get();
+
+// 首次调用建立基线
+machineInfo.RefreshSpeed();
+
+// 等待一段时间
+System.Threading.Thread.Sleep(1000);
+
+// 再次调用获取速度
+machineInfo.RefreshSpeed();
+
+Console.WriteLine($"上行速度: {SizeHelper.ToReadable(machineInfo.UplinkSpeed)}/s");
+Console.WriteLine($"下行速度: {SizeHelper.ToReadable(machineInfo.DownlinkSpeed)}/s");
+```
+
+### 使用扩展属性
+
+```csharp
+var machineInfo = MachineInfo.Get();
+
+// 设置自定义属性
+machineInfo["ApplicationVersion"] = "1.0.0";
+machineInfo["DeploymentDate"] = DateTime.Now;
+
+// 读取自定义属性
+var version = machineInfo["ApplicationVersion"];
+var deployDate = machineInfo["DeploymentDate"];
+
+Console.WriteLine($"应用版本: {version}");
+Console.WriteLine($"部署日期: {deployDate}");
+```
+
+### 完整示例：系统信息监控
+
+```csharp
+using System;
+using System.Threading;
+using LuYao.Devices;
+using LuYao.Globalization;
+
+class Program
+{
+ static void Main()
+ {
+ var machineInfo = MachineInfo.Get();
+
+ // 显示静态信息
+ Console.WriteLine("=== 系统信息 ===");
+ Console.WriteLine($"操作系统: {machineInfo.OSName}");
+ Console.WriteLine($"系统版本: {machineInfo.OSVersion}");
+ Console.WriteLine($"处理器: {machineInfo.Processor}");
+ Console.WriteLine($"制造商: {machineInfo.Vendor}");
+ Console.WriteLine($"产品: {machineInfo.Product}");
+ Console.WriteLine($"UUID: {machineInfo.UUID}");
+ Console.WriteLine($"GUID: {machineInfo.Guid}");
+ Console.WriteLine();
+
+ // 监控动态信息
+ Console.WriteLine("=== 性能监控 (按 Ctrl+C 退出) ===");
+ machineInfo.RefreshSpeed(); // 建立网络速度基线
+
+ while (true)
+ {
+ machineInfo.Refresh();
+ machineInfo.RefreshSpeed();
+
+ Console.Clear();
+ Console.WriteLine($"时间: {DateTime.Now:yyyy-MM-dd HH:mm:ss}");
+ Console.WriteLine();
+
+ Console.WriteLine($"CPU 占用率: {machineInfo.CpuRate:P2}");
+ Console.WriteLine($"总内存: {SizeHelper.ToReadable(machineInfo.Memory)}");
+ Console.WriteLine($"可用内存: {SizeHelper.ToReadable(machineInfo.AvailableMemory)}");
+ Console.WriteLine($"内存使用率: {(1.0 - (double)machineInfo.AvailableMemory / machineInfo.Memory):P2}");
+ Console.WriteLine();
+
+ Console.WriteLine($"上行速度: {SizeHelper.ToReadable(machineInfo.UplinkSpeed)}/s");
+ Console.WriteLine($"下行速度: {SizeHelper.ToReadable(machineInfo.DownlinkSpeed)}/s");
+
+ Thread.Sleep(1000);
+ }
+ }
+}
+```
+
+## 属性说明
+
+### 系统属性
+
+| 属性 | 类型 | 说明 |
+|------|------|------|
+| `OSName` | `string?` | 操作系统名称（如 "Windows 11", "Ubuntu 22.04"） |
+| `OSVersion` | `string?` | 操作系统版本号 |
+
+### 硬件标识
+
+| 属性 | 类型 | 说明 |
+|------|------|------|
+| `UUID` | `string?` | 硬件唯一标识，取主板编码，部分品牌存在重复 |
+| `Guid` | `string?` | 软件唯一标识，操作系统重装后更新 |
+| `Serial` | `string?` | 计算机序列号，适用于品牌机 |
+| `DiskID` | `string?` | 磁盘序列号 |
+| `Board` | `string?` | 主板序列号或家族信息 |
+
+### 硬件信息
+
+| 属性 | 类型 | 说明 |
+|------|------|------|
+| `Product` | `string?` | 产品名称（如 "ThinkPad X1 Carbon"） |
+| `Vendor` | `string?` | 制造商（如 "Lenovo", "Dell"） |
+| `Processor` | `string?` | 处理器型号（如 "Intel Core i7-10750H"） |
+
+### 内存信息
+
+| 属性 | 类型 | 说明 |
+|------|------|------|
+| `Memory` | `ulong` | 内存总量，单位字节 |
+| `AvailableMemory` | `ulong` | 可用内存，单位字节 |
+| `FreeMemory` | `ulong` | 空闲内存，单位字节（Linux 上可能不同于可用内存） |
+
+### 性能指标
+
+| 属性 | 类型 | 说明 |
+|------|------|------|
+| `CpuRate` | `double` | CPU 占用率，范围 0.0 ~ 1.0 |
+| `UplinkSpeed` | `ulong` | 网络上行速度，字节每秒 |
+| `DownlinkSpeed` | `ulong` | 网络下行速度，字节每秒 |
+
+### 其他属性
+
+| 属性 | 类型 | 说明 |
+|------|------|------|
+| `Temperature` | `double` | 温度，单位度（取决于硬件支持） |
+| `Battery` | `double` | 电池剩余，范围 0.0 ~ 1.0（取决于设备类型） |
+
+### 扩展属性
+
+```csharp
+// 索引器，用于存储和检索自定义属性
+object? this[string key] { get; set; }
+```
+
+## 方法说明
+
+### Get()
+
+静态方法，获取并初始化一个新的 `MachineInfo` 实例。
+
+```csharp
+var machineInfo = MachineInfo.Get();
+```
+
+### Init()
+
+初始化机器信息，加载静态硬件信息。该方法在 `Get()` 中自动调用。
+
+```csharp
+machineInfo.Init();
+```
+
+### Refresh()
+
+刷新动态性能信息（CPU、内存等）。建议定期调用以获取最新性能数据。
+
+```csharp
+machineInfo.Refresh();
+```
+
+### RefreshSpeed()
+
+刷新网络速度信息。需要至少调用两次才能计算速度。
+
+```csharp
+machineInfo.RefreshSpeed();
+Thread.Sleep(1000);
+machineInfo.RefreshSpeed(); // 现在可以获取准确的速度
+```
+
+## 平台支持
+
+### Windows
+- 支持 .NET Framework 4.5+ 和 .NET Core 3.0+
+- 通过注册表和 WMIC 获取硬件信息
+- 使用 Win32 API 获取内存和 CPU 信息
+
+### Linux
+- 支持 .NET Core 3.0+
+- 读取 `/proc/cpuinfo`、`/proc/meminfo`、`/proc/stat` 等系统文件
+- 读取 `/sys/class/dmi/id/` 下的 DMI 信息
+- 读取 `/etc/machine-id` 获取系统 GUID
+
+### macOS
+- 支持 .NET Core 3.0+
+- 使用 `system_profiler` 获取硬件信息
+- 使用 `vm_stat` 获取内存信息
+- 使用 `top` 获取 CPU 使用率
+
+## 注意事项
+
+1. **性能影响**：某些操作（如 Windows 上的 WMIC 查询）可能耗时较长，建议缓存 `MachineInfo` 实例。
+
+2. **CPU 使用率**：需要两次 `Refresh()` 调用（中间间隔至少 1 秒）才能获得准确的 CPU 使用率。
+
+3. **网络速度**：同样需要两次 `RefreshSpeed()` 调用才能计算速度。
+
+4. **权限要求**：
+ - Windows：某些注册表项可能需要管理员权限
+ - Linux：读取某些系统文件可能需要 root 权限
+ - macOS：某些系统命令可能需要适当权限
+
+5. **唯一标识**：
+ - `UUID` 和 `Guid` 可能在某些环境下无法获取或不唯一（如虚拟机、Ghost 系统）
+ - 在无法获取时会自动生成随机 GUID
+
+6. **跨平台兼容性**：并非所有属性在所有平台上都可用。使用前应检查属性是否为 `null` 或空字符串。
+
+## 最佳实践
+
+1. **单例模式**：建议使用单例模式缓存 `MachineInfo` 实例，避免重复初始化。
+
+```csharp
+public class SystemMonitor
+{
+ private static readonly Lazy _instance =
+ new Lazy(() => MachineInfo.Get());
+
+ public static MachineInfo Instance => _instance.Value;
+}
+```
+
+2. **定时刷新**：使用定时器定期刷新性能数据。
+
+```csharp
+var timer = new System.Timers.Timer(1000); // 1 秒
+timer.Elapsed += (sender, e) =>
+{
+ machineInfo.Refresh();
+ machineInfo.RefreshSpeed();
+ UpdateUI(machineInfo);
+};
+timer.Start();
+```
+
+3. **异常处理**：某些操作可能失败，应适当处理异常。
+
+```csharp
+try
+{
+ var machineInfo = MachineInfo.Get();
+ machineInfo.Refresh();
+}
+catch (Exception ex)
+{
+ Console.WriteLine($"获取机器信息失败: {ex.Message}");
+}
+```
+
+## 参考
+
+本实现参考了 [NewLifeX](https://github.com/NewLifeX/X) 项目的 MachineInfo 实现。
+
+## 相关文档
+
+- [SizeHelper 文档](SizeHelper.md) - 用于格式化字节大小
+- [UnitConverter 文档](UnitConverter.md) - 单位转换工具
From 0d021dc2c70191301115e0415a8a6f3236a94069 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 14 Nov 2025 08:09:09 +0000
Subject: [PATCH 4/7] Simplify MachineInfo to keep only 8 basic properties as
requested
Co-authored-by: Soar360 <15421284+Soar360@users.noreply.github.com>
---
src/LuYao.Common/Devices/MachineInfo.Linux.cs | 103 ++-----------
src/LuYao.Common/Devices/MachineInfo.MacOS.cs | 115 +-------------
.../Devices/MachineInfo.Network.cs | 67 ---------
.../Devices/MachineInfo.Windows.cs | 127 +---------------
src/LuYao.Common/Devices/MachineInfo.cs | 101 +------------
.../Devices/MachineInfoTests.cs | 140 ++++--------------
6 files changed, 52 insertions(+), 601 deletions(-)
delete mode 100644 src/LuYao.Common/Devices/MachineInfo.Network.cs
diff --git a/src/LuYao.Common/Devices/MachineInfo.Linux.cs b/src/LuYao.Common/Devices/MachineInfo.Linux.cs
index 66474f5..e79efc7 100644
--- a/src/LuYao.Common/Devices/MachineInfo.Linux.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.Linux.cs
@@ -43,28 +43,8 @@ private void LoadLinuxInfo()
if (cpuinfo.TryGetValue("vendor_id", out str))
Vendor = str;
-
- if (cpuinfo.TryGetValue("Serial", out str) &&
- !String.IsNullOrEmpty(str) &&
- str.Trim('0') != "")
- UUID = str;
}
- // 读取 machine-id
- var mid = "/etc/machine-id";
- if (!File.Exists(mid)) mid = "/var/lib/dbus/machine-id";
- if (TryRead(mid, out var value))
- Guid = value;
-
- // 读取 UUID
- var uuid = "";
- var file = "/sys/class/dmi/id/product_uuid";
- if (!File.Exists(file)) file = "/etc/uuid";
- if (!File.Exists(file)) file = "/proc/serial_num";
- if (TryRead(file, out value))
- uuid = value;
- if (!String.IsNullOrEmpty(uuid)) UUID = uuid;
-
// 从release文件读取产品
var prd = GetProductByRelease();
if (!String.IsNullOrEmpty(prd)) Product = prd;
@@ -89,91 +69,30 @@ private void LoadLinuxInfo()
Serial = product_serial;
}
- // 获取内存信息
- var meminfo = ReadInfo("/proc/meminfo");
- if (meminfo != null)
- {
- if (meminfo.TryGetValue("MemTotal", out str))
- {
- var match = System.Text.RegularExpressions.Regex.Match(str, @"(\d+)");
- if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var mem))
- Memory = mem * 1024; // kB to Bytes
- }
- }
- }
-
-#if NET5_0_OR_GREATER
- [SupportedOSPlatform("linux")]
-#endif
- private void RefreshLinux()
- {
- // 刷新内存信息
- var meminfo = ReadInfo("/proc/meminfo");
- if (meminfo != null)
- {
- if (meminfo.TryGetValue("MemTotal", out var str))
- {
- var match = System.Text.RegularExpressions.Regex.Match(str, @"(\d+)");
- if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var mem))
- Memory = mem * 1024;
- }
-
- if (meminfo.TryGetValue("MemAvailable", out str))
- {
- var match = System.Text.RegularExpressions.Regex.Match(str, @"(\d+)");
- if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var mem))
- AvailableMemory = mem * 1024;
- }
-
- if (meminfo.TryGetValue("MemFree", out str))
- {
- var match = System.Text.RegularExpressions.Regex.Match(str, @"(\d+)");
- if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var mem))
- FreeMemory = mem * 1024;
- }
- }
-
- // 获取CPU使用率
+ // 获取磁盘序列号 (简化版，仅获取第一个硬盘)
try
{
- var stat = File.ReadAllText("/proc/stat");
- var lines = stat.Split('\n');
- foreach (var line in lines)
+ var diskDir = "/sys/block/";
+ if (Directory.Exists(diskDir))
{
- if (line.StartsWith("cpu "))
+ foreach (var disk in Directory.GetDirectories(diskDir))
{
- var parts = line.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
- if (parts.Length >= 5)
+ var diskName = Path.GetFileName(disk);
+ if (diskName.StartsWith("sd") || diskName.StartsWith("nvme") || diskName.StartsWith("hd"))
{
- var user = Int64.Parse(parts[1]);
- var nice = Int64.Parse(parts[2]);
- var system = Int64.Parse(parts[3]);
- var idle = Int64.Parse(parts[4]);
-
- var total = user + nice + system + idle;
-
- if (_systemTime != null)
+ var serialFile = Path.Combine(disk, "device", "serial");
+ if (TryRead(serialFile, out var diskSerial))
{
- var idleDelta = idle - _systemTime.IdleTime;
- var totalDelta = total - _systemTime.TotalTime;
-
- if (totalDelta > 0)
- {
- CpuRate = 1.0 - ((double)idleDelta / totalDelta);
- if (CpuRate < 0) CpuRate = 0;
- if (CpuRate > 1) CpuRate = 1;
- }
+ DiskID = diskSerial;
+ break;
}
-
- _systemTime = new SystemTime { IdleTime = idle, TotalTime = total };
}
- break;
}
}
}
catch
{
- // 忽略CPU使用率获取错误
+ // 忽略磁盘序列号读取错误
}
}
diff --git a/src/LuYao.Common/Devices/MachineInfo.MacOS.cs b/src/LuYao.Common/Devices/MachineInfo.MacOS.cs
index d9ae23a..dcfd115 100644
--- a/src/LuYao.Common/Devices/MachineInfo.MacOS.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.MacOS.cs
@@ -42,21 +42,6 @@ private void LoadMacInfo()
Processor = trimmed.Substring("Chip:".Length).Trim();
else if (trimmed.StartsWith("Serial Number (system):"))
Serial = trimmed.Substring("Serial Number (system):".Length).Trim();
- else if (trimmed.StartsWith("Hardware UUID:"))
- UUID = trimmed.Substring("Hardware UUID:".Length).Trim();
- else if (trimmed.StartsWith("Memory:"))
- {
- var memStr = trimmed.Substring("Memory:".Length).Trim();
- // Parse memory like "16 GB" or "8 GB"
- var parts = memStr.Split(' ');
- if (parts.Length >= 2 && Double.TryParse(parts[0], out var memValue))
- {
- if (parts[1].Equals("GB", StringComparison.OrdinalIgnoreCase))
- Memory = (UInt64)(memValue * 1024 * 1024 * 1024);
- else if (parts[1].Equals("MB", StringComparison.OrdinalIgnoreCase))
- Memory = (UInt64)(memValue * 1024 * 1024);
- }
- }
}
}
@@ -82,17 +67,8 @@ private void LoadMacInfo()
}
}
- // 获取 UUID（如果上面没有获取到）
- if (String.IsNullOrEmpty(UUID))
- {
- UUID = ExecuteCommand("ioreg", "-rd1 -c IOPlatformExpertDevice | grep IOPlatformUUID")?.Trim();
- if (!String.IsNullOrEmpty(UUID))
- {
- var match = System.Text.RegularExpressions.Regex.Match(UUID, @"""([A-F0-9-]+)""");
- if (match.Success)
- UUID = match.Groups[1].Value;
- }
- }
+ // 尝试获取供应商信息 (通常是 Apple)
+ Vendor = "Apple";
}
catch
{
@@ -109,93 +85,6 @@ private void LoadMacInfo()
}
}
-#if NET5_0_OR_GREATER
- [SupportedOSPlatform("macos")]
-#endif
- private void RefreshMacOS()
- {
- // 获取内存信息
- try
- {
- var vmStat = ExecuteCommand("vm_stat", "");
- if (!String.IsNullOrEmpty(vmStat))
- {
- var pageSize = 4096UL; // macOS typical page size
- var lines = vmStat.Split('\n');
-
- UInt64 free = 0, active = 0, inactive = 0, wired = 0;
-
- foreach (var line in lines)
- {
- if (line.Contains("page size of"))
- {
- var match = System.Text.RegularExpressions.Regex.Match(line, @"(\d+)");
- if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var ps))
- pageSize = ps;
- }
- else if (line.StartsWith("Pages free:"))
- {
- var match = System.Text.RegularExpressions.Regex.Match(line, @"(\d+)");
- if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var pages))
- free = pages * pageSize;
- }
- else if (line.StartsWith("Pages active:"))
- {
- var match = System.Text.RegularExpressions.Regex.Match(line, @"(\d+)");
- if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var pages))
- active = pages * pageSize;
- }
- else if (line.StartsWith("Pages inactive:"))
- {
- var match = System.Text.RegularExpressions.Regex.Match(line, @"(\d+)");
- if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var pages))
- inactive = pages * pageSize;
- }
- else if (line.StartsWith("Pages wired down:"))
- {
- var match = System.Text.RegularExpressions.Regex.Match(line, @"(\d+)");
- if (match.Success && UInt64.TryParse(match.Groups[1].Value, out var pages))
- wired = pages * pageSize;
- }
- }
-
- FreeMemory = free;
- AvailableMemory = free + inactive;
- }
- }
- catch
- {
- // 忽略错误
- }
-
- // 获取CPU使用率
- try
- {
- var top = ExecuteCommand("top", "-l 1 -n 0");
- if (!String.IsNullOrEmpty(top))
- {
- var lines = top.Split('\n');
- foreach (var line in lines)
- {
- if (line.Contains("CPU usage:"))
- {
- // Parse "CPU usage: 3.57% user, 14.28% sys, 82.14% idle"
- var match = System.Text.RegularExpressions.Regex.Match(line, @"(\d+\.?\d*)%\s+idle");
- if (match.Success && Double.TryParse(match.Groups[1].Value, out var idle))
- {
- CpuRate = (100.0 - idle) / 100.0;
- }
- break;
- }
- }
- }
- }
- catch
- {
- // 忽略错误
- }
- }
-
#region macOS辅助方法
private static String? ExecuteCommand(String command, String arguments)
{
diff --git a/src/LuYao.Common/Devices/MachineInfo.Network.cs b/src/LuYao.Common/Devices/MachineInfo.Network.cs
deleted file mode 100644
index f0b7f98..0000000
--- a/src/LuYao.Common/Devices/MachineInfo.Network.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.Linq;
-using System.Net.NetworkInformation;
-
-namespace LuYao.Devices;
-
-///
-/// MachineInfo 的网络监控部分
-///
-public partial class MachineInfo
-{
- private Int64 _lastTime;
- private Int64 _lastSent;
- private Int64 _lastReceived;
-
- ///
- /// 刷新网络速度信息
- ///
- public void RefreshSpeed()
- {
- try
- {
- var interfaces = NetworkInterface.GetAllNetworkInterfaces();
-
- Int64 sent = 0;
- Int64 received = 0;
-
- foreach (var ni in interfaces)
- {
- // 只统计活动的物理网络接口
- if (ni.OperationalStatus == OperationalStatus.Up &&
- ni.NetworkInterfaceType != NetworkInterfaceType.Loopback &&
- ni.NetworkInterfaceType != NetworkInterfaceType.Tunnel)
- {
- var stats = ni.GetIPv4Statistics();
- sent += stats.BytesSent;
- received += stats.BytesReceived;
- }
- }
-
- var now = (Int64)(DateTimeOffset.UtcNow - new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero)).TotalSeconds;
-
- if (_lastTime > 0)
- {
- var elapsed = now - _lastTime;
- if (elapsed > 0)
- {
- var sentDiff = sent - _lastSent;
- var receivedDiff = received - _lastReceived;
-
- if (sentDiff >= 0)
- UplinkSpeed = (UInt64)(sentDiff / elapsed);
- if (receivedDiff >= 0)
- DownlinkSpeed = (UInt64)(receivedDiff / elapsed);
- }
- }
-
- _lastSent = sent;
- _lastReceived = received;
- _lastTime = now;
- }
- catch
- {
- // 忽略网络统计错误
- }
- }
-}
diff --git a/src/LuYao.Common/Devices/MachineInfo.Windows.cs b/src/LuYao.Common/Devices/MachineInfo.Windows.cs
index 7a7ea10..3d32630 100644
--- a/src/LuYao.Common/Devices/MachineInfo.Windows.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.Windows.cs
@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
-using System.Security;
using System.Text;
#if NET5_0_OR_GREATER
@@ -29,32 +27,11 @@ private void LoadWindowsInfo()
{
var str = "";
- // 从注册表读取 MachineGuid
+ // 从注册表读取硬件信息
#if NETFRAMEWORK || NET6_0_OR_GREATER
try
{
- var reg = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Cryptography");
- if (reg != null) str = reg.GetValue("MachineGuid")?.ToString() ?? "";
- if (String.IsNullOrEmpty(str))
- {
- reg = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64);
- reg = reg?.OpenSubKey(@"SOFTWARE\Microsoft\Cryptography");
- if (reg != null) str = reg.GetValue("MachineGuid")?.ToString() ?? "";
- }
-
- if (!String.IsNullOrEmpty(str)) Guid = str;
-
- reg = Registry.LocalMachine.OpenSubKey(@"SYSTEM\HardwareConfig");
- if (reg != null)
- {
- str = (reg.GetValue("LastConfig")?.ToString() ?? "")?.Trim('{', '}').ToUpper();
-
- // UUID取不到时返回 FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF
- if (!String.IsNullOrEmpty(str) && !str.Equals("FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF", StringComparison.OrdinalIgnoreCase))
- UUID = str;
- }
-
- reg = Registry.LocalMachine.OpenSubKey(@"HARDWARE\DESCRIPTION\System\BIOS");
+ var reg = Registry.LocalMachine.OpenSubKey(@"HARDWARE\DESCRIPTION\System\BIOS");
reg ??= Registry.LocalMachine.OpenSubKey(@"SYSTEM\HardwareConfig\Current");
if (reg != null)
{
@@ -74,16 +51,14 @@ private void LoadWindowsInfo()
}
#endif
- // 旧版系统（如win2008）没有UUID的注册表项，需要用wmic查询
- if (String.IsNullOrEmpty(UUID) || UUID == Guid || String.IsNullOrEmpty(Vendor))
+ // 通过 wmic 获取更多信息
+ if (String.IsNullOrEmpty(Vendor) || String.IsNullOrEmpty(Product))
{
- var csproduct = ReadWmic("csproduct", "Name", "UUID", "Vendor");
+ var csproduct = ReadWmic("csproduct", "Name", "Vendor");
if (csproduct != null)
{
if (csproduct.TryGetValue("Name", out str) && !String.IsNullOrEmpty(str) && String.IsNullOrEmpty(Product))
Product = str;
- if (csproduct.TryGetValue("UUID", out str) && !String.IsNullOrEmpty(str))
- UUID = str;
if (csproduct.TryGetValue("Vendor", out str) && !String.IsNullOrEmpty(str))
Vendor = str;
}
@@ -146,98 +121,6 @@ private void LoadWindowsInfo()
OSVersion = Environment.OSVersion.Version.ToString();
}
-#if NET5_0_OR_GREATER
- [SupportedOSPlatform("windows")]
-#endif
- private void RefreshWindows()
- {
- // 获取内存信息
- try
- {
- var memStatus = new MEMORYSTATUSEX();
- memStatus.Init();
- if (GlobalMemoryStatusEx(ref memStatus))
- {
- Memory = memStatus.ullTotalPhys;
- AvailableMemory = memStatus.ullAvailPhys;
- }
- }
- catch
- {
- // 忽略内存获取错误
- }
-
- // 获取CPU使用率
- try
- {
- if (GetSystemTimes(out var idleTime, out var kernelTime, out var userTime))
- {
- var idle = idleTime.ToLong();
- var kernel = kernelTime.ToLong();
- var user = userTime.ToLong();
- var total = kernel + user;
-
- if (_systemTime != null)
- {
- var idleDelta = idle - _systemTime.IdleTime;
- var totalDelta = total - _systemTime.TotalTime;
-
- if (totalDelta > 0)
- {
- CpuRate = 1.0 - ((double)idleDelta / totalDelta);
- if (CpuRate < 0) CpuRate = 0;
- if (CpuRate > 1) CpuRate = 1;
- }
- }
-
- _systemTime = new SystemTime { IdleTime = idle, TotalTime = total };
- }
- }
- catch
- {
- // 忽略CPU使用率获取错误
- }
- }
-
- #region Windows API
- [DllImport("Kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
- [SecurityCritical]
- [return: MarshalAs(UnmanagedType.Bool)]
- internal static extern Boolean GlobalMemoryStatusEx(ref MEMORYSTATUSEX lpBuffer);
-
- internal struct MEMORYSTATUSEX
- {
- internal UInt32 dwLength;
- internal UInt32 dwMemoryLoad;
- internal UInt64 ullTotalPhys;
- internal UInt64 ullAvailPhys;
- internal UInt64 ullTotalPageFile;
- internal UInt64 ullAvailPageFile;
- internal UInt64 ullTotalVirtual;
- internal UInt64 ullAvailVirtual;
- internal UInt64 ullAvailExtendedVirtual;
-
- internal void Init() => dwLength = checked((UInt32)Marshal.SizeOf(typeof(MEMORYSTATUSEX)));
- }
-
- [DllImport("kernel32.dll", SetLastError = true)]
- private static extern Boolean GetSystemTimes(out FILETIME idleTime, out FILETIME kernelTime, out FILETIME userTime);
-
- private struct FILETIME
- {
- public UInt32 Low;
- public UInt32 High;
-
- public FILETIME(Int64 time)
- {
- Low = (UInt32)time;
- High = (UInt32)(time >> 32);
- }
-
- public Int64 ToLong() => (Int64)(((UInt64)High << 32) | Low);
- }
- #endregion
-
#region Windows辅助方法
/// 通过WMIC命令读取信息
/// WMI类型
diff --git a/src/LuYao.Common/Devices/MachineInfo.cs b/src/LuYao.Common/Devices/MachineInfo.cs
index e4673fe..8b65be3 100644
--- a/src/LuYao.Common/Devices/MachineInfo.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.cs
@@ -42,14 +42,6 @@ public partial class MachineInfo
[DisplayName("处理器型号")]
public String? Processor { get; set; }
- /// 硬件唯一标识。取主板编码，部分品牌存在重复
- [DisplayName("硬件唯一标识")]
- public String? UUID { get; set; }
-
- /// 软件唯一标识。系统标识，操作系统重装后更新，Linux系统的machine_id，Android的android_id，Ghost系统存在重复
- [DisplayName("软件唯一标识")]
- public String? Guid { get; set; }
-
/// 计算机序列号。适用于品牌机，跟笔记本标签显示一致
[DisplayName("计算机序列号")]
public String? Serial { get; set; }
@@ -61,49 +53,6 @@ public partial class MachineInfo
/// 磁盘序列号
[DisplayName("磁盘序列号")]
public String? DiskID { get; set; }
-
- /// 内存总量。单位Byte
- [DisplayName("内存总量")]
- public UInt64 Memory { get; set; }
-
- /// 可用内存。单位Byte
- [DisplayName("可用内存")]
- public UInt64 AvailableMemory { get; set; }
-
- /// 空闲内存。在Linux上空闲内存不一定可用，单位Byte
- [DisplayName("空闲内存")]
- public UInt64 FreeMemory { get; set; }
-
- /// CPU占用率
- [DisplayName("CPU占用率")]
- public Double CpuRate { get; set; }
-
- /// 网络上行速度。字节每秒，初始化后首次读取为0
- [DisplayName("网络上行速度")]
- public UInt64 UplinkSpeed { get; set; }
-
- /// 网络下行速度。字节每秒，初始化后首次读取为0
- [DisplayName("网络下行速度")]
- public UInt64 DownlinkSpeed { get; set; }
-
- /// 温度。单位度
- [DisplayName("温度")]
- public Double Temperature { get; set; }
-
- /// 电池剩余。小于1的小数，常用百分比表示
- [DisplayName("电池剩余")]
- public Double Battery { get; set; }
-
- private readonly Dictionary _items = new Dictionary();
-
- /// 获取 或 设置 扩展属性数据
- /// 属性键名
- /// 属性值
- public Object? this[String key]
- {
- get => _items.TryGetValue(key, out var obj) ? obj : null;
- set => _items[key] = value;
- }
#endregion
#region 静态方法
@@ -151,52 +100,17 @@ public void Init()
Product = Clean(Product);
Vendor = Clean(Vendor);
Processor = Clean(Processor);
- UUID = Clean(UUID);
- Guid = Clean(Guid);
Serial = Clean(Serial);
Board = Clean(Board);
DiskID = Clean(DiskID);
-
- // 无法读取系统标识时，随机生成一个guid
- if (String.IsNullOrEmpty(Guid))
- Guid = "0-" + System.Guid.NewGuid().ToString();
- if (String.IsNullOrEmpty(UUID))
- UUID = "0-" + System.Guid.NewGuid().ToString();
-
- try
- {
- Refresh();
- }
- catch
- {
- // 忽略刷新错误
- }
}
///
- /// 刷新动态性能信息（CPU、内存、网络等）
+ /// 重新加载机器信息
///
- public void Refresh()
+ public void Reload()
{
-#if NETFRAMEWORK
- // .NET Framework only runs on Windows
- RefreshWindows();
-#else
- if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
- {
- RefreshWindows();
- }
- else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
- {
- RefreshLinux();
- }
- else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
- {
- RefreshMacOS();
- }
-#endif
-
- RefreshSpeed();
+ Init();
}
private void Reset()
@@ -225,13 +139,4 @@ private void Reset()
}
#endregion
- #region 平台相关私有类
- private class SystemTime
- {
- public Int64 IdleTime;
- public Int64 TotalTime;
- }
-
- private SystemTime? _systemTime;
- #endregion
}
diff --git a/tests/LuYao.Common.UnitTests/Devices/MachineInfoTests.cs b/tests/LuYao.Common.UnitTests/Devices/MachineInfoTests.cs
index 8084563..8d098ad 100644
--- a/tests/LuYao.Common.UnitTests/Devices/MachineInfoTests.cs
+++ b/tests/LuYao.Common.UnitTests/Devices/MachineInfoTests.cs
@@ -1,6 +1,4 @@
using System;
-using System.Runtime.InteropServices;
-using System.Threading;
using LuYao.Devices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -43,151 +41,75 @@ public void OSVersion_ShouldNotBeNullOrEmpty()
}
[TestMethod]
- public void Guid_ShouldNotBeNullOrEmpty()
+ public void Processor_CanBeRead()
{
// Arrange
var machineInfo = MachineInfo.Get();
- // Assert
- Assert.IsFalse(String.IsNullOrEmpty(machineInfo.Guid), "Guid should not be null or empty");
- }
-
- [TestMethod]
- public void UUID_ShouldNotBeNullOrEmpty()
- {
- // Arrange
- var machineInfo = MachineInfo.Get();
-
- // Assert
- Assert.IsFalse(String.IsNullOrEmpty(machineInfo.UUID), "UUID should not be null or empty");
- }
-
- [TestMethod]
- public void Memory_ShouldBeGreaterThanZero()
- {
- // Arrange
- var machineInfo = MachineInfo.Get();
-
- // Assert
- Assert.IsTrue(machineInfo.Memory > 0, "Memory should be greater than 0");
- }
-
- [TestMethod]
- public void Refresh_ShouldUpdateDynamicProperties()
- {
- // Arrange
- var machineInfo = MachineInfo.Get();
- var initialMemory = machineInfo.Memory;
-
- // Act
- machineInfo.Refresh();
-
- // Assert - Memory should still be > 0 after refresh
- Assert.IsTrue(machineInfo.Memory > 0, "Memory should be greater than 0 after refresh");
- }
-
- [TestMethod]
- public void CpuRate_ShouldBeInValidRange()
- {
- // Arrange
- var machineInfo = MachineInfo.Get();
-
- // Need to refresh twice to get CPU rate
- machineInfo.Refresh();
- Thread.Sleep(1000);
- machineInfo.Refresh();
-
- // Assert - CPU rate should be between 0 and 1
- Assert.IsTrue(machineInfo.CpuRate >= 0 && machineInfo.CpuRate <= 1,
- $"CPU rate should be between 0 and 1, got {machineInfo.CpuRate}");
- }
-
- [TestMethod]
- public void ExtensionProperties_ShouldWork()
- {
- // Arrange
- var machineInfo = MachineInfo.Get();
-
- // Act
- machineInfo["TestKey"] = "TestValue";
- var value = machineInfo["TestKey"];
-
- // Assert
- Assert.AreEqual("TestValue", value);
+ // Assert - Processor might be null on some platforms, just verify it doesn't throw
+ var processor = machineInfo.Processor;
+ Assert.IsTrue(true);
}
[TestMethod]
- public void ExtensionProperties_ShouldReturnNullForNonExistentKey()
+ public void Reload_ShouldNotThrow()
{
// Arrange
var machineInfo = MachineInfo.Get();
+ var originalOSName = machineInfo.OSName;
// Act
- var value = machineInfo["NonExistentKey"];
+ machineInfo.Reload();
- // Assert
- Assert.IsNull(value);
+ // Assert - OSName should still be set after reload
+ Assert.IsFalse(String.IsNullOrEmpty(machineInfo.OSName), "OSName should not be null or empty after reload");
}
[TestMethod]
- public void RefreshSpeed_ShouldNotThrow()
+ public void AllBasicProperties_CanBeAccessed()
{
// Arrange
var machineInfo = MachineInfo.Get();
- // Act & Assert - Should not throw
- machineInfo.RefreshSpeed();
- Thread.Sleep(1000);
- machineInfo.RefreshSpeed();
-
- // Network speeds should be non-negative
- Assert.IsTrue(machineInfo.UplinkSpeed >= 0, "Uplink speed should be non-negative");
- Assert.IsTrue(machineInfo.DownlinkSpeed >= 0, "Downlink speed should be non-negative");
- }
-
- [TestMethod]
- public void Processor_ShouldNotBeNull()
- {
- // Arrange
- var machineInfo = MachineInfo.Get();
-
- // Assert - Processor might be null on some platforms, but usually isn't
- // Just checking it doesn't throw
+ // Act & Assert - All properties should be accessible
+ var osName = machineInfo.OSName;
+ var osVersion = machineInfo.OSVersion;
+ var product = machineInfo.Product;
+ var vendor = machineInfo.Vendor;
var processor = machineInfo.Processor;
- Assert.IsTrue(true); // Test passes if we get here
+ var serial = machineInfo.Serial;
+ var board = machineInfo.Board;
+ var diskId = machineInfo.DiskID;
+
+ // Test passes if we get here without exceptions
+ Assert.IsTrue(true);
}
[TestMethod]
- public void AvailableMemory_ShouldBeLessThanOrEqualToTotalMemory()
+ public void Product_MayBeNullOnSomePlatforms()
{
// Arrange
var machineInfo = MachineInfo.Get();
// Act
- machineInfo.Refresh();
+ var product = machineInfo.Product;
- // Assert
- if (machineInfo.AvailableMemory > 0)
- {
- Assert.IsTrue(machineInfo.AvailableMemory <= machineInfo.Memory,
- $"Available memory ({machineInfo.AvailableMemory}) should be <= total memory ({machineInfo.Memory})");
- }
+ // Assert - Product can be null on some platforms (e.g., virtual machines)
+ // Just verify it doesn't throw
+ Assert.IsTrue(true);
}
[TestMethod]
- public void FreeMemory_ShouldBeLessThanOrEqualToTotalMemory()
+ public void Serial_MayBeNullOnSomePlatforms()
{
// Arrange
var machineInfo = MachineInfo.Get();
// Act
- machineInfo.Refresh();
+ var serial = machineInfo.Serial;
- // Assert
- if (machineInfo.FreeMemory > 0)
- {
- Assert.IsTrue(machineInfo.FreeMemory <= machineInfo.Memory,
- $"Free memory ({machineInfo.FreeMemory}) should be <= total memory ({machineInfo.Memory})");
- }
+ // Assert - Serial can be null on some platforms
+ // Just verify it doesn't throw
+ Assert.IsTrue(true);
}
}
From 732d4dcf104ed34fe4eeed0f9cbc4a198bbfcb9a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 14 Nov 2025 08:14:17 +0000
Subject: [PATCH 5/7] Update documentation to reflect simplified MachineInfo
API
Co-authored-by: Soar360 <15421284+Soar360@users.noreply.github.com>
---
docs/MachineInfo-EN.md | 261 ++++++++---------------------------------
docs/MachineInfo.md | 256 ++++++++--------------------------------
2 files changed, 96 insertions(+), 421 deletions(-)
diff --git a/docs/MachineInfo-EN.md b/docs/MachineInfo-EN.md
index 3090c04..a7a9495 100644
--- a/docs/MachineInfo-EN.md
+++ b/docs/MachineInfo-EN.md
@@ -2,21 +2,14 @@
## Overview
-The `MachineInfo` class is used to retrieve and store machine hardware and system information. It provides cross-platform functionality for gathering machine information, supporting Windows, Linux, and macOS operating systems.
+The `MachineInfo` class is used to retrieve and store basic machine hardware and system information. It provides cross-platform functionality for gathering machine information, supporting Windows, Linux, and macOS operating systems.
## Key Features
-### Static Information
+### System Information
- **Operating System Info**: OS name and version
-- **Hardware Identifiers**: UUID, GUID, serial numbers, and other unique identifiers
-- **Hardware Info**: Processor model, manufacturer, product name, etc.
-- **Storage Info**: Disk serial number, motherboard information
-
-### Dynamic Information
-- **Memory Status**: Total memory, available memory, free memory
-- **CPU Usage**: Real-time CPU utilization
-- **Network Speed**: Uplink and downlink network speeds
-- **Other Metrics**: Temperature, battery level (for supported devices)
+- **Hardware Info**: Processor model, manufacturer, product name
+- **Identification Info**: Computer serial number, motherboard info, disk serial number
## Usage Examples
@@ -34,90 +27,28 @@ Console.WriteLine($"Version: {machineInfo.OSVersion}");
Console.WriteLine($"Processor: {machineInfo.Processor}");
Console.WriteLine($"Vendor: {machineInfo.Vendor}");
Console.WriteLine($"Product: {machineInfo.Product}");
-```
-
-### View Hardware Identifiers
-
-```csharp
-var machineInfo = MachineInfo.Get();
-
-// Hardware unique identifier (motherboard UUID)
-Console.WriteLine($"UUID: {machineInfo.UUID}");
-
-// Software unique identifier (system GUID)
-Console.WriteLine($"GUID: {machineInfo.Guid}");
-
-// Computer serial number
Console.WriteLine($"Serial: {machineInfo.Serial}");
-
-// Disk serial number
+Console.WriteLine($"Board: {machineInfo.Board}");
Console.WriteLine($"Disk ID: {machineInfo.DiskID}");
```
-### Monitor System Performance
-
-```csharp
-using LuYao.Devices;
-using LuYao.Globalization;
-
-var machineInfo = MachineInfo.Get();
-
-// Refresh dynamic information
-machineInfo.Refresh();
-
-// Memory information
-Console.WriteLine($"Total Memory: {SizeHelper.ToReadable(machineInfo.Memory)}");
-Console.WriteLine($"Available: {SizeHelper.ToReadable(machineInfo.AvailableMemory)}");
-Console.WriteLine($"Free: {SizeHelper.ToReadable(machineInfo.FreeMemory)}");
-
-// CPU usage (requires two refreshes for accurate value)
-System.Threading.Thread.Sleep(1000);
-machineInfo.Refresh();
-Console.WriteLine($"CPU Usage: {machineInfo.CpuRate:P2}");
-```
-
-### Monitor Network Speed
-
-```csharp
-var machineInfo = MachineInfo.Get();
-
-// First call establishes baseline
-machineInfo.RefreshSpeed();
-
-// Wait for a period
-System.Threading.Thread.Sleep(1000);
-
-// Call again to get speed
-machineInfo.RefreshSpeed();
-
-Console.WriteLine($"Upload: {SizeHelper.ToReadable(machineInfo.UplinkSpeed)}/s");
-Console.WriteLine($"Download: {SizeHelper.ToReadable(machineInfo.DownlinkSpeed)}/s");
-```
-
-### Using Extension Properties
+### Reload Information
```csharp
var machineInfo = MachineInfo.Get();
-// Set custom properties
-machineInfo["ApplicationVersion"] = "1.0.0";
-machineInfo["DeploymentDate"] = DateTime.Now;
+// Reload machine information
+machineInfo.Reload();
-// Read custom properties
-var version = machineInfo["ApplicationVersion"];
-var deployDate = machineInfo["DeploymentDate"];
-
-Console.WriteLine($"App Version: {version}");
-Console.WriteLine($"Deploy Date: {deployDate}");
+// Access updated information
+Console.WriteLine($"OS: {machineInfo.OSName}");
```
-### Complete Example: System Monitoring
+### Complete Example: Display System Information
```csharp
using System;
-using System.Threading;
using LuYao.Devices;
-using LuYao.Globalization;
class Program
{
@@ -125,101 +56,31 @@ class Program
{
var machineInfo = MachineInfo.Get();
- // Display static information
Console.WriteLine("=== System Information ===");
Console.WriteLine($"OS: {machineInfo.OSName}");
Console.WriteLine($"Version: {machineInfo.OSVersion}");
Console.WriteLine($"Processor: {machineInfo.Processor}");
Console.WriteLine($"Vendor: {machineInfo.Vendor}");
Console.WriteLine($"Product: {machineInfo.Product}");
- Console.WriteLine($"UUID: {machineInfo.UUID}");
- Console.WriteLine($"GUID: {machineInfo.Guid}");
- Console.WriteLine();
-
- // Monitor dynamic information
- Console.WriteLine("=== Performance Monitor (Press Ctrl+C to exit) ===");
- machineInfo.RefreshSpeed(); // Establish network speed baseline
-
- while (true)
- {
- machineInfo.Refresh();
- machineInfo.RefreshSpeed();
-
- Console.Clear();
- Console.WriteLine($"Time: {DateTime.Now:yyyy-MM-dd HH:mm:ss}");
- Console.WriteLine();
-
- Console.WriteLine($"CPU Usage: {machineInfo.CpuRate:P2}");
- Console.WriteLine($"Total Memory: {SizeHelper.ToReadable(machineInfo.Memory)}");
- Console.WriteLine($"Available: {SizeHelper.ToReadable(machineInfo.AvailableMemory)}");
- Console.WriteLine($"Usage: {(1.0 - (double)machineInfo.AvailableMemory / machineInfo.Memory):P2}");
- Console.WriteLine();
-
- Console.WriteLine($"Upload: {SizeHelper.ToReadable(machineInfo.UplinkSpeed)}/s");
- Console.WriteLine($"Download: {SizeHelper.ToReadable(machineInfo.DownlinkSpeed)}/s");
-
- Thread.Sleep(1000);
- }
+ Console.WriteLine($"Serial: {machineInfo.Serial}");
+ Console.WriteLine($"Board: {machineInfo.Board}");
+ Console.WriteLine($"Disk ID: {machineInfo.DiskID}");
}
}
```
## Property Reference
-### System Properties
-
| Property | Type | Description |
|----------|------|-------------|
| `OSName` | `string?` | Operating system name (e.g., "Windows 11", "Ubuntu 22.04") |
| `OSVersion` | `string?` | Operating system version number |
-
-### Hardware Identifiers
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `UUID` | `string?` | Hardware unique identifier, motherboard UUID (may duplicate on some brands) |
-| `Guid` | `string?` | Software unique identifier, updates after OS reinstall |
-| `Serial` | `string?` | Computer serial number, suitable for branded machines |
-| `DiskID` | `string?` | Disk serial number |
-| `Board` | `string?` | Motherboard serial number or family information |
-
-### Hardware Information
-
-| Property | Type | Description |
-|----------|------|-------------|
| `Product` | `string?` | Product name (e.g., "ThinkPad X1 Carbon") |
-| `Vendor` | `string?` | Manufacturer (e.g., "Lenovo", "Dell") |
+| `Vendor` | `string?` | Manufacturer (e.g., "Lenovo", "Dell", "Apple") |
| `Processor` | `string?` | Processor model (e.g., "Intel Core i7-10750H") |
-
-### Memory Information
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `Memory` | `ulong` | Total memory in bytes |
-| `AvailableMemory` | `ulong` | Available memory in bytes |
-| `FreeMemory` | `ulong` | Free memory in bytes (may differ from available on Linux) |
-
-### Performance Metrics
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `CpuRate` | `double` | CPU usage rate, range 0.0 ~ 1.0 |
-| `UplinkSpeed` | `ulong` | Network upload speed in bytes per second |
-| `DownlinkSpeed` | `ulong` | Network download speed in bytes per second |
-
-### Other Properties
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `Temperature` | `double` | Temperature in degrees (hardware dependent) |
-| `Battery` | `double` | Battery remaining, range 0.0 ~ 1.0 (device dependent) |
-
-### Extension Properties
-
-```csharp
-// Indexer for storing and retrieving custom properties
-object? this[string key] { get; set; }
-```
+| `Serial` | `string?` | Computer serial number, suitable for branded machines |
+| `Board` | `string?` | Motherboard serial number or family information |
+| `DiskID` | `string?` | Disk serial number |
## Method Reference
@@ -231,30 +92,12 @@ Static method to get and initialize a new `MachineInfo` instance.
var machineInfo = MachineInfo.Get();
```
-### Init()
-
-Initialize machine information and load static hardware information. This method is automatically called in `Get()`.
-
-```csharp
-machineInfo.Init();
-```
-
-### Refresh()
+### Reload()
-Refresh dynamic performance information (CPU, memory, etc.). Recommended to call periodically for latest performance data.
+Reload machine information.
```csharp
-machineInfo.Refresh();
-```
-
-### RefreshSpeed()
-
-Refresh network speed information. Requires at least two calls to calculate speed.
-
-```csharp
-machineInfo.RefreshSpeed();
-Thread.Sleep(1000);
-machineInfo.RefreshSpeed(); // Now can get accurate speed
+machineInfo.Reload();
```
## Platform Support
@@ -262,45 +105,40 @@ machineInfo.RefreshSpeed(); // Now can get accurate speed
### Windows
- Supports .NET Framework 4.5+ and .NET Core 3.0+
- Gets hardware info via registry and WMIC
-- Uses Win32 API for memory and CPU information
+- Retrieves: OSName, OSVersion, Product, Vendor, Processor, Serial, Board, DiskID
### Linux
- Supports .NET Core 3.0+
-- Reads system files like `/proc/cpuinfo`, `/proc/meminfo`, `/proc/stat`
+- Reads `/proc/cpuinfo` for processor information
- Reads DMI information from `/sys/class/dmi/id/`
-- Reads `/etc/machine-id` for system GUID
+- Reads disk information from `/sys/block/`
+- Retrieves: OSName, OSVersion, Product, Vendor, Processor, Serial, Board, DiskID
### macOS
- Supports .NET Core 3.0+
- Uses `system_profiler` for hardware information
-- Uses `vm_stat` for memory information
-- Uses `top` for CPU usage
+- Retrieves: OSName, OSVersion, Product, Processor, Serial
+- Vendor defaults to "Apple"
## Important Notes
1. **Performance Impact**: Some operations (like WMIC queries on Windows) may be time-consuming. Consider caching the `MachineInfo` instance.
-2. **CPU Usage**: Requires two `Refresh()` calls (with at least 1 second interval) for accurate CPU usage.
-
-3. **Network Speed**: Similarly requires two `RefreshSpeed()` calls to calculate speed.
-
-4. **Permission Requirements**:
+2. **Permission Requirements**:
- Windows: Some registry keys may require administrator privileges
- Linux: Reading some system files may require root permissions
- macOS: Some system commands may require appropriate permissions
-5. **Unique Identifiers**:
- - `UUID` and `Guid` may not be obtainable or unique in some environments (VMs, Ghost systems)
- - Random GUIDs are automatically generated when unavailable
-
-6. **Cross-platform Compatibility**: Not all properties are available on all platforms. Check for `null` or empty strings before use.
+3. **Cross-platform Compatibility**: Not all properties are available on all platforms. Check for `null` or empty strings before use. For example:
+ - `Serial`, `Board`, `DiskID` may be empty on some VMs or specific hardware
+ - `Board` and `DiskID` may not be available on macOS
## Best Practices
1. **Singleton Pattern**: Use singleton pattern to cache `MachineInfo` instance and avoid repeated initialization.
```csharp
-public class SystemMonitor
+public class SystemInfo
{
private static readonly Lazy _instance =
new Lazy(() => MachineInfo.Get());
@@ -309,38 +147,35 @@ public class SystemMonitor
}
```
-2. **Periodic Refresh**: Use a timer to periodically refresh performance data.
+2. **Exception Handling**: Some operations may fail, handle exceptions appropriately.
```csharp
-var timer = new System.Timers.Timer(1000); // 1 second
-timer.Elapsed += (sender, e) =>
+try
{
- machineInfo.Refresh();
- machineInfo.RefreshSpeed();
- UpdateUI(machineInfo);
-};
-timer.Start();
+ var machineInfo = MachineInfo.Get();
+ Console.WriteLine($"OS: {machineInfo.OSName}");
+}
+catch (Exception ex)
+{
+ Console.WriteLine($"Failed to get machine info: {ex.Message}");
+}
```
-3. **Exception Handling**: Some operations may fail, handle exceptions appropriately.
+3. **Null Checks**: Some properties may be null, check before use.
```csharp
-try
+var machineInfo = MachineInfo.Get();
+
+if (!string.IsNullOrEmpty(machineInfo.Serial))
{
- var machineInfo = MachineInfo.Get();
- machineInfo.Refresh();
+ Console.WriteLine($"Serial: {machineInfo.Serial}");
}
-catch (Exception ex)
+else
{
- Console.WriteLine($"Failed to get machine info: {ex.Message}");
+ Console.WriteLine("Serial number not available");
}
```
## Reference
This implementation is based on the MachineInfo implementation from the [NewLifeX](https://github.com/NewLifeX/X) project.
-
-## Related Documentation
-
-- [SizeHelper Documentation](SizeHelper-EN.md) - For formatting byte sizes
-- [UnitConverter Documentation](UnitConverter-EN.md) - Unit conversion tool
diff --git a/docs/MachineInfo.md b/docs/MachineInfo.md
index 7b65784..b1537bc 100644
--- a/docs/MachineInfo.md
+++ b/docs/MachineInfo.md
@@ -2,21 +2,14 @@
## 概述
-`MachineInfo` 类用于获取和存储机器的硬件和系统信息。该类提供了跨平台的机器信息获取功能，支持 Windows、Linux 和 macOS 操作系统。
+`MachineInfo` 类用于获取和存储机器的基本硬件和系统信息。该类提供了跨平台的机器信息获取功能，支持 Windows、Linux 和 macOS 操作系统。
## 主要功能
-### 静态信息
+### 系统信息
- **操作系统信息**：操作系统名称和版本
-- **硬件标识**：UUID、GUID、序列号等唯一标识
-- **硬件信息**：处理器型号、制造商、产品名称等
-- **存储信息**：磁盘序列号、主板信息
-
-### 动态信息
-- **内存状态**：总内存、可用内存、空闲内存
-- **CPU 使用率**：实时 CPU 占用率
-- **网络速度**：上行和下行网络速度
-- **其他指标**：温度、电池剩余（适用于支持的设备）
+- **硬件信息**：处理器型号、制造商、产品名称
+- **标识信息**：计算机序列号、主板信息、磁盘序列号
## 使用示例
@@ -34,90 +27,28 @@ Console.WriteLine($"系统版本: {machineInfo.OSVersion}");
Console.WriteLine($"处理器: {machineInfo.Processor}");
Console.WriteLine($"制造商: {machineInfo.Vendor}");
Console.WriteLine($"产品名称: {machineInfo.Product}");
-```
-
-### 查看硬件标识
-
-```csharp
-var machineInfo = MachineInfo.Get();
-
-// 硬件唯一标识（主板UUID）
-Console.WriteLine($"UUID: {machineInfo.UUID}");
-
-// 软件唯一标识（系统GUID）
-Console.WriteLine($"GUID: {machineInfo.Guid}");
-
-// 计算机序列号
Console.WriteLine($"序列号: {machineInfo.Serial}");
-
-// 磁盘序列号
+Console.WriteLine($"主板: {machineInfo.Board}");
Console.WriteLine($"磁盘ID: {machineInfo.DiskID}");
```
-### 监控系统性能
-
-```csharp
-using LuYao.Devices;
-using LuYao.Globalization;
-
-var machineInfo = MachineInfo.Get();
-
-// 刷新动态信息
-machineInfo.Refresh();
-
-// 内存信息
-Console.WriteLine($"总内存: {SizeHelper.ToReadable(machineInfo.Memory)}");
-Console.WriteLine($"可用内存: {SizeHelper.ToReadable(machineInfo.AvailableMemory)}");
-Console.WriteLine($"空闲内存: {SizeHelper.ToReadable(machineInfo.FreeMemory)}");
-
-// CPU 占用率（需要两次刷新才能获得准确值）
-System.Threading.Thread.Sleep(1000);
-machineInfo.Refresh();
-Console.WriteLine($"CPU 占用率: {machineInfo.CpuRate:P2}");
-```
-
-### 监控网络速度
-
-```csharp
-var machineInfo = MachineInfo.Get();
-
-// 首次调用建立基线
-machineInfo.RefreshSpeed();
-
-// 等待一段时间
-System.Threading.Thread.Sleep(1000);
-
-// 再次调用获取速度
-machineInfo.RefreshSpeed();
-
-Console.WriteLine($"上行速度: {SizeHelper.ToReadable(machineInfo.UplinkSpeed)}/s");
-Console.WriteLine($"下行速度: {SizeHelper.ToReadable(machineInfo.DownlinkSpeed)}/s");
-```
-
-### 使用扩展属性
+### 重新加载信息
```csharp
var machineInfo = MachineInfo.Get();
-// 设置自定义属性
-machineInfo["ApplicationVersion"] = "1.0.0";
-machineInfo["DeploymentDate"] = DateTime.Now;
-
-// 读取自定义属性
-var version = machineInfo["ApplicationVersion"];
-var deployDate = machineInfo["DeploymentDate"];
+// 重新加载机器信息
+machineInfo.Reload();
-Console.WriteLine($"应用版本: {version}");
-Console.WriteLine($"部署日期: {deployDate}");
+// 访问更新后的信息
+Console.WriteLine($"操作系统: {machineInfo.OSName}");
```
-### 完整示例：系统信息监控
+### 完整示例：显示系统信息
```csharp
using System;
-using System.Threading;
using LuYao.Devices;
-using LuYao.Globalization;
class Program
{
@@ -125,101 +56,31 @@ class Program
{
var machineInfo = MachineInfo.Get();
- // 显示静态信息
Console.WriteLine("=== 系统信息 ===");
Console.WriteLine($"操作系统: {machineInfo.OSName}");
Console.WriteLine($"系统版本: {machineInfo.OSVersion}");
Console.WriteLine($"处理器: {machineInfo.Processor}");
Console.WriteLine($"制造商: {machineInfo.Vendor}");
Console.WriteLine($"产品: {machineInfo.Product}");
- Console.WriteLine($"UUID: {machineInfo.UUID}");
- Console.WriteLine($"GUID: {machineInfo.Guid}");
- Console.WriteLine();
-
- // 监控动态信息
- Console.WriteLine("=== 性能监控 (按 Ctrl+C 退出) ===");
- machineInfo.RefreshSpeed(); // 建立网络速度基线
-
- while (true)
- {
- machineInfo.Refresh();
- machineInfo.RefreshSpeed();
-
- Console.Clear();
- Console.WriteLine($"时间: {DateTime.Now:yyyy-MM-dd HH:mm:ss}");
- Console.WriteLine();
-
- Console.WriteLine($"CPU 占用率: {machineInfo.CpuRate:P2}");
- Console.WriteLine($"总内存: {SizeHelper.ToReadable(machineInfo.Memory)}");
- Console.WriteLine($"可用内存: {SizeHelper.ToReadable(machineInfo.AvailableMemory)}");
- Console.WriteLine($"内存使用率: {(1.0 - (double)machineInfo.AvailableMemory / machineInfo.Memory):P2}");
- Console.WriteLine();
-
- Console.WriteLine($"上行速度: {SizeHelper.ToReadable(machineInfo.UplinkSpeed)}/s");
- Console.WriteLine($"下行速度: {SizeHelper.ToReadable(machineInfo.DownlinkSpeed)}/s");
-
- Thread.Sleep(1000);
- }
+ Console.WriteLine($"序列号: {machineInfo.Serial}");
+ Console.WriteLine($"主板: {machineInfo.Board}");
+ Console.WriteLine($"磁盘ID: {machineInfo.DiskID}");
}
}
```
## 属性说明
-### 系统属性
-
| 属性 | 类型 | 说明 |
|------|------|------|
| `OSName` | `string?` | 操作系统名称（如 "Windows 11", "Ubuntu 22.04"） |
| `OSVersion` | `string?` | 操作系统版本号 |
-
-### 硬件标识
-
-| 属性 | 类型 | 说明 |
-|------|------|------|
-| `UUID` | `string?` | 硬件唯一标识，取主板编码，部分品牌存在重复 |
-| `Guid` | `string?` | 软件唯一标识，操作系统重装后更新 |
-| `Serial` | `string?` | 计算机序列号，适用于品牌机 |
-| `DiskID` | `string?` | 磁盘序列号 |
-| `Board` | `string?` | 主板序列号或家族信息 |
-
-### 硬件信息
-
-| 属性 | 类型 | 说明 |
-|------|------|------|
| `Product` | `string?` | 产品名称（如 "ThinkPad X1 Carbon"） |
-| `Vendor` | `string?` | 制造商（如 "Lenovo", "Dell"） |
+| `Vendor` | `string?` | 制造商（如 "Lenovo", "Dell", "Apple"） |
| `Processor` | `string?` | 处理器型号（如 "Intel Core i7-10750H"） |
-
-### 内存信息
-
-| 属性 | 类型 | 说明 |
-|------|------|------|
-| `Memory` | `ulong` | 内存总量，单位字节 |
-| `AvailableMemory` | `ulong` | 可用内存，单位字节 |
-| `FreeMemory` | `ulong` | 空闲内存，单位字节（Linux 上可能不同于可用内存） |
-
-### 性能指标
-
-| 属性 | 类型 | 说明 |
-|------|------|------|
-| `CpuRate` | `double` | CPU 占用率，范围 0.0 ~ 1.0 |
-| `UplinkSpeed` | `ulong` | 网络上行速度，字节每秒 |
-| `DownlinkSpeed` | `ulong` | 网络下行速度，字节每秒 |
-
-### 其他属性
-
-| 属性 | 类型 | 说明 |
-|------|------|------|
-| `Temperature` | `double` | 温度，单位度（取决于硬件支持） |
-| `Battery` | `double` | 电池剩余，范围 0.0 ~ 1.0（取决于设备类型） |
-
-### 扩展属性
-
-```csharp
-// 索引器，用于存储和检索自定义属性
-object? this[string key] { get; set; }
-```
+| `Serial` | `string?` | 计算机序列号，适用于品牌机，跟笔记本标签显示一致 |
+| `Board` | `string?` | 主板序列号或家族信息 |
+| `DiskID` | `string?` | 磁盘序列号 |
## 方法说明
@@ -231,30 +92,12 @@ object? this[string key] { get; set; }
var machineInfo = MachineInfo.Get();
```
-### Init()
-
-初始化机器信息，加载静态硬件信息。该方法在 `Get()` 中自动调用。
-
-```csharp
-machineInfo.Init();
-```
-
-### Refresh()
-
-刷新动态性能信息（CPU、内存等）。建议定期调用以获取最新性能数据。
-
-```csharp
-machineInfo.Refresh();
-```
-
-### RefreshSpeed()
+### Reload()
-刷新网络速度信息。需要至少调用两次才能计算速度。
+重新加载机器信息。
```csharp
-machineInfo.RefreshSpeed();
-Thread.Sleep(1000);
-machineInfo.RefreshSpeed(); // 现在可以获取准确的速度
+machineInfo.Reload();
```
## 平台支持
@@ -262,45 +105,40 @@ machineInfo.RefreshSpeed(); // 现在可以获取准确的速度
### Windows
- 支持 .NET Framework 4.5+ 和 .NET Core 3.0+
- 通过注册表和 WMIC 获取硬件信息
-- 使用 Win32 API 获取内存和 CPU 信息
+- 获取：OSName, OSVersion, Product, Vendor, Processor, Serial, Board, DiskID
### Linux
- 支持 .NET Core 3.0+
-- 读取 `/proc/cpuinfo`、`/proc/meminfo`、`/proc/stat` 等系统文件
+- 读取 `/proc/cpuinfo` 获取处理器信息
- 读取 `/sys/class/dmi/id/` 下的 DMI 信息
-- 读取 `/etc/machine-id` 获取系统 GUID
+- 读取 `/sys/block/` 获取磁盘信息
+- 获取：OSName, OSVersion, Product, Vendor, Processor, Serial, Board, DiskID
### macOS
- 支持 .NET Core 3.0+
- 使用 `system_profiler` 获取硬件信息
-- 使用 `vm_stat` 获取内存信息
-- 使用 `top` 获取 CPU 使用率
+- 获取：OSName, OSVersion, Product, Processor, Serial
+- Vendor 默认为 "Apple"
## 注意事项
1. **性能影响**：某些操作（如 Windows 上的 WMIC 查询）可能耗时较长，建议缓存 `MachineInfo` 实例。
-2. **CPU 使用率**：需要两次 `Refresh()` 调用（中间间隔至少 1 秒）才能获得准确的 CPU 使用率。
-
-3. **网络速度**：同样需要两次 `RefreshSpeed()` 调用才能计算速度。
-
-4. **权限要求**：
+2. **权限要求**：
- Windows：某些注册表项可能需要管理员权限
- Linux：读取某些系统文件可能需要 root 权限
- macOS：某些系统命令可能需要适当权限
-5. **唯一标识**：
- - `UUID` 和 `Guid` 可能在某些环境下无法获取或不唯一（如虚拟机、Ghost 系统）
- - 在无法获取时会自动生成随机 GUID
-
-6. **跨平台兼容性**：并非所有属性在所有平台上都可用。使用前应检查属性是否为 `null` 或空字符串。
+3. **跨平台兼容性**：并非所有属性在所有平台上都可用。使用前应检查属性是否为 `null` 或空字符串。例如：
+ - `Serial`、`Board`、`DiskID` 在某些虚拟机或特定硬件上可能为空
+ - macOS 上的 `Board` 和 `DiskID` 可能无法获取
## 最佳实践
1. **单例模式**：建议使用单例模式缓存 `MachineInfo` 实例，避免重复初始化。
```csharp
-public class SystemMonitor
+public class SystemInfo
{
private static readonly Lazy _instance =
new Lazy(() => MachineInfo.Get());
@@ -309,30 +147,32 @@ public class SystemMonitor
}
```
-2. **定时刷新**：使用定时器定期刷新性能数据。
+2. **异常处理**：某些操作可能失败，应适当处理异常。
```csharp
-var timer = new System.Timers.Timer(1000); // 1 秒
-timer.Elapsed += (sender, e) =>
+try
+{
+ var machineInfo = MachineInfo.Get();
+ Console.WriteLine($"系统: {machineInfo.OSName}");
+}
+catch (Exception ex)
{
- machineInfo.Refresh();
- machineInfo.RefreshSpeed();
- UpdateUI(machineInfo);
-};
-timer.Start();
+ Console.WriteLine($"获取机器信息失败: {ex.Message}");
+}
```
-3. **异常处理**：某些操作可能失败，应适当处理异常。
+3. **空值检查**：某些属性可能为空，使用前应检查。
```csharp
-try
+var machineInfo = MachineInfo.Get();
+
+if (!string.IsNullOrEmpty(machineInfo.Serial))
{
- var machineInfo = MachineInfo.Get();
- machineInfo.Refresh();
+ Console.WriteLine($"序列号: {machineInfo.Serial}");
}
-catch (Exception ex)
+else
{
- Console.WriteLine($"获取机器信息失败: {ex.Message}");
+ Console.WriteLine("无法获取序列号");
}
```
From 46faaee3b5a65f2ee582f23c9f3f5fccae82c214 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 14 Nov 2025 08:24:36 +0000
Subject: [PATCH 6/7] Optimize MachineInfo performance with multiple
improvements
Co-authored-by: Soar360 <15421284+Soar360@users.noreply.github.com>
---
src/LuYao.Common/Devices/MachineInfo.Linux.cs | 125 ++++++++++++------
src/LuYao.Common/Devices/MachineInfo.MacOS.cs | 74 +++++++----
.../Devices/MachineInfo.Windows.cs | 110 +++++++++------
src/LuYao.Common/Devices/MachineInfo.cs | 19 ++-
4 files changed, 220 insertions(+), 108 deletions(-)
diff --git a/src/LuYao.Common/Devices/MachineInfo.Linux.cs b/src/LuYao.Common/Devices/MachineInfo.Linux.cs
index e79efc7..6ae6521 100644
--- a/src/LuYao.Common/Devices/MachineInfo.Linux.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.Linux.cs
@@ -22,70 +22,110 @@ public partial class MachineInfo
#endif
private void LoadLinuxInfo()
{
- var str = GetLinuxName();
- if (!String.IsNullOrEmpty(str)) OSName = str;
-
- // 读取 /proc/cpuinfo
- var cpuinfo = ReadInfo("/proc/cpuinfo");
- if (cpuinfo != null)
+ // 优先从 DMI 读取信息（更快且更可靠）
+ var hasDMI = TryReadDMIInfo();
+
+ // 只有在 DMI 信息不完整时才读取其他来源
+ if (String.IsNullOrEmpty(Processor))
{
- if (cpuinfo.TryGetValue("Hardware", out str) ||
- cpuinfo.TryGetValue("cpu model", out str) ||
- cpuinfo.TryGetValue("model name", out str))
+ var cpuinfo = ReadInfo("/proc/cpuinfo");
+ if (cpuinfo != null)
{
- Processor = str;
- if (Processor != null && Processor.StartsWith("vendor "))
- Processor = Processor.Substring(7);
- }
+ if (cpuinfo.TryGetValue("Hardware", out var str) ||
+ cpuinfo.TryGetValue("cpu model", out str) ||
+ cpuinfo.TryGetValue("model name", out str))
+ {
+ Processor = str;
+ if (Processor != null && Processor.StartsWith("vendor "))
+ Processor = Processor.Substring(7);
+ }
- if (cpuinfo.TryGetValue("Model", out str))
- Product = str;
+ if (String.IsNullOrEmpty(Product) && cpuinfo.TryGetValue("Model", out str))
+ Product = str;
- if (cpuinfo.TryGetValue("vendor_id", out str))
- Vendor = str;
+ if (String.IsNullOrEmpty(Vendor) && cpuinfo.TryGetValue("vendor_id", out str))
+ Vendor = str;
+ }
}
- // 从release文件读取产品
- var prd = GetProductByRelease();
- if (!String.IsNullOrEmpty(prd)) Product = prd;
+ // 获取 OS 名称
+ if (String.IsNullOrEmpty(OSName))
+ {
+ var str = GetLinuxName();
+ if (!String.IsNullOrEmpty(str)) OSName = str;
+ }
- if (String.IsNullOrEmpty(prd) && TryRead("/sys/class/dmi/id/product_name", out var product_name))
+ // 从 release 文件读取产品（仅在需要时）
+ if (String.IsNullOrEmpty(Product) && !hasDMI)
{
- Product = product_name;
+ var prd = GetProductByRelease();
+ if (!String.IsNullOrEmpty(prd)) Product = prd;
}
- if (TryRead("/sys/class/dmi/id/sys_vendor", out var sys_vendor))
+ // 获取磁盘序列号（仅在需要时）
+ if (String.IsNullOrEmpty(DiskID))
+ {
+ TryReadDiskSerial();
+ }
+ }
+
+ /// 尝试读取 DMI 信息（一次性读取多个字段以提高性能）
+ private Boolean TryReadDMIInfo()
+ {
+ var dmiPath = "/sys/class/dmi/id/";
+ if (!Directory.Exists(dmiPath))
+ return false;
+
+ var hasData = false;
+
+ // 一次性尝试读取所有 DMI 字段
+ if (TryRead(Path.Combine(dmiPath, "product_name"), out var product_name))
+ {
+ Product = product_name;
+ hasData = true;
+ }
+
+ if (TryRead(Path.Combine(dmiPath, "sys_vendor"), out var sys_vendor))
{
Vendor = sys_vendor;
+ hasData = true;
}
-
- if (TryRead("/sys/class/dmi/id/board_serial", out var board_serial))
+
+ if (TryRead(Path.Combine(dmiPath, "board_serial"), out var board_serial))
{
Board = board_serial;
+ hasData = true;
}
-
- if (TryRead("/sys/class/dmi/id/product_serial", out var product_serial))
+
+ if (TryRead(Path.Combine(dmiPath, "product_serial"), out var product_serial))
{
Serial = product_serial;
+ hasData = true;
}
-
- // 获取磁盘序列号 (简化版，仅获取第一个硬盘)
+
+ return hasData;
+ }
+
+ /// 尝试读取磁盘序列号
+ private void TryReadDiskSerial()
+ {
try
{
var diskDir = "/sys/block/";
- if (Directory.Exists(diskDir))
+ if (!Directory.Exists(diskDir))
+ return;
+
+ // 只检查物理磁盘（跳过循环设备等）
+ foreach (var disk in Directory.GetDirectories(diskDir))
{
- foreach (var disk in Directory.GetDirectories(diskDir))
+ var diskName = Path.GetFileName(disk);
+ if (diskName.StartsWith("sd") || diskName.StartsWith("nvme") || diskName.StartsWith("hd"))
{
- var diskName = Path.GetFileName(disk);
- if (diskName.StartsWith("sd") || diskName.StartsWith("nvme") || diskName.StartsWith("hd"))
+ var serialFile = Path.Combine(disk, "device", "serial");
+ if (TryRead(serialFile, out var diskSerial))
{
- var serialFile = Path.Combine(disk, "device", "serial");
- if (TryRead(serialFile, out var diskSerial))
- {
- DiskID = diskSerial;
- break;
- }
+ DiskID = diskSerial;
+ return; // 找到第一个就返回
}
}
}
@@ -132,7 +172,12 @@ private void LoadLinuxInfo()
if (process != null)
{
var uname = process.StandardOutput.ReadToEnd()?.Trim();
- process.WaitForExit();
+ // 添加超时（2秒）
+ if (!process.WaitForExit(2000))
+ {
+ try { process.Kill(); } catch { }
+ return null;
+ }
if (!String.IsNullOrEmpty(uname))
{
diff --git a/src/LuYao.Common/Devices/MachineInfo.MacOS.cs b/src/LuYao.Common/Devices/MachineInfo.MacOS.cs
index dcfd115..371ae80 100644
--- a/src/LuYao.Common/Devices/MachineInfo.MacOS.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.MacOS.cs
@@ -23,41 +23,52 @@ private void LoadMacInfo()
{
try
{
- // 获取硬件信息
- var hardware = ExecuteCommand("system_profiler", "SPHardwareDataType");
- if (!String.IsNullOrEmpty(hardware))
+ // 一次性获取硬件和软件信息以提高性能
+ // 使用 xml 格式输出更快且更结构化
+ var output = ExecuteCommand("system_profiler", "SPHardwareDataType SPSoftwareDataType");
+ if (!String.IsNullOrEmpty(output))
{
- var lines = hardware.Split('\n');
+ var lines = output.Split('\n');
+ var inHardware = false;
+ var inSoftware = false;
+
foreach (var line in lines)
{
var trimmed = line.Trim();
- if (trimmed.StartsWith("Model Name:"))
- Product = trimmed.Substring("Model Name:".Length).Trim();
- else if (trimmed.StartsWith("Model Identifier:") && String.IsNullOrEmpty(Product))
- Product = trimmed.Substring("Model Identifier:".Length).Trim();
- else if (trimmed.StartsWith("Processor Name:"))
- Processor = trimmed.Substring("Processor Name:".Length).Trim();
- else if (trimmed.StartsWith("Chip:") && String.IsNullOrEmpty(Processor))
- Processor = trimmed.Substring("Chip:".Length).Trim();
- else if (trimmed.StartsWith("Serial Number (system):"))
- Serial = trimmed.Substring("Serial Number (system):".Length).Trim();
- }
- }
-
- // 获取软件信息
- var software = ExecuteCommand("system_profiler", "SPSoftwareDataType");
- if (!String.IsNullOrEmpty(software))
- {
- var lines = software.Split('\n');
- foreach (var line in lines)
- {
- var trimmed = line.Trim();
+ // 检测区域切换
+ if (line.Contains("Hardware:"))
+ {
+ inHardware = true;
+ inSoftware = false;
+ continue;
+ }
+ else if (line.Contains("Software:"))
+ {
+ inHardware = false;
+ inSoftware = true;
+ continue;
+ }
- if (trimmed.StartsWith("System Version:"))
+ // 解析硬件信息
+ if (inHardware)
+ {
+ if (trimmed.StartsWith("Model Name:"))
+ Product = trimmed.Substring("Model Name:".Length).Trim();
+ else if (trimmed.StartsWith("Model Identifier:") && String.IsNullOrEmpty(Product))
+ Product = trimmed.Substring("Model Identifier:".Length).Trim();
+ else if (trimmed.StartsWith("Processor Name:"))
+ Processor = trimmed.Substring("Processor Name:".Length).Trim();
+ else if (trimmed.StartsWith("Chip:") && String.IsNullOrEmpty(Processor))
+ Processor = trimmed.Substring("Chip:".Length).Trim();
+ else if (trimmed.StartsWith("Serial Number (system):"))
+ Serial = trimmed.Substring("Serial Number (system):".Length).Trim();
+ }
+ // 解析软件信息
+ else if (inSoftware && trimmed.StartsWith("System Version:"))
{
OSName = trimmed.Substring("System Version:".Length).Trim();
- // Extract version number
+ // 提取版本号
var versionStart = OSName.IndexOf('(');
if (versionStart > 0)
{
@@ -67,7 +78,7 @@ private void LoadMacInfo()
}
}
- // 尝试获取供应商信息 (通常是 Apple)
+ // 供应商信息（总是 Apple）
Vendor = "Apple";
}
catch
@@ -103,7 +114,12 @@ private void LoadMacInfo()
if (process != null)
{
var output = process.StandardOutput.ReadToEnd();
- process.WaitForExit();
+ // 添加超时以避免挂起（10秒，system_profiler 较慢）
+ if (!process.WaitForExit(10000))
+ {
+ try { process.Kill(); } catch { }
+ return null;
+ }
return output;
}
}
diff --git a/src/LuYao.Common/Devices/MachineInfo.Windows.cs b/src/LuYao.Common/Devices/MachineInfo.Windows.cs
index 3d32630..b405550 100644
--- a/src/LuYao.Common/Devices/MachineInfo.Windows.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.Windows.cs
@@ -51,19 +51,6 @@ private void LoadWindowsInfo()
}
#endif
- // 通过 wmic 获取更多信息
- if (String.IsNullOrEmpty(Vendor) || String.IsNullOrEmpty(Product))
- {
- var csproduct = ReadWmic("csproduct", "Name", "Vendor");
- if (csproduct != null)
- {
- if (csproduct.TryGetValue("Name", out str) && !String.IsNullOrEmpty(str) && String.IsNullOrEmpty(Product))
- Product = str;
- if (csproduct.TryGetValue("Vendor", out str) && !String.IsNullOrEmpty(str))
- Vendor = str;
- }
- }
-
// 获取操作系统名称和版本
try
{
@@ -83,32 +70,47 @@ private void LoadWindowsInfo()
// 使用默认值
}
- // 通过 wmic 获取更多信息
- var os = ReadWmic("os", "Caption", "Version");
- if (os != null && os.Count > 0)
+ // 一次性通过 WMIC 批量获取所有信息以提高性能
+ var wmicNeeded = String.IsNullOrEmpty(Vendor) || String.IsNullOrEmpty(Product) ||
+ String.IsNullOrEmpty(OSName) || String.IsNullOrEmpty(Serial) ||
+ String.IsNullOrEmpty(Board) || String.IsNullOrEmpty(DiskID);
+
+ if (wmicNeeded)
{
- if (os.TryGetValue("Caption", out str))
- OSName = str.Replace("Microsoft", "").Trim();
- if (os.TryGetValue("Version", out str))
- OSVersion = str;
+ var wmicData = ReadWmicBatch();
+
+ // 处理 csproduct 数据
+ if (wmicData.TryGetValue("csproduct", out var csproduct))
+ {
+ if (csproduct.TryGetValue("Name", out str) && !String.IsNullOrEmpty(str) && String.IsNullOrEmpty(Product))
+ Product = str;
+ if (csproduct.TryGetValue("Vendor", out str) && !String.IsNullOrEmpty(str) && String.IsNullOrEmpty(Vendor))
+ Vendor = str;
+ }
+
+ // 处理 OS 数据
+ if (wmicData.TryGetValue("os", out var os))
+ {
+ if (String.IsNullOrEmpty(OSName) && os.TryGetValue("Caption", out str))
+ OSName = str.Replace("Microsoft", "").Trim();
+ if (os.TryGetValue("Version", out str))
+ OSVersion = str;
+ }
+
+ // 处理磁盘数据
+ if (wmicData.TryGetValue("diskdrive", out var disk) && disk.TryGetValue("SerialNumber", out str))
+ DiskID = str?.Trim();
+
+ // 处理 BIOS 序列号
+ if (wmicData.TryGetValue("bios", out var bios) && bios.TryGetValue("SerialNumber", out str) &&
+ !str.Equals("System Serial Number", StringComparison.OrdinalIgnoreCase))
+ Serial = str?.Trim();
+
+ // 处理主板序列号
+ if (wmicData.TryGetValue("baseboard", out var board) && board.TryGetValue("SerialNumber", out str))
+ Board = str?.Trim();
}
- // 获取磁盘信息
- var disk = ReadWmic("diskdrive where mediatype=\"Fixed hard disk media\"", "serialnumber");
- if (disk != null && disk.TryGetValue("serialnumber", out str))
- DiskID = str?.Trim();
-
- // 获取BIOS序列号
- var bios = ReadWmic("bios", "serialnumber");
- if (bios != null && bios.TryGetValue("serialnumber", out str) &&
- !str.Equals("System Serial Number", StringComparison.OrdinalIgnoreCase))
- Serial = str?.Trim();
-
- // 获取主板序列号
- var board = ReadWmic("baseboard", "serialnumber");
- if (board != null && board.TryGetValue("serialnumber", out str))
- Board = str?.Trim();
-
if (String.IsNullOrEmpty(OSName))
{
#if NETFRAMEWORK
@@ -122,6 +124,35 @@ private void LoadWindowsInfo()
}
#region Windows辅助方法
+ /// 批量读取 WMIC 信息以提高性能
+ /// 包含所有 WMI 数据的嵌套字典
+ private static Dictionary> ReadWmicBatch()
+ {
+ var result = new Dictionary>(StringComparer.OrdinalIgnoreCase);
+
+ // csproduct
+ var data = ReadWmic("csproduct", "Name", "Vendor");
+ if (data.Count > 0) result["csproduct"] = data;
+
+ // os
+ data = ReadWmic("os", "Caption", "Version");
+ if (data.Count > 0) result["os"] = data;
+
+ // diskdrive
+ data = ReadWmic("diskdrive where mediatype=\"Fixed hard disk media\"", "SerialNumber");
+ if (data.Count > 0) result["diskdrive"] = data;
+
+ // bios
+ data = ReadWmic("bios", "SerialNumber");
+ if (data.Count > 0) result["bios"] = data;
+
+ // baseboard
+ data = ReadWmic("baseboard", "SerialNumber");
+ if (data.Count > 0) result["baseboard"] = data;
+
+ return result;
+ }
+
/// 通过WMIC命令读取信息
/// WMI类型
/// 查询字段
@@ -147,7 +178,12 @@ private static Dictionary ReadWmic(String type, params String[]
if (process != null)
{
var output = process.StandardOutput.ReadToEnd();
- process.WaitForExit();
+ // 添加超时以避免挂起（5秒）
+ if (!process.WaitForExit(5000))
+ {
+ try { process.Kill(); } catch { }
+ return dic2;
+ }
if (!String.IsNullOrEmpty(output))
{
diff --git a/src/LuYao.Common/Devices/MachineInfo.cs b/src/LuYao.Common/Devices/MachineInfo.cs
index 8b65be3..15a2851 100644
--- a/src/LuYao.Common/Devices/MachineInfo.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.cs
@@ -129,10 +129,25 @@ private void Reset()
{
if (String.IsNullOrEmpty(value)) return value;
- var sb = new StringBuilder();
+ // 快速检查是否需要清理
+ var needsCleaning = false;
foreach (var c in value)
{
- if (c >= 32 && c != 127) // 过滤控制字符
+ if (c < 32 || c == 127)
+ {
+ needsCleaning = true;
+ break;
+ }
+ }
+
+ if (!needsCleaning)
+ return value.Trim();
+
+ // 只有在需要时才使用 StringBuilder
+ var sb = new StringBuilder(value.Length);
+ foreach (var c in value)
+ {
+ if (c >= 32 && c != 127)
sb.Append(c);
}
return sb.ToString().Trim();
From 48d99f8ffe663e1c9b8bf6a7d6c8453cd8355f31 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 14 Nov 2025 09:39:59 +0000
Subject: [PATCH 7/7] Improve code readability with better naming, constants,
and method extraction
Co-authored-by: Soar360 <15421284+Soar360@users.noreply.github.com>
---
src/LuYao.Common/Devices/MachineInfo.Linux.cs | 166 ++++++++++------
src/LuYao.Common/Devices/MachineInfo.MacOS.cs | 180 ++++++++++++------
.../Devices/MachineInfo.Windows.cs | 162 +++++++++-------
src/LuYao.Common/Devices/MachineInfo.cs | 44 +++--
4 files changed, 348 insertions(+), 204 deletions(-)
diff --git a/src/LuYao.Common/Devices/MachineInfo.Linux.cs b/src/LuYao.Common/Devices/MachineInfo.Linux.cs
index 6ae6521..a6a86f3 100644
--- a/src/LuYao.Common/Devices/MachineInfo.Linux.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.Linux.cs
@@ -70,63 +70,76 @@ private void LoadLinuxInfo()
}
/// 尝试读取 DMI 信息（一次性读取多个字段以提高性能）
+ /// 如果成功读取任何DMI信息则返回true
private Boolean TryReadDMIInfo()
{
- var dmiPath = "/sys/class/dmi/id/";
- if (!Directory.Exists(dmiPath))
+ const String DmiBasePath = "/sys/class/dmi/id/";
+
+ if (!Directory.Exists(DmiBasePath))
return false;
var hasData = false;
- // 一次性尝试读取所有 DMI 字段
- if (TryRead(Path.Combine(dmiPath, "product_name"), out var product_name))
+ // 读取产品名称
+ if (TryReadDmiField(DmiBasePath, "product_name", out var productName))
{
- Product = product_name;
+ Product = productName;
hasData = true;
}
- if (TryRead(Path.Combine(dmiPath, "sys_vendor"), out var sys_vendor))
+ // 读取系统供应商
+ if (TryReadDmiField(DmiBasePath, "sys_vendor", out var sysVendor))
{
- Vendor = sys_vendor;
+ Vendor = sysVendor;
hasData = true;
}
- if (TryRead(Path.Combine(dmiPath, "board_serial"), out var board_serial))
+ // 读取主板序列号
+ if (TryReadDmiField(DmiBasePath, "board_serial", out var boardSerial))
{
- Board = board_serial;
+ Board = boardSerial;
hasData = true;
}
- if (TryRead(Path.Combine(dmiPath, "product_serial"), out var product_serial))
+ // 读取产品序列号
+ if (TryReadDmiField(DmiBasePath, "product_serial", out var productSerial))
{
- Serial = product_serial;
+ Serial = productSerial;
hasData = true;
}
return hasData;
}
+
+ /// 尝试读取DMI字段
+ private static Boolean TryReadDmiField(String basePath, String fileName, out String? value)
+ {
+ return TryRead(Path.Combine(basePath, fileName), out value);
+ }
/// 尝试读取磁盘序列号
private void TryReadDiskSerial()
{
+ const String BlockDevicePath = "/sys/block/";
+
try
{
- var diskDir = "/sys/block/";
- if (!Directory.Exists(diskDir))
+ if (!Directory.Exists(BlockDevicePath))
return;
// 只检查物理磁盘（跳过循环设备等）
- foreach (var disk in Directory.GetDirectories(diskDir))
+ foreach (var diskPath in Directory.GetDirectories(BlockDevicePath))
{
- var diskName = Path.GetFileName(disk);
- if (diskName.StartsWith("sd") || diskName.StartsWith("nvme") || diskName.StartsWith("hd"))
+ var diskName = Path.GetFileName(diskPath);
+
+ if (!IsPhysicalDisk(diskName))
+ continue;
+
+ var serialFile = Path.Combine(diskPath, "device", "serial");
+ if (TryRead(serialFile, out var diskSerial))
{
- var serialFile = Path.Combine(disk, "device", "serial");
- if (TryRead(serialFile, out var diskSerial))
- {
- DiskID = diskSerial;
- return; // 找到第一个就返回
- }
+ DiskID = diskSerial;
+ return; // 找到第一个物理磁盘序列号即返回
}
}
}
@@ -136,27 +149,62 @@ private void TryReadDiskSerial()
}
}
+ /// 判断是否为物理磁盘
+ private static Boolean IsPhysicalDisk(String diskName)
+ {
+ return diskName.StartsWith("sd") || // SCSI/SATA磁盘
+ diskName.StartsWith("nvme") || // NVMe磁盘
+ diskName.StartsWith("hd"); // IDE磁盘
+ }
+
#region Linux辅助方法
/// 获取Linux发行版名称
/// Linux发行版名称
private static String? GetLinuxName()
{
- var fr = "/etc/redhat-release";
- if (TryRead(fr, out var value)) return value;
+ // 按优先级尝试各种方式获取OS名称
+ return TryGetFromReleaseFiles() ?? TryGetFromUname();
+ }
- var dr = "/etc/debian-release";
- if (TryRead(dr, out value)) return value;
+ /// 从发行版文件获取OS名称
+ private static String? TryGetFromReleaseFiles()
+ {
+ // 尝试 RedHat 系列
+ if (TryRead("/etc/redhat-release", out var value))
+ return value;
- var sr = "/etc/os-release";
- if (TryRead(sr, out value))
- {
- var dic = SplitAsDictionary(value, "=", "\n");
- if (dic.TryGetValue("PRETTY_NAME", out var pretty) && !String.IsNullOrEmpty(pretty))
- return pretty.Trim('"');
- if (dic.TryGetValue("NAME", out var name) && !String.IsNullOrEmpty(name))
- return name.Trim('"');
- }
+ // 尝试 Debian 系列
+ if (TryRead("/etc/debian-release", out value))
+ return value;
+
+ // 尝试通用 os-release 文件
+ if (TryRead("/etc/os-release", out value))
+ return ParseOsRelease(value);
+
+ return null;
+ }
+
+ /// 解析 os-release 文件内容
+ private static String? ParseOsRelease(String content)
+ {
+ var dic = SplitAsDictionary(content, "=", "\n");
+
+ // 优先使用 PRETTY_NAME
+ if (dic.TryGetValue("PRETTY_NAME", out var pretty) && !String.IsNullOrEmpty(pretty))
+ return pretty.Trim('"');
+
+ // 退而求其次使用 NAME
+ if (dic.TryGetValue("NAME", out var name) && !String.IsNullOrEmpty(name))
+ return name.Trim('"');
+
+ return null;
+ }
+ /// 从 uname 命令获取OS名称
+ private static String? TryGetFromUname()
+ {
+ const Int32 UnameTimeoutMs = 2000;
+
try
{
var psi = new ProcessStartInfo
@@ -169,35 +217,39 @@ private void TryReadDiskSerial()
};
using var process = Process.Start(psi);
- if (process != null)
+ if (process == null)
+ return null;
+
+ var uname = process.StandardOutput.ReadToEnd()?.Trim();
+
+ if (!process.WaitForExit(UnameTimeoutMs))
{
- var uname = process.StandardOutput.ReadToEnd()?.Trim();
- // 添加超时（2秒）
- if (!process.WaitForExit(2000))
- {
- try { process.Kill(); } catch { }
- return null;
- }
-
- if (!String.IsNullOrEmpty(uname))
- {
- // 支持Android系统名
- var ss = uname.Split('-');
- foreach (var item in ss)
- {
- if (!String.IsNullOrEmpty(item) &&
- item.StartsWith("Android", StringComparison.OrdinalIgnoreCase))
- return item;
- }
- return uname;
- }
+ try { process.Kill(); } catch { }
+ return null;
}
+
+ if (String.IsNullOrEmpty(uname))
+ return null;
+
+ // 特殊处理：提取 Android 系统名
+ return ExtractAndroidName(uname) ?? uname;
}
catch
{
- // 忽略错误
+ return null;
}
+ }
+ /// 从 uname 输出中提取 Android 系统名
+ private static String? ExtractAndroidName(String uname)
+ {
+ var parts = uname.Split('-');
+ foreach (var part in parts)
+ {
+ if (!String.IsNullOrEmpty(part) &&
+ part.StartsWith("Android", StringComparison.OrdinalIgnoreCase))
+ return part;
+ }
return null;
}
diff --git a/src/LuYao.Common/Devices/MachineInfo.MacOS.cs b/src/LuYao.Common/Devices/MachineInfo.MacOS.cs
index 371ae80..9b7977c 100644
--- a/src/LuYao.Common/Devices/MachineInfo.MacOS.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.MacOS.cs
@@ -24,61 +24,13 @@ private void LoadMacInfo()
try
{
// 一次性获取硬件和软件信息以提高性能
- // 使用 xml 格式输出更快且更结构化
var output = ExecuteCommand("system_profiler", "SPHardwareDataType SPSoftwareDataType");
if (!String.IsNullOrEmpty(output))
{
- var lines = output.Split('\n');
- var inHardware = false;
- var inSoftware = false;
-
- foreach (var line in lines)
- {
- var trimmed = line.Trim();
-
- // 检测区域切换
- if (line.Contains("Hardware:"))
- {
- inHardware = true;
- inSoftware = false;
- continue;
- }
- else if (line.Contains("Software:"))
- {
- inHardware = false;
- inSoftware = true;
- continue;
- }
-
- // 解析硬件信息
- if (inHardware)
- {
- if (trimmed.StartsWith("Model Name:"))
- Product = trimmed.Substring("Model Name:".Length).Trim();
- else if (trimmed.StartsWith("Model Identifier:") && String.IsNullOrEmpty(Product))
- Product = trimmed.Substring("Model Identifier:".Length).Trim();
- else if (trimmed.StartsWith("Processor Name:"))
- Processor = trimmed.Substring("Processor Name:".Length).Trim();
- else if (trimmed.StartsWith("Chip:") && String.IsNullOrEmpty(Processor))
- Processor = trimmed.Substring("Chip:".Length).Trim();
- else if (trimmed.StartsWith("Serial Number (system):"))
- Serial = trimmed.Substring("Serial Number (system):".Length).Trim();
- }
- // 解析软件信息
- else if (inSoftware && trimmed.StartsWith("System Version:"))
- {
- OSName = trimmed.Substring("System Version:".Length).Trim();
- // 提取版本号
- var versionStart = OSName.IndexOf('(');
- if (versionStart > 0)
- {
- OSVersion = OSName.Substring(0, versionStart).Trim();
- }
- }
- }
+ ParseSystemProfilerOutput(output);
}
- // 供应商信息（总是 Apple）
+ // macOS 设备供应商总是 Apple
Vendor = "Apple";
}
catch
@@ -86,19 +38,121 @@ private void LoadMacInfo()
// 忽略错误
}
+ // 使用后备方案获取OS名称
if (String.IsNullOrEmpty(OSName))
{
+ OSName = GetFallbackOSName();
+ }
+ }
+
+ /// 解析 system_profiler 命令输出
+ private void ParseSystemProfilerOutput(String output)
+ {
+ var lines = output.Split('\n');
+ var currentSection = ProfilerSection.None;
+
+ foreach (var line in lines)
+ {
+ var trimmed = line.Trim();
+
+ // 检测区域切换
+ currentSection = DetectSection(line, currentSection);
+
+ // 根据当前区域解析信息
+ switch (currentSection)
+ {
+ case ProfilerSection.Hardware:
+ ParseHardwareInfo(trimmed);
+ break;
+ case ProfilerSection.Software:
+ ParseSoftwareInfo(trimmed);
+ break;
+ }
+ }
+ }
+
+ /// 检测 system_profiler 输出的区域
+ private static ProfilerSection DetectSection(String line, ProfilerSection current)
+ {
+ if (line.Contains("Hardware:"))
+ return ProfilerSection.Hardware;
+ if (line.Contains("Software:"))
+ return ProfilerSection.Software;
+ return current;
+ }
+
+ /// 解析硬件信息行
+ private void ParseHardwareInfo(String trimmed)
+ {
+ if (TryExtractValue(trimmed, "Model Name:", out var modelName))
+ Product = modelName;
+ else if (String.IsNullOrEmpty(Product) && TryExtractValue(trimmed, "Model Identifier:", out var modelId))
+ Product = modelId;
+ else if (TryExtractValue(trimmed, "Processor Name:", out var processorName))
+ Processor = processorName;
+ else if (String.IsNullOrEmpty(Processor) && TryExtractValue(trimmed, "Chip:", out var chip))
+ Processor = chip;
+ else if (TryExtractValue(trimmed, "Serial Number (system):", out var serial))
+ Serial = serial;
+ }
+
+ /// 解析软件信息行
+ private void ParseSoftwareInfo(String trimmed)
+ {
+ if (TryExtractValue(trimmed, "System Version:", out var systemVersion))
+ {
+ OSName = systemVersion;
+ OSVersion = ExtractVersionNumber(systemVersion);
+ }
+ }
+
+ /// 尝试从行中提取键值对
+ private static Boolean TryExtractValue(String line, String prefix, out String value)
+ {
+ value = "";
+ if (!line.StartsWith(prefix))
+ return false;
+
+ value = line.Substring(prefix.Length).Trim();
+ return true;
+ }
+
+ /// 从系统版本字符串中提取版本号
+ private static String ExtractVersionNumber(String systemVersion)
+ {
+ var versionStart = systemVersion.IndexOf('(');
+ if (versionStart > 0)
+ return systemVersion.Substring(0, versionStart).Trim();
+ return systemVersion;
+ }
+
+ /// 获取后备OS名称
+ private static String GetFallbackOSName()
+ {
#if NETFRAMEWORK
- OSName = Environment.OSVersion.Platform.ToString();
+ return Environment.OSVersion.Platform.ToString();
#else
- OSName = RuntimeInformation.OSDescription;
+ return RuntimeInformation.OSDescription;
#endif
- }
+ }
+
+ /// system_profiler 输出区域
+ private enum ProfilerSection
+ {
+ None,
+ Hardware,
+ Software
}
#region macOS辅助方法
+ /// 执行命令并返回标准输出
+ /// 命令名称
+ /// 命令参数
+ /// 命令输出，失败则返回null
private static String? ExecuteCommand(String command, String arguments)
{
+ const Int32 SystemProfilerTimeoutMs = 10000; // system_profiler 较慢，需要更长超时
+
try
{
var psi = new ProcessStartInfo
@@ -111,17 +165,19 @@ private void LoadMacInfo()
};
using var process = Process.Start(psi);
- if (process != null)
+ if (process == null)
+ return null;
+
+ var output = process.StandardOutput.ReadToEnd();
+
+ // 等待进程结束或超时
+ if (!process.WaitForExit(SystemProfilerTimeoutMs))
{
- var output = process.StandardOutput.ReadToEnd();
- // 添加超时以避免挂起（10秒，system_profiler 较慢）
- if (!process.WaitForExit(10000))
- {
- try { process.Kill(); } catch { }
- return null;
- }
- return output;
+ try { process.Kill(); } catch { }
+ return null;
}
+
+ return output;
}
catch
{
diff --git a/src/LuYao.Common/Devices/MachineInfo.Windows.cs b/src/LuYao.Common/Devices/MachineInfo.Windows.cs
index b405550..ef9c57b 100644
--- a/src/LuYao.Common/Devices/MachineInfo.Windows.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.Windows.cs
@@ -125,33 +125,35 @@ private void LoadWindowsInfo()
#region Windows辅助方法
/// 批量读取 WMIC 信息以提高性能
- /// 包含所有 WMI 数据的嵌套字典
+ /// 包含所有 WMI 数据的嵌套字典，键为WMI类名
private static Dictionary> ReadWmicBatch()
{
var result = new Dictionary>(StringComparer.OrdinalIgnoreCase);
- // csproduct
- var data = ReadWmic("csproduct", "Name", "Vendor");
- if (data.Count > 0) result["csproduct"] = data;
+ // 读取计算机系统产品信息
+ AddWmicData(result, "csproduct", ReadWmic("csproduct", "Name", "Vendor"));
- // os
- data = ReadWmic("os", "Caption", "Version");
- if (data.Count > 0) result["os"] = data;
+ // 读取操作系统信息
+ AddWmicData(result, "os", ReadWmic("os", "Caption", "Version"));
- // diskdrive
- data = ReadWmic("diskdrive where mediatype=\"Fixed hard disk media\"", "SerialNumber");
- if (data.Count > 0) result["diskdrive"] = data;
+ // 读取磁盘驱动器信息
+ AddWmicData(result, "diskdrive", ReadWmic("diskdrive where mediatype=\"Fixed hard disk media\"", "SerialNumber"));
- // bios
- data = ReadWmic("bios", "SerialNumber");
- if (data.Count > 0) result["bios"] = data;
+ // 读取BIOS信息
+ AddWmicData(result, "bios", ReadWmic("bios", "SerialNumber"));
- // baseboard
- data = ReadWmic("baseboard", "SerialNumber");
- if (data.Count > 0) result["baseboard"] = data;
+ // 读取主板信息
+ AddWmicData(result, "baseboard", ReadWmic("baseboard", "SerialNumber"));
return result;
}
+
+ /// 将WMIC数据添加到结果字典
+ private static void AddWmicData(Dictionary> result, String key, Dictionary data)
+ {
+ if (data.Count > 0)
+ result[key] = data;
+ }
/// 通过WMIC命令读取信息
/// WMI类型
@@ -159,70 +161,88 @@ private static Dictionary> ReadWmicBatch()
/// 解析后的字典
private static Dictionary ReadWmic(String type, params String[] keys)
{
- var dic = new Dictionary>(StringComparer.OrdinalIgnoreCase);
- var dic2 = new Dictionary(StringComparer.OrdinalIgnoreCase);
+ const Int32 WmicTimeoutMilliseconds = 5000;
+
+ var rawData = new Dictionary>(StringComparer.OrdinalIgnoreCase);
+ var result = new Dictionary(StringComparer.OrdinalIgnoreCase);
try
{
- var args = $"{type} get {String.Join(",", keys)} /format:list";
- var psi = new ProcessStartInfo
- {
- FileName = "wmic",
- Arguments = args,
- RedirectStandardOutput = true,
- UseShellExecute = false,
- CreateNoWindow = true
- };
-
- using var process = Process.Start(psi);
- if (process != null)
- {
- var output = process.StandardOutput.ReadToEnd();
- // 添加超时以避免挂起（5秒）
- if (!process.WaitForExit(5000))
- {
- try { process.Kill(); } catch { }
- return dic2;
- }
-
- if (!String.IsNullOrEmpty(output))
- {
- var lines = output.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
- foreach (var line in lines)
- {
- var parts = line.Split('=');
- if (parts.Length >= 2)
- {
- var key = parts[0].Trim();
- var value = parts[1].Trim();
-
- // 清理不可见字符
- value = Clean(value) ?? "";
-
- if (!String.IsNullOrEmpty(key) && !String.IsNullOrEmpty(value))
- {
- if (!dic.TryGetValue(key, out var list))
- dic[key] = list = new List();
-
- list.Add(value);
- }
- }
- }
- }
- }
+ var output = ExecuteWmicCommand(type, keys, WmicTimeoutMilliseconds);
+ if (String.IsNullOrEmpty(output))
+ return result;
- // 排序，避免多个磁盘序列号时，顺序变动
- foreach (var item in dic)
- {
- dic2[item.Key] = String.Join(",", item.Value.OrderBy(e => e));
- }
+ ParseWmicOutput(output, rawData);
+ ConsolidateWmicData(rawData, result);
}
catch
{
- // 忽略错误
+ // 忽略错误，返回空结果
}
- return dic2;
+ return result;
+ }
+
+ /// 执行WMIC命令并返回输出
+ private static String? ExecuteWmicCommand(String type, String[] keys, Int32 timeoutMs)
+ {
+ var args = $"{type} get {String.Join(",", keys)} /format:list";
+ var psi = new ProcessStartInfo
+ {
+ FileName = "wmic",
+ Arguments = args,
+ RedirectStandardOutput = true,
+ UseShellExecute = false,
+ CreateNoWindow = true
+ };
+
+ using var process = Process.Start(psi);
+ if (process == null)
+ return null;
+
+ var output = process.StandardOutput.ReadToEnd();
+
+ if (!process.WaitForExit(timeoutMs))
+ {
+ try { process.Kill(); } catch { }
+ return null;
+ }
+
+ return output;
+ }
+
+ /// 解析WMIC输出为键值对
+ private static void ParseWmicOutput(String output, Dictionary> rawData)
+ {
+ var lines = output.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
+
+ foreach (var line in lines)
+ {
+ var parts = line.Split('=');
+ if (parts.Length < 2)
+ continue;
+
+ var key = parts[0].Trim();
+ var value = Clean(parts[1].Trim()) ?? "";
+
+ if (String.IsNullOrEmpty(key) || String.IsNullOrEmpty(value))
+ continue;
+
+ if (!rawData.TryGetValue(key, out var list))
+ rawData[key] = list = new List();
+
+ list.Add(value);
+ }
+ }
+
+ /// 合并多个值的WMIC数据（如多个磁盘）
+ private static void ConsolidateWmicData(Dictionary> rawData, Dictionary result)
+ {
+ foreach (var item in rawData)
+ {
+ // 排序以保证一致性，用逗号连接多个值
+ result[item.Key] = String.Join(",", item.Value.OrderBy(e => e));
+ }
}
#endregion
}
diff --git a/src/LuYao.Common/Devices/MachineInfo.cs b/src/LuYao.Common/Devices/MachineInfo.cs
index 15a2851..2ac25dd 100644
--- a/src/LuYao.Common/Devices/MachineInfo.cs
+++ b/src/LuYao.Common/Devices/MachineInfo.cs
@@ -125,32 +125,48 @@ private void Reset()
}
/// 裁剪不可见字符并去除两端空白
+ /// 待清理的字符串
+ /// 清理后的字符串
private static String? Clean(String? value)
{
- if (String.IsNullOrEmpty(value)) return value;
+ if (String.IsNullOrEmpty(value))
+ return value;
+
+ // 快速路径：检查是否包含控制字符
+ if (!ContainsControlCharacters(value))
+ return value.Trim();
+
+ // 慢速路径：清理控制字符后返回
+ return RemoveControlCharacters(value).Trim();
+ }
+
+ /// 检查字符串是否包含控制字符
+ private static Boolean ContainsControlCharacters(String value)
+ {
+ const Int32 MinPrintableChar = 32;
+ const Int32 DeleteChar = 127;
- // 快速检查是否需要清理
- var needsCleaning = false;
foreach (var c in value)
{
- if (c < 32 || c == 127)
- {
- needsCleaning = true;
- break;
- }
+ if (c < MinPrintableChar || c == DeleteChar)
+ return true;
}
+ return false;
+ }
+
+ /// 移除字符串中的控制字符
+ private static String RemoveControlCharacters(String value)
+ {
+ const Int32 MinPrintableChar = 32;
+ const Int32 DeleteChar = 127;
- if (!needsCleaning)
- return value.Trim();
-
- // 只有在需要时才使用 StringBuilder
var sb = new StringBuilder(value.Length);
foreach (var c in value)
{
- if (c >= 32 && c != 127)
+ if (c >= MinPrintableChar && c != DeleteChar)
sb.Append(c);
}
- return sb.ToString().Trim();
+ return sb.ToString();
}
#endregion