mrlee
2f59f5adc4
agent 0.10.0：新增 GET /api/v1/metrics（资源采集，复用 internal/sysinfo；CPU 两次采样差值 + 1 秒内复用上次结果）、GET /api/v1/logs/nginx（日志尾部，路径白名单来自 nginx -T / 环境变量 / 默认目录，32KB 块倒读、单行 4KB 截断、上限 2000 行）、GET /api/v1/frps/config（frps.toml 回读，256KB 上限） internal/sysinfo：补 LoadAvg 与 UptimeSeconds（Linux /proc/loadavg 与 /proc/uptime、Windows GetTickCount64、其它平台空值） 应用侧：AgentClient 三个只读方法；request 错误改为带状态码的 statusError，新增 ErrAgentEndpointMissing，把 404/405 统一转成「agent 版本过低需 ≥ 0.10.0」提示；补 service/handler/router 前端：公网 Agent 页「VPS 资源」横排带（占满环境与依赖整行）；日志中心「公网 Nginx」页签；frps 同源配置弹窗「比对 VPS 实际文件」 二进制：内嵌 fonu-agent-linux-amd64 / arm64 用新代码重编；VERSION → 1.2.4
106 lines
2.7 KiB
Go
106 lines
2.7 KiB
Go
//go:build windows
|
||
|
||
package sysinfo
|
||
|
||
import (
|
||
"os"
|
||
"syscall"
|
||
"unsafe"
|
||
)
|
||
|
||
var (
|
||
kernel32 = syscall.NewLazyDLL("kernel32.dll")
|
||
procGetSystemTimes = kernel32.NewProc("GetSystemTimes")
|
||
procGlobalMemoryStatusEx = kernel32.NewProc("GlobalMemoryStatusEx")
|
||
procGetDiskFreeSpaceExW = kernel32.NewProc("GetDiskFreeSpaceExW")
|
||
procGetTickCount64 = kernel32.NewProc("GetTickCount64")
|
||
)
|
||
|
||
type memoryStatusEx struct {
|
||
Length uint32
|
||
MemoryLoad uint32
|
||
TotalPhys uint64
|
||
AvailPhys uint64
|
||
TotalPageFile uint64
|
||
AvailPageFile uint64
|
||
TotalVirtual uint64
|
||
AvailVirtual uint64
|
||
AvailExtendedVirtual uint64
|
||
}
|
||
|
||
func readPlatform() (Stats, CPUSample) {
|
||
var (
|
||
stats Stats
|
||
sample CPUSample
|
||
)
|
||
|
||
var idle, kernel, user syscall.Filetime
|
||
if ret, _, _ := procGetSystemTimes.Call(
|
||
uintptr(unsafe.Pointer(&idle)),
|
||
uintptr(unsafe.Pointer(&kernel)),
|
||
uintptr(unsafe.Pointer(&user)),
|
||
); ret != 0 {
|
||
// kernel 时间包含 idle，因此总时间 = kernel + user
|
||
sample = CPUSample{
|
||
Total: filetimeTicks(kernel) + filetimeTicks(user),
|
||
Idle: filetimeTicks(idle),
|
||
}
|
||
}
|
||
|
||
var mem memoryStatusEx
|
||
mem.Length = uint32(unsafe.Sizeof(mem))
|
||
if ret, _, _ := procGlobalMemoryStatusEx.Call(uintptr(unsafe.Pointer(&mem))); ret != 0 {
|
||
stats.MemTotalBytes = mem.TotalPhys
|
||
stats.MemUsedBytes = mem.TotalPhys - mem.AvailPhys
|
||
}
|
||
|
||
stats.DiskTotalBytes, stats.DiskUsedBytes = diskUsage(volumeRoot())
|
||
return stats, sample
|
||
}
|
||
|
||
// volumeRoot 取当前工作目录所在盘符（Fonu 的数据目录与工作目录同盘），失败时回落到 C:\
|
||
func volumeRoot() string {
|
||
wd, err := os.Getwd()
|
||
if err != nil || len(wd) < 2 || wd[1] != ':' {
|
||
return `C:\`
|
||
}
|
||
return wd[:3]
|
||
}
|
||
|
||
func diskUsage(root string) (total, used uint64) {
|
||
rootPtr, err := syscall.UTF16PtrFromString(root)
|
||
if err != nil {
|
||
return 0, 0
|
||
}
|
||
var freeToCaller, totalBytes, totalFree uint64
|
||
ret, _, _ := procGetDiskFreeSpaceExW.Call(
|
||
uintptr(unsafe.Pointer(rootPtr)),
|
||
uintptr(unsafe.Pointer(&freeToCaller)),
|
||
uintptr(unsafe.Pointer(&totalBytes)),
|
||
uintptr(unsafe.Pointer(&totalFree)),
|
||
)
|
||
if ret == 0 || totalBytes == 0 {
|
||
return 0, 0
|
||
}
|
||
if totalFree > totalBytes {
|
||
return totalBytes, 0
|
||
}
|
||
return totalBytes, totalBytes - totalFree
|
||
}
|
||
|
||
// LoadAvg Windows 没有平均负载概念，固定返回 nil
|
||
func LoadAvg() []float64 {
|
||
return nil
|
||
}
|
||
|
||
// UptimeSeconds 用 GetTickCount64 取系统运行秒数
|
||
func UptimeSeconds() uint64 {
|
||
ret, _, _ := procGetTickCount64.Call()
|
||
return uint64(ret) / 1000
|
||
}
|
||
|
||
// filetimeTicks 把 FILETIME（100ns 单位）折算为 10ms 刻度，避免累加时溢出
|
||
func filetimeTicks(ft syscall.Filetime) uint64 {
|
||
return (uint64(ft.HighDateTime)<<32 | uint64(ft.LowDateTime)) / 10000
|
||
}
|