Compare commits

...
14 Commits
Author SHA1 Message Date
kory 16ece31d57 ci(release): generate formatted markdown changelog and release notes for each release
Release / Build & Release (push) Canceled after 0s
2026-09-28 10:30:27 +08:00
kory 8d8b201498 ci(release): automatically extract and render commit changelog into release notes 2026-09-28 10:29:17 +08:00
kory 5744bf5585 fix(web): declare statusText and archOs before card template interpolation
Release / Build & Release (push) Canceled after 0s
2026-09-28 10:23:39 +08:00
kory 9a070b77af ci(release): auto-bump patch version and release on push to main; docs: document upgrade-agent script in README
Release / Build & Release (push) Canceled after 0s
2026-09-28 10:20:13 +08:00
kory 886cb2af27 feat(profile): optimize profile metrics for Agent decision-making (add disk_free and load_1m, replace swap with load) 2026-09-28 10:15:14 +08:00
kory 0381fe3f2f feat(web): adopt plan 1 card header layout (remove APPLICATION role, clean hierarchy) 2026-09-28 10:06:49 +08:00
kory c11aadaa68 fix(web): fix card height mismatch caused by long device names with dedicated row and ellipsis 2026-09-28 09:49:13 +08:00
kory 80db7a482a fix(web): exclude local hub from device list and align 6-grid profile metrics 2026-09-28 09:42:46 +08:00
kory d84db86486 feat(deploy): add one-line upgrade-agent script 2026-09-28 09:18:46 +08:00
kory d1989a7f24 docs: update README with node resource profiling and device revocation features
Release / Build & Release (push) Canceled after 0s
2026-09-28 09:05:45 +08:00
kory 3776c310e4 feat: add node resource profiling and admin device revocation 2026-09-28 09:00:31 +08:00
kory a7b23b760a style(web): use minimal custom svg icons for theme switch button 2026-09-28 08:49:09 +08:00
kory b9a43e78ee style(web): remove theme button on login page and add project brand logo to header 2026-09-28 08:45:08 +08:00
kory 4baa91597f fix(deploy): add -k flag to curl in install script for certificate tolerance 2026-09-28 08:26:07 +08:00
27 changed files with 900 additions and 88 deletions
+52 -1
View File
@@ -2,6 +2,8 @@ name: Release
on: on:
push: push:
branches:
- main
tags: tags:
- 'v*' - 'v*'
@@ -15,6 +17,53 @@ jobs:
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Determine Version Tag & Generate Notes
id: versioning
run: |
PREV_TAG=$(git tag -l "v*" --sort=-v:refname | head -n1)
echo "Previous tag: $PREV_TAG"
if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
TAG="${GITHUB_REF#refs/tags/}"
else
if [ -z "$PREV_TAG" ]; then
TAG="v1.0.0"
else
VER_NUM="${PREV_TAG#v}"
IFS='.' read -r MAJOR MINOR PATCH <<< "$VER_NUM"
PATCH=$((PATCH + 1))
TAG="v${MAJOR}.${MINOR}.${PATCH}"
fi
echo "Auto incremented patch version to $TAG"
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git tag "$TAG"
git push origin "$TAG"
fi
echo "tag=$TAG" >> $GITHUB_OUTPUT
# 生成详细的 Release Changelog 正文
cat << NOTES > release_notes.md
### 🚀 What's Changed in ${TAG}
NOTES
if [ -n "$PREV_TAG" ]; then
git log "${PREV_TAG}..HEAD" --pretty=format:"- %s (%h by @%an)" >> release_notes.md
else
git log -n 10 --pretty=format:"- %s (%h by @%an)" >> release_notes.md
fi
echo "" >> release_notes.md
echo "" >> release_notes.md
if [ -n "$PREV_TAG" ]; then
echo "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${PREV_TAG}...${TAG}" >> release_notes.md
fi
cat release_notes.md
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v5 uses: actions/setup-go@v5
@@ -40,6 +89,8 @@ jobs:
- name: Create GitHub Release - name: Create GitHub Release
uses: softprops/action-gh-release@v2 uses: softprops/action-gh-release@v2
with: with:
tag_name: ${{ steps.versioning.outputs.tag }}
name: Release ${{ steps.versioning.outputs.tag }}
body_path: release_notes.md
files: | files: |
dist/* dist/*
generate_release_notes: true
+23 -4
View File
@@ -27,9 +27,17 @@
- **零参数泄露**:全面封禁 CLI 敏感传参,凭据由 `0600` 环境变量接管,避免 `/proc/*/cmdline` 泄密。 - **零参数泄露**:全面封禁 CLI 敏感传参,凭据由 `0600` 环境变量接管,避免 `/proc/*/cmdline` 泄密。
- **完整审计追溯**:内置本地 SQLite 存储,全量记录调用者 IP、下发节点、指令内容、退出码及精确执行耗时。 - **完整审计追溯**:内置本地 SQLite 存储,全量记录调用者 IP、下发节点、指令内容、退出码及精确执行耗时。
- **执行隔离与超时回收**:内置上下文超时控制,强制清理孤儿进程,彻底杜绝僵尸进程。 - **执行隔离与超时回收**:内置上下文超时控制,强制清理孤儿进程,彻底杜绝僵尸进程。
- 📊 **实时节点资源画像 (Node Profiling & Role)**:
- **原生零依赖深度采集**:直接读取 Linux 内核指标,实时监控物理 CPU 核心数与瞬时负载、真实可用内存(`MemAvailable`)与 Swap、根分区磁盘占用、IO 压力指数(内核原生 PSI / Loadavg)及 Docker 守护进程运行状态。
- **动态角色标签**:支持节点角色分工(如 `CONTROL` 控制中枢、`APPLICATION` 应用节点、`DATABASE` 等),为 AI Agent 自动化调度部署决策提供全维度实时依据。
- 🛡️ **设备生命周期管理与防重连黑名单**:
- 支持管理员在 Web 控制台一键注销并强制断开指定受控节点。
- 持久化吊销拦截(Revocation List),彻底杜绝被下线 Agent 因 Systemd 自动重启而死灰复燃。
- 本地主控节点(Local)强制安全锁,防误操作防护。
- 🖥️ **内嵌极简 Web 管理面板**: - 🖥️ **内嵌极简 Web 管理面板**:
- 静态单页面(SPA)采用 Go `embed` 完整打包进二进制文件,单文件独立运行,无需安装 Node.js、Nginx 或外部静态资源 CDN。 - 静态单页面(SPA)采用 Go `embed` 完整打包进二进制文件,单文件独立运行,无需安装 Node.js、Nginx 或外部静态资源 CDN。
- 包含设备状态感知、Actions 向导、在线调试控制台及操作审计日志。 - **工程级双态主题**:纯手绘 SVG 极简几何微图标(太阳/弦月),支持深曜蓝黑与柔和浅灰白一键切换,完美适配系统偏好且零 FOUC 白屏闪烁。
- **全端响应式**:彻底适配手机移动端(≤680px),宽表独立触控滑动,长节点名自动断行不穿透。
--- ---
@@ -65,17 +73,27 @@
--- ---
## 🚀 极速一键部署 (推荐) ## 🚀 极速一键部署与平滑升级
### 1. 一键全自动安装 (推荐)
无论是在受控端 VPS 还是中心端,只需一行命令即可交互式安装与启动: 无论是在受控端 VPS 还是中心端,只需一行命令即可交互式安装与启动:
```bash ```bash
bash <(curl -sSL https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/install.sh) bash <(curl -sSL https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/install.sh)
``` ```
- **安装 Agent (受控 VPS)**:输入 Hub 的 WSS 地址与通信密钥,全自动配置开机自启并秒级连入集群。 - **安装 Agent (受控 VPS)**:输入 Hub 的 WSS 地址与通信密钥,全自动配置开机自启并秒级连入集群。
- **安装 Hub (中心服务端)**:自动生成安全 API Key / Web 面板密码并以 Systemd 托管常驻。 - **安装 Hub (中心服务端)**:自动生成安全 API Key / Web 面板密码并以 Systemd 托管常驻。
### 2. 受控端 Agent 一键平滑升级 (免重输配置)
当新版本发布后,无需重新配置通信密钥或重新安装,在任意受控机上直接运行升级脚本:
```bash
curl -fsSL https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/upgrade-agent.sh | bash
```
- 自动检测并拉取 GitHub 最新版本架构包(AMD64 / ARM64);
- 自动备份旧版本二进制(`.bak`);
- 升级异常(校验失败或无法启动)时**自动秒级回滚**,保证节点永不失联。
--- ---
## 🛠️ 手动编译部署 ## 🛠️ 手动编译部署
@@ -153,7 +171,8 @@ Agent 启动后会通过 WSS 自动连入 Hub,在 Hub 管理面板与 `/api/v1
| 接口路径 | 方法 | 功能描述 | | 接口路径 | 方法 | 功能描述 |
| :--- | :--- | :--- | | :--- | :--- | :--- |
| `/api/v1/devices` | `GET` | 列出集群中所有受控设备及其实时状态(在线/离线、架构、系统等) | | `/api/v1/devices` | `GET` | 列出集群中所有受控设备状态与**实时资源画像 (CPU/Mem/Disk/IO PSI/Docker/Role)** |
| `/panel/api/devices` | `DELETE` | 【管理员】注销并踢出指定受控节点,持久化写入防重连黑名单 |
| `/api/v1/exec` | `POST` | 在指定受控节点执行任意 Shell 指令(支持超时截断) | | `/api/v1/exec` | `POST` | 在指定受控节点执行任意 Shell 指令(支持超时截断) |
| `/api/v1/file/read` | `POST` | 安全分页读取目标机器上的文件内容(防内存溢出) | | `/api/v1/file/read` | `POST` | 安全分页读取目标机器上的文件内容(防内存溢出) |
| `/api/v1/file/write` | `POST` | 向目标机器指定路径覆写或创建文件 | | `/api/v1/file/write` | `POST` | 向目标机器指定路径覆写或创建文件 |
+17 -4
View File
@@ -16,6 +16,7 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/wjyhk/vps-commander/internal/cluster" "github.com/wjyhk/vps-commander/internal/cluster"
"github.com/wjyhk/vps-commander/internal/executor" "github.com/wjyhk/vps-commander/internal/executor"
"github.com/wjyhk/vps-commander/internal/sysinfo"
) )
func main() { func main() {
@@ -68,23 +69,29 @@ func run(hub, name, token string, insecure bool) error {
return err return err
} }
exec := executor.Local{MaxOutput: 1024 * 1024} exec := executor.Local{MaxOutput: 1024 * 1024}
if err := writeJSON(cluster.Message{Event: "hello", Device: name, TS: time.Now().Unix()}); err != nil {
// 初始握手附带画像
initProf := sysinfo.Collect("APPLICATION")
if err := writeJSON(cluster.Message{Event: "hello", Device: name, Profile: &initProf, TS: time.Now().Unix()}); err != nil {
return err return err
} }
stopPing := make(chan struct{}) stopPing := make(chan struct{})
defer close(stopPing) defer close(stopPing)
go func() { go func() {
t := time.NewTicker(30 * time.Second) t := time.NewTicker(15 * time.Second)
defer t.Stop() defer t.Stop()
for { for {
select { select {
case <-t.C: case <-t.C:
_ = writeJSON(cluster.Message{Event: "ping", Device: name, TS: time.Now().Unix()}) prof := sysinfo.Collect("APPLICATION")
_ = writeJSON(cluster.Message{Event: "ping", Device: name, Profile: &prof, TS: time.Now().Unix()})
case <-stopPing: case <-stopPing:
return return
} }
} }
}() }()
for { for {
var msg cluster.Message var msg cluster.Message
if err := c.ReadJSON(&msg); err != nil { if err := c.ReadJSON(&msg); err != nil {
@@ -94,8 +101,13 @@ func run(hub, name, token string, insecure bool) error {
if msg.Event == "registered" { if msg.Event == "registered" {
continue continue
} }
if msg.Event == "revoked" {
log.Printf("device revoked by admin: %s", msg.Error)
return errors.New("revoked by admin")
}
if msg.Event == "ping" { if msg.Event == "ping" {
if err := writeJSON(cluster.Message{Event: "pong", Device: name, TS: msg.TS}); err != nil { prof := sysinfo.Collect("APPLICATION")
if err := writeJSON(cluster.Message{Event: "pong", Device: name, Profile: &prof, TS: msg.TS}); err != nil {
return err return err
} }
continue continue
@@ -185,6 +197,7 @@ func decodePayload(v any, out any) error {
} }
return json.Unmarshal(b, out) return json.Unmarshal(b, out)
} }
func sendError(writeJSON func(cluster.Message) error, id string, err error) error { func sendError(writeJSON func(cluster.Message) error, id string, err error) error {
return writeJSON(cluster.Message{ID: id, Status: "error", Error: err.Error()}) return writeJSON(cluster.Message{ID: id, Status: "error", Error: err.Error()})
} }
+1 -1
View File
@@ -55,7 +55,7 @@ func main() {
s := &api.Server{ s := &api.Server{
Auth: authManager, Auth: authManager,
Exec: executor.Local{MaxOutput: 1024 * 1024}, Exec: executor.Local{MaxOutput: 1024 * 1024},
Cluster: cluster.NewManager(clusterSecret), Cluster: func() *cluster.Manager { m := cluster.NewManager(clusterSecret); m.SetStore(store); return m }(),
Store: store, Store: store,
LocalName: local, LocalName: local,
} }
+3 -3
View File
@@ -37,7 +37,7 @@ command -v curl >/dev/null 2>&1 || (apt-get update && apt-get install -y curl ||
# 获取最新版本 tag # 获取最新版本 tag
info "正在获取 VPS-Commander 最新版本信息..." info "正在获取 VPS-Commander 最新版本信息..."
LATEST_TAG=$(curl -sSL "https://api.github.com/repos/${REPO}/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') LATEST_TAG=$(curl -fsSL -k "https://api.github.com/repos/${REPO}/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
if [ -z "$LATEST_TAG" ]; then if [ -z "$LATEST_TAG" ]; then
warn "无法通过 GitHub API 自动获取 Tag,将尝试使用默认版本 v1.0.0" warn "无法通过 GitHub API 自动获取 Tag,将尝试使用默认版本 v1.0.0"
LATEST_TAG="v1.0.0" LATEST_TAG="v1.0.0"
@@ -61,7 +61,7 @@ install_agent() {
DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}" DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
info "正在下载 Agent: ${DOWNLOAD_URL}" info "正在下载 Agent: ${DOWNLOAD_URL}"
curl -sSL -o "${INSTALL_DIR}/vps-commander-agent" "${DOWNLOAD_URL}" || error "下载失败,请检查网络或 Release 是否存在" curl -fsSL -k -o "${INSTALL_DIR}/vps-commander-agent" "${DOWNLOAD_URL}" || error "下载失败,请检查网络或 Release 是否存在"
chmod +x "${INSTALL_DIR}/vps-commander-agent" chmod +x "${INSTALL_DIR}/vps-commander-agent"
echo -e "\n--- 配置 Agent 参数 ---" echo -e "\n--- 配置 Agent 参数 ---"
@@ -128,7 +128,7 @@ install_hub() {
DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}" DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
info "正在下载 Hub: ${DOWNLOAD_URL}" info "正在下载 Hub: ${DOWNLOAD_URL}"
curl -sSL -o "${INSTALL_DIR}/vps-commander-hub" "${DOWNLOAD_URL}" || error "下载失败,请检查网络或 Release 是否存在" curl -fsSL -k -o "${INSTALL_DIR}/vps-commander-hub" "${DOWNLOAD_URL}" || error "下载失败,请检查网络或 Release 是否存在"
chmod +x "${INSTALL_DIR}/vps-commander-hub" chmod +x "${INSTALL_DIR}/vps-commander-hub"
echo -e "\n--- 配置 Hub 参数 ---" echo -e "\n--- 配置 Hub 参数 ---"
+80
View File
@@ -0,0 +1,80 @@
#!/bin/bash
set -e
# VPS-Commander Agent 一键安全升级脚本
# Repo: https://github.com/kyaring/vps-commander
REPO="kyaring/vps-commander"
INSTALL_DIR="/opt/vps-commander"
GITHUB_URL="https://github.com"
# 颜色输出
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
BLUE='\033[0;34m'
NC='\033[0m'
info() { echo -e "${BLUE}[INFO]${NC} $*"; }
success() { echo -e "${GREEN}[SUCCESS]${NC} $*"; }
warn() { echo -e "${YELLOW}[WARN]${NC} $*"; }
error() { echo -e "${RED}[ERROR]${NC} $*"; exit 1; }
# 检查 root 权限
[[ $EUID -ne 0 ]] && error "必须使用 root 权限运行此脚本"
# 检查是否安装过 agent
if [ ! -f "${INSTALL_DIR}/vps-commander-agent" ]; then
error "未检测到已安装的 Agent (${INSTALL_DIR}/vps-commander-agent),请先使用 install.sh 完整安装。"
fi
# 架构检测
ARCH=$(uname -m)
case "$ARCH" in
x86_64|amd64) TARGET_ARCH="amd64" ;;
aarch64|arm64) TARGET_ARCH="arm64" ;;
*) error "暂不支持的系统架构: $ARCH" ;;
esac
info "正在获取最新 Release 版本信息..."
LATEST_TAG=$(curl -fsSL -k "https://api.github.com/repos/${REPO}/releases/latest" | grep '"tag_name":' | head -n1 | sed -E 's/.*"([^"]+)".*/\1/')
if [ -z "$LATEST_TAG" ]; then
warn "无法通过 GitHub API 自动获取 Tag,回退至 v1.1.0"
LATEST_TAG="v1.1.0"
fi
info "目标升级版本: ${LATEST_TAG} (${TARGET_ARCH})"
BIN_NAME="vps-commander-agent-linux-${TARGET_ARCH}"
DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
TMP_BIN="${INSTALL_DIR}/vps-commander-agent.tmp"
BAK_BIN="${INSTALL_DIR}/vps-commander-agent.bak"
info "正在下载新版本二进制文件..."
curl -fsSL -k -o "${TMP_BIN}" "${DOWNLOAD_URL}" || error "下载失败,请检查网络或 Release 是否存在"
# 完整性校验:文件大小不能小于 1MB
FILE_SIZE=$(stat -c%s "${TMP_BIN}" 2>/dev/null || stat -f%z "${TMP_BIN}" 2>/dev/null || echo 0)
if [ "$FILE_SIZE" -lt 1000000 ]; then
rm -f "${TMP_BIN}"
error "下载的文件不完整或损坏 (大小: ${FILE_SIZE} 字节),已终止升级"
fi
chmod +x "${TMP_BIN}"
info "备份旧版本并原子替换..."
cp -f "${INSTALL_DIR}/vps-commander-agent" "${BAK_BIN}" 2>/dev/null || true
mv -f "${TMP_BIN}" "${INSTALL_DIR}/vps-commander-agent"
info "重启 vps-commander-agent 服务..."
systemctl restart vps-commander-agent
sleep 2
if systemctl is-active --quiet vps-commander-agent; then
success "Agent 成功平滑升级至 ${LATEST_TAG} 并已恢复运行!"
rm -f "${BAK_BIN}"
else
warn "服务启动异常,正在自动回滚原版本..."
mv -f "${BAK_BIN}" "${INSTALL_DIR}/vps-commander-agent"
systemctl restart vps-commander-agent
error "升级失败,已安全回滚至上一版本,请查看日志: journalctl -u vps-commander-agent -n 20"
fi
+3 -1
View File
@@ -1,7 +1,7 @@
# VPS-Commander M4 最终验收报告(待人工签收) # VPS-Commander M4 最终验收报告(待人工签收)
日期:2026-09-28 日期:2026-09-28
状态:🟡 技术收尾完成,等待 Custom GPT Actions 人工签收 状态:🟡 技术收尾完成;管理面板 UI 已人工验收并上线,M4 总体验收仍等待 Custom GPT Actions 人工签收
## 已完成 ## 已完成
@@ -25,3 +25,5 @@
4. 完成后由用户人工确认 M4 通过。 4. 完成后由用户人工确认 M4 通过。
在此之前,本报告不得视为 Release Ready / M4 Passed。 在此之前,本报告不得视为 Release Ready / M4 Passed。
- 管理面板 UI 已完成手机端多 Agent 适配与深/浅双态主题;用户人工验收通过后已重新构建 Hub 并重启 systemd,线上 embed 静态资源已立即生效。
+8
View File
@@ -107,6 +107,14 @@
- [x] 临时凭据文件 `/tmp/m4-prod.env` 已删除;`/etc/vps-commander/{hub,agent}.env` 权限均为 `0600`。 - [x] 临时凭据文件 `/tmp/m4-prod.env` 已删除;`/etc/vps-commander/{hub,agent}.env` 权限均为 `0600`。
- [ ] Custom GPT Actions UI 仍需用户侧完成正式 OpenAPI 导入、Bearer Key 配置及对话调用;未完成前不得签署 M4。 - [ ] Custom GPT Actions UI 仍需用户侧完成正式 OpenAPI 导入、Bearer Key 配置及对话调用;未完成前不得签署 M4。
### M4 管理面板 UI 验收记录(2026-09-28)
- [x] 手机端多 Agent 显示异常整改完成:设备卡片、Header、Actions、设备选择器、审计表均完成窄屏适配。
- [x] 面板颜色体系改为 CSS Variables 双态主题,支持深色/浅色切换。
- [x] 主题选择持久化到 localStorage,登录页与主面板统一。
- [x] UI 静态资源与 Go embed 资源保持同步,并完成 Node JS 语法、go test ./...、release build 验证。
- [x] 用户已于 2026-09-28 人工验收通过;已重新构建 Hub 二进制并重启 systemd 服务,正式线上 UI 已立即生效。
- [ ] M4 总体验收仍保留 Custom GPT Actions 正式联调、Key 轮换及最终人工签收门禁。
### M4 终验签收记录(2026-09-28) ### M4 终验签收记录(2026-09-28)
- [x] 安全清理:已彻底清除 `openapi.json` 中冗余残留的 `apiKey` 定义,统一收敛为标准 `bearerAuth`。 - [x] 安全清理:已彻底清除 `openapi.json` 中冗余残留的 `apiKey` 定义,统一收敛为标准 `bearerAuth`。
- [x] 二次回归验证通过:全链路 API 鉴权、受控节点列表获取及本地命令执行均现场实测 100% PASS。 - [x] 二次回归验证通过:全链路 API 鉴权、受控节点列表获取及本地命令执行均现场实测 100% PASS。
+25 -1
View File
@@ -18,6 +18,7 @@ import (
"github.com/wjyhk/vps-commander/internal/executor" "github.com/wjyhk/vps-commander/internal/executor"
"github.com/wjyhk/vps-commander/internal/model" "github.com/wjyhk/vps-commander/internal/model"
"github.com/wjyhk/vps-commander/internal/storage" "github.com/wjyhk/vps-commander/internal/storage"
"github.com/wjyhk/vps-commander/internal/sysinfo"
panelweb "github.com/wjyhk/vps-commander/internal/web" panelweb "github.com/wjyhk/vps-commander/internal/web"
) )
@@ -104,7 +105,8 @@ func (s *Server) devices(w http.ResponseWriter, r *http.Request) {
http.Error(w, "method not allowed", 405) http.Error(w, "method not allowed", 405)
return return
} }
out := []model.Device{{Name: s.LocalName, Status: "online", Local: true, Arch: runtime.GOARCH, OS: runtime.GOOS}} localProf := sysinfo.Collect("CONTROL")
out := []model.Device{{Name: s.LocalName, Status: "online", Local: true, Arch: runtime.GOARCH, OS: runtime.GOOS, Profile: &localProf}}
if s.Cluster != nil { if s.Cluster != nil {
for _, d := range s.Cluster.Devices() { for _, d := range s.Cluster.Devices() {
b, _ := json.Marshal(d) b, _ := json.Marshal(d)
@@ -116,6 +118,28 @@ func (s *Server) devices(w http.ResponseWriter, r *http.Request) {
jsonOut(w, out) jsonOut(w, out)
} }
func (s *Server) DeleteDevice(w http.ResponseWriter, r *http.Request) {
name := r.URL.Query().Get("name")
if name == "" {
http.Error(w, "device name required", 400)
return
}
if name == s.LocalName || name == "local" {
http.Error(w, "cannot delete local control node", 403)
return
}
if s.Cluster != nil {
if err := s.Cluster.RevokeDevice(name, "revoked by admin via web console"); err != nil {
http.Error(w, "revoke failed: "+err.Error(), 500)
return
}
} else if s.Store != nil {
_ = s.Store.RevokeDevice(name, "revoked by admin via web console")
}
_ = s.Store.Audit(clientIP(r), name, "revoke_device", "revoked by admin", 0, 0, "")
jsonOut(w, map[string]any{"ok": true, "revoked": name})
}
func (s *Server) agentWS(w http.ResponseWriter, r *http.Request) { func (s *Server) agentWS(w http.ResponseWriter, r *http.Request) {
if s.Cluster == nil { if s.Cluster == nil {
http.Error(w, "cluster unavailable", 503) http.Error(w, "cluster unavailable", 503)
+54 -7
View File
@@ -12,20 +12,24 @@ import (
"time" "time"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/wjyhk/vps-commander/internal/storage"
"github.com/wjyhk/vps-commander/internal/sysinfo"
) )
type Manager struct { type Manager struct {
Secret string Secret string
Store *storage.Store
mu sync.RWMutex mu sync.RWMutex
nodes map[string]*Node nodes map[string]*Node
} }
type Node struct { type Node struct {
Name string Name string
Conn *websocket.Conn Conn *websocket.Conn
WriteMu sync.Mutex WriteMu sync.Mutex
Pending sync.Map Pending sync.Map
LastSeen atomic.Int64 LastSeen atomic.Int64
LastProfile *sysinfo.Profile
} }
type Result struct { type Result struct {
@@ -46,6 +50,11 @@ type FileResult struct {
func NewManager(secret string) *Manager { func NewManager(secret string) *Manager {
return &Manager{Secret: secret, nodes: make(map[string]*Node)} return &Manager{Secret: secret, nodes: make(map[string]*Node)}
} }
func (m *Manager) SetStore(s *storage.Store) {
m.Store = s
}
func (m *Manager) ServeWS(w http.ResponseWriter, r *http.Request) { func (m *Manager) ServeWS(w http.ResponseWriter, r *http.Request) {
auth := r.Header.Get("Authorization") auth := r.Header.Get("Authorization")
provided := "" provided := ""
@@ -61,6 +70,14 @@ func (m *Manager) ServeWS(w http.ResponseWriter, r *http.Request) {
http.Error(w, "device_name required", 400) http.Error(w, "device_name required", 400)
return return
} }
if m.Store != nil {
if revoked, _ := m.Store.IsRevoked(name); revoked {
http.Error(w, "device has been revoked by admin", 403)
return
}
}
up := websocket.Upgrader{CheckOrigin: func(*http.Request) bool { return true }} up := websocket.Upgrader{CheckOrigin: func(*http.Request) bool { return true }}
c, err := up.Upgrade(w, r, nil) c, err := up.Upgrade(w, r, nil)
if err != nil { if err != nil {
@@ -115,7 +132,10 @@ func (m *Manager) readLoop(n *Node) {
} }
n.LastSeen.Store(time.Now().UnixNano()) n.LastSeen.Store(time.Now().UnixNano())
_ = n.Conn.SetReadDeadline(time.Now().Add(75 * time.Second)) _ = n.Conn.SetReadDeadline(time.Now().Add(75 * time.Second))
if msg.Event == "pong" || msg.Event == "ping" { if msg.Profile != nil {
n.LastProfile = msg.Profile
}
if msg.Event == "pong" || msg.Event == "ping" || msg.Event == "hello" || msg.Event == "profile" {
continue continue
} }
if msg.ID != "" { if msg.ID != "" {
@@ -130,6 +150,7 @@ func (m *Manager) readLoop(n *Node) {
} }
} }
} }
func (m *Manager) Online(name string) bool { func (m *Manager) Online(name string) bool {
m.mu.RLock() m.mu.RLock()
defer m.mu.RUnlock() defer m.mu.RUnlock()
@@ -137,6 +158,22 @@ func (m *Manager) Online(name string) bool {
return n != nil && time.Since(time.Unix(0, n.LastSeen.Load())) < 70*time.Second return n != nil && time.Since(time.Unix(0, n.LastSeen.Load())) < 70*time.Second
} }
func (m *Manager) RevokeDevice(name, reason string) error {
m.mu.Lock()
n, exists := m.nodes[name]
if exists {
delete(m.nodes, name)
_ = n.write(Message{Event: "revoked", Error: "revoked by admin"})
_ = n.Conn.Close()
}
m.mu.Unlock()
if m.Store != nil {
return m.Store.RevokeDevice(name, reason)
}
return nil
}
func (m *Manager) Devices() []map[string]any { func (m *Manager) Devices() []map[string]any {
m.mu.RLock() m.mu.RLock()
defer m.mu.RUnlock() defer m.mu.RUnlock()
@@ -147,7 +184,16 @@ func (m *Manager) Devices() []map[string]any {
if time.Since(lastSeen) >= 70*time.Second { if time.Since(lastSeen) >= 70*time.Second {
status = "offline" status = "offline"
} }
out = append(out, map[string]any{"name": name, "status": status, "is_local": false, "last_heartbeat": lastSeen.Unix()}) item := map[string]any{
"name": name,
"status": status,
"is_local": false,
"last_heartbeat": lastSeen.Unix(),
}
if n.LastProfile != nil {
item["profile"] = n.LastProfile
}
out = append(out, item)
} }
return out return out
} }
@@ -180,6 +226,7 @@ func (m *Manager) call(ctx context.Context, name, action string, payload any) (M
return Message{}, ctx.Err() return Message{}, ctx.Err()
} }
} }
func (m *Manager) Exec(ctx context.Context, name string, p ExecPayload) (Result, error) { func (m *Manager) Exec(ctx context.Context, name string, p ExecPayload) (Result, error) {
msg, err := m.call(ctx, name, "exec", p) msg, err := m.call(ctx, name, "exec", p)
if err != nil { if err != nil {
+15 -12
View File
@@ -1,18 +1,21 @@
package cluster package cluster
import "github.com/wjyhk/vps-commander/internal/sysinfo"
type Message struct { type Message struct {
ID string `json:"id,omitempty"` ID string `json:"id,omitempty"`
Event string `json:"event,omitempty"` Event string `json:"event,omitempty"`
Action string `json:"action,omitempty"` Action string `json:"action,omitempty"`
Device string `json:"device,omitempty"` Device string `json:"device,omitempty"`
Status string `json:"status,omitempty"` Status string `json:"status,omitempty"`
Payload any `json:"payload,omitempty"` Payload any `json:"payload,omitempty"`
ExitCode int `json:"exit_code,omitempty"` Profile *sysinfo.Profile `json:"profile,omitempty"`
Stdout string `json:"stdout,omitempty"` ExitCode int `json:"exit_code,omitempty"`
Stderr string `json:"stderr,omitempty"` Stdout string `json:"stdout,omitempty"`
DurationMS int64 `json:"duration_ms,omitempty"` Stderr string `json:"stderr,omitempty"`
Error string `json:"error,omitempty"` DurationMS int64 `json:"duration_ms,omitempty"`
TS int64 `json:"ts,omitempty"` Error string `json:"error,omitempty"`
TS int64 `json:"ts,omitempty"`
} }
type ExecPayload struct { type ExecPayload struct {
+8 -5
View File
@@ -1,5 +1,7 @@
package model package model
import "github.com/wjyhk/vps-commander/internal/sysinfo"
type ExecRequest struct { type ExecRequest struct {
Device string `json:"device,omitempty"` Device string `json:"device,omitempty"`
Command string `json:"command"` Command string `json:"command"`
@@ -16,11 +18,12 @@ type ExecResponse struct {
} }
type Device struct { type Device struct {
Name string `json:"name"` Name string `json:"name"`
Status string `json:"status"` Status string `json:"status"`
Local bool `json:"is_local"` Local bool `json:"is_local"`
Arch string `json:"arch,omitempty"` Arch string `json:"arch,omitempty"`
OS string `json:"os,omitempty"` OS string `json:"os,omitempty"`
Profile *sysinfo.Profile `json:"profile,omitempty"`
} }
type FileReadRequest struct { type FileReadRequest struct {
+27
View File
@@ -97,3 +97,30 @@ func (s *Store) RecentAudits(limit int) ([]AuditLog, error) {
} }
return out, rows.Err() return out, rows.Err()
} }
func (s *Store) InitRevocationTable() error {
_, err := s.DB.Exec(`CREATE TABLE IF NOT EXISTS revoked_devices (
name TEXT PRIMARY KEY,
revoked_at INTEGER NOT NULL,
reason TEXT
);`)
return err
}
func (s *Store) RevokeDevice(name, reason string) error {
_, err := s.DB.Exec(`INSERT INTO revoked_devices(name, revoked_at, reason)
VALUES(?, ?, ?) ON CONFLICT(name) DO UPDATE SET revoked_at=excluded.revoked_at, reason=excluded.reason`,
name, time.Now().Unix(), reason)
return err
}
func (s *Store) UnrevokeDevice(name string) error {
_, err := s.DB.Exec(`DELETE FROM revoked_devices WHERE name = ?`, name)
return err
}
func (s *Store) IsRevoked(name string) (bool, error) {
var count int
err := s.DB.QueryRow(`SELECT COUNT(*) FROM revoked_devices WHERE name = ?`, name).Scan(&count)
return count > 0, err
}
+256
View File
@@ -0,0 +1,256 @@
package sysinfo
import (
"bufio"
"fmt"
"os"
"runtime"
"strconv"
"strings"
"syscall"
"time"
)
type Profile struct {
Role string `json:"role,omitempty"`
CPUCores int `json:"cpu_cores"`
CPUUsagePercent int `json:"cpu_usage_percent"`
Load1M float64 `json:"load_1m"`
MemPercent int `json:"mem_percent"`
MemAvailable string `json:"mem_available"`
DiskPercent int `json:"disk_percent"`
DiskFree string `json:"disk_free"`
IOPSI float64 `json:"io_psi"`
Docker bool `json:"docker"`
UpdatedAt int64 `json:"updated_at"`
}
func Collect(defaultRole string) Profile {
role := os.Getenv("VPS_COMMANDER_ROLE")
if role == "" {
role = defaultRole
}
if role == "" {
role = "APPLICATION"
}
cores := runtime.NumCPU()
cpuPercent := getCPUUsage()
load1m := getLoad1M()
memPct, memAvl := getMemInfo()
diskPct, diskFree := getDiskInfo()
psi := getIOPSI()
docker := hasDocker()
return Profile{
Role: role,
CPUCores: cores,
CPUUsagePercent: cpuPercent,
Load1M: load1m,
MemPercent: memPct,
MemAvailable: memAvl,
DiskPercent: diskPct,
DiskFree: diskFree,
IOPSI: psi,
Docker: docker,
UpdatedAt: time.Now().Unix(),
}
}
func getLoad1M() float64 {
if data, err := os.ReadFile("/proc/loadavg"); err == nil {
fields := strings.Fields(string(data))
if len(fields) > 0 {
if val, err := strconv.ParseFloat(fields[0], 64); err == nil {
return val
}
}
}
return 0.0
}
func getCPUUsage() int {
pct := sampleCPUStat()
if pct >= 0 {
return pct
}
if data, err := os.ReadFile("/proc/loadavg"); err == nil {
fields := strings.Fields(string(data))
if len(fields) > 0 {
if l1, err := strconv.ParseFloat(fields[0], 64); err == nil {
cores := float64(runtime.NumCPU())
if cores < 1 {
cores = 1
}
val := int((l1 / cores) * 100)
if val > 100 {
val = 100
}
return val
}
}
}
return 0
}
func sampleCPUStat() int {
readStat := func() (idle, total uint64, ok bool) {
f, err := os.Open("/proc/stat")
if err != nil {
return 0, 0, false
}
defer f.Close()
scanner := bufio.NewScanner(f)
if scanner.Scan() {
fields := strings.Fields(scanner.Text())
if len(fields) >= 5 && fields[0] == "cpu" {
var sum uint64
for i := 1; i < len(fields); i++ {
v, _ := strconv.ParseUint(fields[i], 10, 64)
sum += v
}
idleVal, _ := strconv.ParseUint(fields[4], 10, 64)
return idleVal, sum, true
}
}
return 0, 0, false
}
idle1, total1, ok1 := readStat()
if !ok1 {
return -1
}
time.Sleep(50 * time.Millisecond)
idle2, total2, ok2 := readStat()
if !ok2 || total2 <= total1 {
return -1
}
deltaTotal := total2 - total1
deltaIdle := idle2 - idle1
if deltaTotal == 0 {
return 0
}
busy := float64(deltaTotal-deltaIdle) / float64(deltaTotal) * 100
if busy < 0 {
busy = 0
}
if busy > 100 {
busy = 100
}
return int(busy)
}
func getMemInfo() (memPct int, memAvl string) {
f, err := os.Open("/proc/meminfo")
if err != nil {
return 0, "N/A"
}
defer f.Close()
var total, free, avail, buffers, cached uint64
scanner := bufio.NewScanner(f)
for scanner.Scan() {
line := scanner.Text()
parts := strings.SplitN(line, ":", 2)
if len(parts) != 2 {
continue
}
key := strings.TrimSpace(parts[0])
valFields := strings.Fields(parts[1])
if len(valFields) == 0 {
continue
}
v, _ := strconv.ParseUint(valFields[0], 10, 64)
switch key {
case "MemTotal":
total = v
case "MemFree":
free = v
case "MemAvailable":
avail = v
case "Buffers":
buffers = v
case "Cached":
cached = v
}
}
if avail == 0 {
avail = free + buffers + cached
}
if total > 0 {
used := total - avail
memPct = int(float64(used) / float64(total) * 100)
if avail >= 1024*1024 {
memAvl = fmt.Sprintf("%.1fG", float64(avail)/(1024*1024))
} else {
memAvl = fmt.Sprintf("%dM", avail/1024)
}
} else {
memAvl = "N/A"
}
return memPct, memAvl
}
func getDiskInfo() (diskPct int, diskFree string) {
var stat syscall.Statfs_t
if err := syscall.Statfs("/", &stat); err != nil {
return 0, "N/A"
}
total := stat.Blocks * uint64(stat.Bsize)
free := stat.Bavail * uint64(stat.Bsize)
if total == 0 {
return 0, "N/A"
}
used := total - free
diskPct = int(float64(used) / float64(total) * 100)
if diskPct > 100 {
diskPct = 100
}
if free >= 1024*1024*1024 {
diskFree = fmt.Sprintf("%.1fG", float64(free)/(1024*1024*1024))
} else {
diskFree = fmt.Sprintf("%dM", free/(1024*1024))
}
return diskPct, diskFree
}
func getIOPSI() float64 {
data, err := os.ReadFile("/proc/pressure/io")
if err == nil {
lines := strings.Split(string(data), "\n")
for _, line := range lines {
if strings.HasPrefix(line, "some") {
fields := strings.Fields(line)
for _, f := range fields {
if strings.HasPrefix(f, "avg10=") {
val, err := strconv.ParseFloat(strings.TrimPrefix(f, "avg10="), 64)
if err == nil {
return val
}
}
}
}
}
}
if data, err := os.ReadFile("/proc/loadavg"); err == nil {
fields := strings.Fields(string(data))
if len(fields) > 0 {
if val, err := strconv.ParseFloat(fields[0], 64); err == nil {
return val
}
}
}
return 0.0
}
func hasDocker() bool {
if _, err := os.Stat("/var/run/docker.sock"); err == nil {
return true
}
return false
}
+16
View File
@@ -0,0 +1,16 @@
package sysinfo
import (
"testing"
)
func TestCollect(t *testing.T) {
p := Collect("CONTROL")
if p.Role != "CONTROL" {
t.Fatalf("expected CONTROL, got %s", p.Role)
}
if p.CPUCores <= 0 {
t.Fatalf("expected >0 CPU cores, got %d", p.CPUCores)
}
t.Logf("Profile: %+v", p)
}
+13 -1
View File
@@ -20,6 +20,7 @@ type Runner interface {
AuditsJSON(http.ResponseWriter, *http.Request) AuditsJSON(http.ResponseWriter, *http.Request)
PanelExec(http.ResponseWriter, *http.Request) PanelExec(http.ResponseWriter, *http.Request)
RotateAPIKey(http.ResponseWriter, *http.Request) RotateAPIKey(http.ResponseWriter, *http.Request)
DeleteDevice(http.ResponseWriter, *http.Request)
} }
type Panel struct { type Panel struct {
@@ -38,7 +39,7 @@ func (p *Panel) Handler() http.Handler {
mux.HandleFunc("/panel/login", p.login) mux.HandleFunc("/panel/login", p.login)
mux.HandleFunc("/panel/logout", p.logout) mux.HandleFunc("/panel/logout", p.logout)
mux.HandleFunc("/static/", p.static) mux.HandleFunc("/static/", p.static)
mux.HandleFunc("/panel/api/devices", p.protected(p.Runner.DevicesJSON)) mux.HandleFunc("/panel/api/devices", p.protected(p.handleDevices))
mux.HandleFunc("/panel/api/audits", p.protected(p.Runner.AuditsJSON)) mux.HandleFunc("/panel/api/audits", p.protected(p.Runner.AuditsJSON))
mux.HandleFunc("/panel/api/exec", p.protected(p.Runner.PanelExec)) mux.HandleFunc("/panel/api/exec", p.protected(p.Runner.PanelExec))
mux.HandleFunc("/panel/api/key/rotate", p.protected(p.Runner.RotateAPIKey)) mux.HandleFunc("/panel/api/key/rotate", p.protected(p.Runner.RotateAPIKey))
@@ -46,6 +47,14 @@ func (p *Panel) Handler() http.Handler {
return mux return mux
} }
func (p *Panel) handleDevices(w http.ResponseWriter, r *http.Request) {
if r.Method == http.MethodDelete {
p.Runner.DeleteDevice(w, r)
return
}
p.Runner.DevicesJSON(w, r)
}
func (p *Panel) index(w http.ResponseWriter, r *http.Request) { func (p *Panel) index(w http.ResponseWriter, r *http.Request) {
if !p.valid(r) { if !p.valid(r) {
http.Redirect(w, r, "/panel/login", http.StatusFound) http.Redirect(w, r, "/panel/login", http.StatusFound)
@@ -141,6 +150,9 @@ func (p *Panel) static(w http.ResponseWriter, r *http.Request) {
if len(path) >= 3 && path[len(path)-3:] == ".js" { if len(path) >= 3 && path[len(path)-3:] == ".js" {
w.Header().Set("Content-Type", "application/javascript; charset=utf-8") w.Header().Set("Content-Type", "application/javascript; charset=utf-8")
} }
if strings.HasSuffix(path, ".png") {
w.Header().Set("Content-Type", "image/png")
}
_, _ = w.Write(data) _, _ = w.Write(data)
} }
+1
View File
@@ -13,6 +13,7 @@ func (testRunner) DevicesJSON(w http.ResponseWriter, r *http.Request) {}
func (testRunner) AuditsJSON(w http.ResponseWriter, r *http.Request) {} func (testRunner) AuditsJSON(w http.ResponseWriter, r *http.Request) {}
func (testRunner) PanelExec(w http.ResponseWriter, r *http.Request) {} func (testRunner) PanelExec(w http.ResponseWriter, r *http.Request) {}
func (testRunner) RotateAPIKey(w http.ResponseWriter, r *http.Request) {} func (testRunner) RotateAPIKey(w http.ResponseWriter, r *http.Request) {}
func (testRunner) DeleteDevice(w http.ResponseWriter, r *http.Request) {}
func TestStaticCSSContentType(t *testing.T) { func TestStaticCSSContentType(t *testing.T) {
p := New("test-password", testRunner{}) p := New("test-password", testRunner{})
+40 -1
View File
@@ -1 +1,40 @@
*{box-sizing:border-box}body{margin:0;background:#0b1020;color:#e7ebf3;font:14px/1.5 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif}header{height:64px;padding:0 24px;display:flex;align-items:center;justify-content:space-between;border-bottom:1px solid #202a3d;background:#10182b;position:sticky;top:0;z-index:2}header strong{font-size:18px}header span{margin-left:12px;color:#7f8ba3;font-size:12px}main{max-width:1400px;margin:auto;padding:22px}.grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:16px}.wide{grid-column:1/-1}.card{background:#111a2d;border:1px solid #24304a;border-radius:14px;padding:18px;box-shadow:0 8px 30px #0003}.cardhead{display:flex;align-items:center;justify-content:space-between}h2{margin:0 0 14px;font-size:16px}button,select,input,textarea{border:1px solid #34415d;border-radius:9px;background:#0d1526;color:#e7ebf3;padding:9px 12px}button{cursor:pointer}button:hover{background:#17233a}textarea{width:100%;height:110px;resize:vertical;font-family:ui-monospace,monospace;margin:8px 0}pre{white-space:pre-wrap;overflow:auto;background:#090e1a;border-radius:9px;padding:12px;color:#b9c5da}.devices{display:grid;grid-template-columns:repeat(auto-fill,minmax(220px,1fr));gap:10px}.device{padding:14px;border:1px solid #283650;border-radius:10px}.dot{display:inline-block;width:8px;height:8px;border-radius:50%;background:#4ade80;margin-right:7px}.offline .dot{background:#f87171}.muted{color:#7f8ba3}.tablewrap{overflow:auto}table{width:100%;border-collapse:collapse}th,td{text-align:left;padding:9px;border-bottom:1px solid #26324a;font-size:12px}th{color:#91a0bb}.login{display:grid;place-items:center;min-height:100vh}.login form{width:min(380px,90vw);background:#111a2d;border:1px solid #24304a;border-radius:16px;padding:28px}.login input,.login button{width:100%;margin-top:10px}.login h1{margin:0}.login p,#error{color:#8c9ab2}.status{font-size:12px;color:#9aabc5}@media(max-width:800px){.grid{grid-template-columns:1fr}.wide{grid-column:auto}main{padding:12px}header{padding:0 14px}} *{box-sizing:border-box}
:root{color-scheme:dark;--bg-body:#0b1020;--bg-card:#111a2d;--bg-sub:#0d1526;--border:#24304a;--border-strong:#34415d;--text-main:#e7ebf3;--text-muted:#7f8ba3;--text-status:#9aabc5;--pre-text:#b9c5da;--thead:#91a0bb;--dot-online:#4ade80;--dot-offline:#f87171;--shadow:0 8px 30px rgba(0,0,0,.2)}
:root[data-theme="light"]{color-scheme:light;--bg-body:#f4f6fa;--bg-card:#fff;--bg-sub:#eef2f7;--border:#d1d9e4;--border-strong:#b8c3d3;--text-main:#172033;--text-muted:#647089;--text-status:#58657a;--pre-text:#26344b;--thead:#53627a;--dot-online:#16833d;--dot-offline:#c62828;--shadow:0 8px 26px rgba(28,45,72,.08)}
html,body{min-height:100%}body{margin:0;background:var(--bg-body);color:var(--text-main);font:14px/1.5 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif}header{min-height:64px;padding:0 24px;display:flex;align-items:center;justify-content:space-between;gap:14px;border-bottom:1px solid var(--border);background:var(--bg-card);position:sticky;top:0;z-index:2}
.brand-wrap{display:flex;align-items:center;gap:12px;min-width:0}
.brand-logo{width:36px;height:36px;border-radius:8px;object-fit:cover;flex:none;box-shadow:0 2px 8px rgba(0,0,0,.15)}
header strong{font-size:18px}header span{margin-left:12px;color:var(--text-muted);font-size:12px}.header-actions{display:flex;align-items:center;gap:8px;flex-shrink:0}main{max-width:1400px;margin:auto;padding:22px}.grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:16px}.wide{grid-column:1/-1}.card{min-width:0;background:var(--bg-card);border:1px solid var(--border);border-radius:14px;padding:18px;box-shadow:var(--shadow)}.cardhead{display:flex;align-items:center;justify-content:space-between;gap:12px;min-width:0}.cardhead>h2{min-width:0}h2{margin:0 0 14px;font-size:16px}button,select,input,textarea{border:1px solid var(--border-strong);border-radius:9px;background:var(--bg-sub);color:var(--text-main);padding:9px 12px;font:inherit;max-width:100%}button{cursor:pointer}button:hover{filter:brightness(1.05)}button:focus-visible,select:focus-visible,input:focus-visible,textarea:focus-visible{outline:2px solid var(--border-strong);outline-offset:2px}textarea{width:100%;height:110px;resize:vertical;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;margin:8px 0}pre{white-space:pre-wrap;overflow:auto;background:var(--bg-sub);border:1px solid var(--border);border-radius:9px;padding:12px;color:var(--pre-text)}.devices{display:grid;grid-template-columns:repeat(auto-fill,minmax(220px,1fr));gap:10px}.device{min-width:0;padding:14px;border:1px solid var(--border);border-radius:10px;background:var(--bg-sub)}.device b{display:block;min-width:0;overflow-wrap:anywhere;word-break:break-all}.dot{display:inline-block;width:8px;height:8px;border-radius:50%;background:var(--dot-online);vertical-align:middle;flex:none;margin-right:7px}.offline .dot{background:var(--dot-offline)}.muted{color:var(--text-muted)}.status{margin-top:3px;font-size:12px;color:var(--text-status);overflow-wrap:anywhere;word-break:break-word}.actions{display:flex;flex-wrap:wrap;gap:8px}.actions button{flex:1 1 150px}#device{min-width:180px}.tablewrap{width:100%;max-width:100%;overflow-x:auto;overscroll-behavior-x:contain}table{width:100%;min-width:760px;border-collapse:collapse}th,td{text-align:left;padding:9px;border-bottom:1px solid var(--border);font-size:12px;white-space:nowrap}th{color:var(--thead)}.login{display:grid;place-items:center;min-height:100vh;padding:20px}.login form{width:min(380px,90vw);background:var(--bg-card);border:1px solid var(--border);border-radius:16px;padding:28px;box-shadow:var(--shadow)}.login input,.login button{width:100%;margin-top:10px}.login h1{margin:0}.login p,#error{color:var(--text-muted)}
@media(max-width:800px){.grid{grid-template-columns:1fr}.wide{grid-column:auto}main{padding:12px}header{padding:0 14px}.header-actions{gap:6px}.card{padding:15px}.cardhead{flex-wrap:wrap}.cardhead>#device{width:100%;min-width:0}.actions button{flex:1 1 140px}}
@media(max-width:680px){header{align-items:flex-start;padding-top:12px;padding-bottom:12px}header span{display:none}.brand-wrap{padding-top:2px}.brand-logo{width:32px;height:32px}.header-actions{flex-direction:column;align-items:stretch;width:112px}.header-actions button{width:100%;padding:8px 9px}.devices{grid-template-columns:1fr}.cardhead{flex-direction:column;align-items:stretch;gap:8px}.cardhead h2{margin-bottom:0}.cardhead button,#device{width:100%;min-width:0}.actions button{flex:1 1 calc(50% - 4px)}}
@media(max-width:450px){main{padding:9px}.card{padding:13px;border-radius:12px}.actions{display:grid;grid-template-columns:1fr 1fr}.actions button{width:100%;min-width:0}.login form{padding:22px}.header-actions{width:104px}}
@media(prefers-reduced-motion:reduce){*,*::before,*::after{transition:none!important}}
/* 主题切换极简矢量图标按钮 */
.btn-icon{display:inline-flex;align-items:center;justify-content:center;width:38px;height:38px;padding:0;border-radius:9px;background:var(--bg-sub);border:1px solid var(--border-strong);color:var(--text-main);cursor:pointer;transition:background .2s,border-color .2s}
.btn-icon:hover{filter:brightness(1.1)}
.theme-svg{display:none;width:18px;height:18px}
:root[data-theme="dark"] .svg-sun{display:block;color:#facc15}
:root[data-theme="light"] .svg-moon{display:block;color:#475569}
/* 设备卡片与画像升级 (方案 1: 经典主副标题分行) */
.devices{display:grid;grid-template-columns:repeat(auto-fill,minmax(280px,1fr));gap:12px}
.device-card{min-width:0;padding:16px;border:1px solid var(--border);border-radius:12px;background:var(--bg-sub);display:flex;flex-direction:column;gap:12px}
.v1-head{display:flex;flex-direction:column;gap:4px;min-width:0}
.v1-row1{display:flex;align-items:center;justify-content:space-between;gap:8px;min-width:0}
.v1-title{display:flex;align-items:center;gap:8px;min-width:0;flex:1}
.v1-name{font-size:16px;font-weight:700;color:var(--text-main);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:block}
.v1-row2{font-size:12px;color:var(--text-muted);padding-left:16px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
.btn-revoke{padding:2px 8px;font-size:11px;border-radius:5px;background:transparent;border:1px solid var(--border-strong);color:var(--dot-offline);cursor:pointer;flex-shrink:0}
.btn-revoke:hover{background:rgba(239,68,68,.15);border-color:var(--dot-offline)}
/* 资源画像 2列紧凑栅格 */
.profile-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:6px 12px;padding:10px 12px;background:var(--bg-card);border:1px solid var(--border);border-radius:8px;font-size:12px}
.p-item{display:flex;justify-content:space-between;align-items:center;gap:6px;min-height:20px}
.p-label{color:var(--text-muted);font-weight:500;font-size:11px}
.p-val{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;font-weight:600;font-size:12px;color:var(--text-main);white-space:nowrap}
.badge-docker-text{padding:1px 6px;border-radius:4px;font-size:11px;font-weight:700}
.badge-docker-text.yes{background:rgba(34,197,94,.15);color:var(--dot-online);border:1px solid rgba(34,197,94,.3)}
.badge-docker-text.no{background:rgba(148,163,184,.15);color:var(--text-muted);border:1px solid var(--border)}
+106 -8
View File
@@ -1,12 +1,110 @@
const $=s=>document.querySelector(s); const $=s=>document.querySelector(s);
async function api(path,opt={}){let r=await fetch("/panel/api"+path,opt);if(r.status===401){location.href="/panel/login";throw Error("unauthorized")}if(!r.ok)throw Error(await r.text());return r.json()} (function(){
function esc(v){return String(v??"").replace(/[&<>"]/g,c=>({"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;"}[c]))} const b=$("#themeToggle");
async function loadDevices(){let ds=await api("/devices");$("#devices").innerHTML=ds.map(d=>`<div class="device ${d.status==="online"?"":"offline"}"><b><i class="dot"></i>${esc(d.name)}</b><div class="status">${esc(d.status)} · ${d.is_local?"local":"remote"} · ${esc(d.arch||"")}/${esc(d.os||"")}</div></div>`).join("");$("#device").innerHTML=ds.map(d=>`<option>${esc(d.name)}</option>`).join("")} if(!b)return;
async function loadAudits(){let a=await api("/audits?limit=100");$("#audits").innerHTML=a.map(x=>`<tr><td>${new Date(x.timestamp*1000).toLocaleString()}</td><td>${esc(x.device)}</td><td>${esc(x.action)}</td><td><code>${esc(x.command)}</code></td><td>${x.exit_code}</td><td>${x.duration_ms}ms</td><td>${esc(x.caller_ip)}</td></tr>`).join("")} b.onclick=()=>{
$("#refresh").onclick=loadDevices;$("#auditRefresh").onclick=loadAudits; const current=document.documentElement.dataset.theme||"dark";
$("#run").onclick=async()=>{let o=$("#output");o.textContent="执行中…";try{let x=await api("/exec",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({device:$("#device").value,command:$("#command").value,timeout:30})});o.textContent=`exit_code: ${x.exit_code}\n\nstdout:\n${x.stdout}\n\nstderr:\n${x.stderr}\nduration: ${x.duration_ms}ms`}catch(e){o.textContent=e.message}}; const next=current==="light"?"dark":"light";
document.documentElement.dataset.theme=next;
localStorage.setItem("vpc_theme",next);
};
})();
async function api(path,opt={}){
let r=await fetch("/panel/api"+path,opt);
if(r.status===401){location.href="/panel/login";throw Error("unauthorized")}
if(!r.ok)throw Error(await r.text());
return r.json()
}
function esc(v){
return String(v??"").replace(/[&<>"]/g,c=>({"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;"}[c]))
}
async function removeDevice(name){
if(!confirm(`确认注销并踢出节点 [${name}] 吗?\n注销后该节点将被断开并禁止再次连入。`)) return;
try{
await api("/devices?name="+encodeURIComponent(name), {method: "DELETE"});
await loadDevices();
}catch(e){
alert("注销失败: "+e.message);
}
}
async function loadDevices(){
let all=await api("/devices");
let ds=all.filter(d=>!d.is_local);
$("#devices").innerHTML=ds.map(d=>{
const p = d.profile || {};
const role = p.role || "APPLICATION";
const isOnline = d.status === "online";
const statusText = isOnline ? "在线" : "离线";
const archOs = (d.arch || d.os) ? `${esc(d.arch||"")}/${esc(d.os||"")} · ` : "";
const cpuStr = p.cpu_cores ? `${p.cpu_cores}C · ${p.cpu_usage_percent ?? 0}%` : '-';
const loadStr = p.load_1m !== undefined ? p.load_1m.toFixed(2) : '-';
const memStr = p.mem_available ? `${p.mem_available} (${p.mem_percent}%)` : (p.mem_percent !== undefined ? `${p.mem_percent}%` : '-');
const diskStr = p.disk_free ? `${p.disk_free} (${p.disk_percent}%)` : (p.disk_percent !== undefined ? `${p.disk_percent}%` : '-');
const psiStr = p.io_psi !== undefined ? p.io_psi.toFixed(2) : '-';
const dockerVal = p.docker ? 'YES' : 'NO';
const dockerClass = p.docker ? 'yes' : 'no';
return `
<div class="device-card ${isOnline ? "online" : "offline"}">
<div class="v1-head">
<div class="v1-row1">
<div class="v1-title">
<span class="dot"></span>
<strong class="v1-name" title="${esc(d.name)}">${esc(d.name)}</strong>
</div>
<button class="btn-revoke" onclick="removeDevice('${esc(d.name)}')">注销</button>
</div>
<div class="v1-row2">${archOs}${statusText}</div>
</div>
<div class="profile-grid">
<div class="p-item"><span class="p-label">CPU</span><span class="p-val">${cpuStr}</span></div>
<div class="p-item"><span class="p-label">LOAD</span><span class="p-val">${loadStr}</span></div>
<div class="p-item"><span class="p-label">MEM</span><span class="p-val">${memStr}</span></div>
<div class="p-item"><span class="p-label">DISK</span><span class="p-val">${diskStr}</span></div>
<div class="p-item"><span class="p-label">IO PSI</span><span class="p-val">${psiStr}</span></div>
<div class="p-item"><span class="p-label">DOCKER</span><span class="p-val badge-docker-text ${dockerClass}">${dockerVal}</span></div>
</div>
</div>
`;
}).join("");
$("#device").innerHTML=ds.map(d=>'<option>'+esc(d.name)+'</option>').join("");
}
async function loadAudits(){
let a=await api("/audits?limit=100");
$("#audits").innerHTML=a.map(x=>'<tr><td>'+new Date(x.timestamp*1000).toLocaleString()+'</td><td>'+esc(x.device)+'</td><td>'+esc(x.action)+'</td><td><code>'+esc(x.command)+'</code></td><td>'+x.exit_code+'</td><td>'+x.duration_ms+'ms</td><td>'+esc(x.caller_ip)+'</td></tr>').join("")
}
$("#refresh").onclick=loadDevices;
$("#auditRefresh").onclick=loadAudits;
$("#run").onclick=async()=>{
let o=$("#output");
o.textContent="执行中…";
try{
let x=await api("/exec",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({device:$("#device").value,command:$("#command").value,timeout:30})});
o.textContent=`exit_code: ${x.exit_code}\n\nstdout:\n${x.stdout}\n\nstderr:\n${x.stderr}\nduration: ${x.duration_ms}ms`
}catch(e){
o.textContent=e.message
}
};
$("#copySchema").onclick=()=>navigator.clipboard.writeText(location.origin+"/openapi.json"); $("#copySchema").onclick=()=>navigator.clipboard.writeText(location.origin+"/openapi.json");
$("#copyPrompt").onclick=()=>navigator.clipboard.writeText("你是我的私有 VPS 运维助手。执行操作前确认目标设备;优先使用 list_devices 确认节点状态;高风险操作先向用户确认。"); $("#copyPrompt").onclick=()=>navigator.clipboard.writeText("你是我的私有 VPS 运维助手。执行操作前确认目标设备;优先使用 list_devices 确认节点状态;高风险操作先向用户确认。");
$("#rotateKey").onclick=async()=>{if(!confirm("轮换后旧 API Key 会立即失效,确认继续?"))return;try{let x=await api("/key/rotate",{method:"POST"});$("#newKey").textContent="新 API Key(仅本次显示):\n"+x.api_key}catch(e){$("#newKey").textContent=e.message}}; $("#rotateKey").onclick=async()=>{
$("#logout").onclick=async()=>{await fetch("/panel/logout",{method:"POST"});location.href="/panel/login"}; if(!confirm("轮换后旧 API Key 会立即失效,确认继续?"))return;
try{
let x=await api("/key/rotate",{method:"POST"});
$("#newKey").textContent="新 API Key(仅本次显示):\n"+x.api_key
}catch(e){
$("#newKey").textContent=e.message
}
};
$("#logout").onclick=async()=>{
await fetch("/panel/logout",{method:"POST"});
location.href="/panel/login"
};
loadDevices().then(loadAudits).catch(console.error); loadDevices().then(loadAudits).catch(console.error);
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

+1 -13
View File
@@ -1,13 +1 @@
<!doctype html> <!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><script>(function(){try{var t=localStorage.getItem("vpc_theme");if(t!=="light"&&t!=="dark")t=matchMedia("(prefers-color-scheme:light)").matches?"light":"dark";document.documentElement.dataset.theme=t}catch(e){document.documentElement.dataset.theme="dark"}})();</script><title>VPS-Commander</title><link rel="stylesheet" href="/static/app.css"></head><body><header><div class="brand-wrap"><img src="/static/icon.png" alt="logo" class="brand-logo"><div><strong>VPS-Commander</strong><span>Private Infrastructure Console</span></div></div><div class="header-actions"><button id="themeToggle" type="button" class="btn-icon" title="切换主题" aria-label="切换主题"><svg class="theme-svg svg-sun" viewBox="0 0 24 24" width="18" height="18" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="5"></circle><line x1="12" y1="1" x2="12" y2="3"></line><line x1="12" y1="21" x2="12" y2="23"></line><line x1="4.22" y1="4.22" x2="5.64" y2="5.64"></line><line x1="18.36" y1="18.36" x2="19.78" y2="19.78"></line><line x1="1" y1="12" x2="3" y2="12"></line><line x1="21" y1="12" x2="23" y2="12"></line><line x1="4.22" y1="19.78" x2="5.64" y2="18.36"></line><line x1="18.36" y1="5.64" x2="19.78" y2="4.22"></line></svg><svg class="theme-svg svg-moon" viewBox="0 0 24 24" width="18" height="18" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"></path></svg></button><button id="logout" type="button">退出</button></div></header><main><section class="grid"><article class="card wide"><div class="cardhead"><h2>设备看板</h2><button id="refresh" type="button">刷新</button></div><div id="devices" class="devices"></div></article><article class="card"><h2>Actions 向导</h2><p>当前 Hub 的 OpenAPI Schema:</p><div class="actions"><button id="copySchema" type="button">复制 Schema 地址</button><button id="copyPrompt" type="button">复制 System Prompt</button><button id="rotateKey" type="button">轮换 API Key</button></div><pre id="schemaHint">/openapi.json</pre><pre id="newKey"></pre></article><article class="card wide"><div class="cardhead"><h2>快速控制台</h2><select id="device"></select></div><textarea id="command" placeholder="输入 Shell 命令,例如 uname -a"></textarea><div><button id="run" type="button">执行</button></div><pre id="output"></pre></article><article class="card wide"><div class="cardhead"><h2>审计日志</h2><button id="auditRefresh" type="button">刷新</button></div><div class="tablewrap"><table><thead><tr><th>时间</th><th>设备</th><th>动作</th><th>命令/路径</th><th>退出码</th><th>耗时</th><th>来源</th></tr></thead><tbody id="audits"></tbody></table></div></article></section></main><script src="/static/app.js"></script></body></html>
<html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
<title>VPS-Commander</title><link rel="stylesheet" href="/static/app.css"></head>
<body>
<header><div><strong>VPS-Commander</strong><span>Private Infrastructure Console</span></div><button id="logout">退出</button></header>
<main>
<section class="grid">
<article class="card wide"><div class="cardhead"><h2>设备看板</h2><button id="refresh">刷新</button></div><div id="devices" class="devices"></div></article>
<article class="card"><h2>Actions 向导</h2><p>当前 Hub 的 OpenAPI Schema:</p><button id="copySchema">复制 Schema 地址</button><button id="copyPrompt">复制 System Prompt</button><button id="rotateKey">轮换 API Key</button><pre id="schemaHint">/openapi.json</pre><pre id="newKey"></pre></article>
<article class="card wide"><div class="cardhead"><h2>快速控制台</h2><select id="device"></select></div><textarea id="command" placeholder="输入 Shell 命令,例如 uname -a"></textarea><div><button id="run">执行</button></div><pre id="output"></pre></article>
<article class="card wide"><div class="cardhead"><h2>审计日志</h2><button id="auditRefresh">刷新</button></div><div class="tablewrap"><table><thead><tr><th>时间</th><th>设备</th><th>动作</th><th>命令/路径</th><th>退出码</th><th>耗时</th><th>来源</th></tr></thead><tbody id="audits"></tbody></table></div></article>
</section>
</main><script src="/static/app.js"></script></body></html>
+1 -1
View File
@@ -1 +1 @@
<!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>VPS-Commander Login</title><link rel="stylesheet" href="/static/app.css"></head><body class="login"><form id="login"><h1>VPS-Commander</h1><p>Private Infrastructure Console</p><input id="password" type="password" placeholder="面板密码" autocomplete="current-password"><button>登录</button><div id="error"></div></form><script>document.querySelector("#login").onsubmit=async e=>{e.preventDefault();let r=await fetch("/panel/login",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({password:document.querySelector("#password").value})});if(r.ok)location.href="/";else document.querySelector("#error").textContent="密码错误或未配置面板密码";}</script></body></html> <!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><script>(function(){try{var t=localStorage.getItem("vpc_theme");if(t!=="light"&&t!=="dark")t=matchMedia("(prefers-color-scheme:light)").matches?"light":"dark";document.documentElement.dataset.theme=t}catch(e){document.documentElement.dataset.theme="dark"}})();</script><title>VPS-Commander Login</title><link rel="stylesheet" href="/static/app.css"></head><body class="login"><form id="login"><h1>VPS-Commander</h1><p>Private Infrastructure Console</p><input id="password" type="password" placeholder="面板密码" autocomplete="current-password"><button type="submit">登录</button><div id="error"></div></form><script>document.querySelector("#login").onsubmit=async e=>{e.preventDefault();let r=await fetch("/panel/login",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({password:document.querySelector("#password").value})});if(r.ok)location.href="/";else document.querySelector("#error").textContent="密码错误或未配置面板密码"};</script></body></html>
+40 -1
View File
@@ -1 +1,40 @@
*{box-sizing:border-box}body{margin:0;background:#0b1020;color:#e7ebf3;font:14px/1.5 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif}header{height:64px;padding:0 24px;display:flex;align-items:center;justify-content:space-between;border-bottom:1px solid #202a3d;background:#10182b;position:sticky;top:0;z-index:2}header strong{font-size:18px}header span{margin-left:12px;color:#7f8ba3;font-size:12px}main{max-width:1400px;margin:auto;padding:22px}.grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:16px}.wide{grid-column:1/-1}.card{background:#111a2d;border:1px solid #24304a;border-radius:14px;padding:18px;box-shadow:0 8px 30px #0003}.cardhead{display:flex;align-items:center;justify-content:space-between}h2{margin:0 0 14px;font-size:16px}button,select,input,textarea{border:1px solid #34415d;border-radius:9px;background:#0d1526;color:#e7ebf3;padding:9px 12px}button{cursor:pointer}button:hover{background:#17233a}textarea{width:100%;height:110px;resize:vertical;font-family:ui-monospace,monospace;margin:8px 0}pre{white-space:pre-wrap;overflow:auto;background:#090e1a;border-radius:9px;padding:12px;color:#b9c5da}.devices{display:grid;grid-template-columns:repeat(auto-fill,minmax(220px,1fr));gap:10px}.device{padding:14px;border:1px solid #283650;border-radius:10px}.dot{display:inline-block;width:8px;height:8px;border-radius:50%;background:#4ade80;margin-right:7px}.offline .dot{background:#f87171}.muted{color:#7f8ba3}.tablewrap{overflow:auto}table{width:100%;border-collapse:collapse}th,td{text-align:left;padding:9px;border-bottom:1px solid #26324a;font-size:12px}th{color:#91a0bb}.login{display:grid;place-items:center;min-height:100vh}.login form{width:min(380px,90vw);background:#111a2d;border:1px solid #24304a;border-radius:16px;padding:28px}.login input,.login button{width:100%;margin-top:10px}.login h1{margin:0}.login p,#error{color:#8c9ab2}.status{font-size:12px;color:#9aabc5}@media(max-width:800px){.grid{grid-template-columns:1fr}.wide{grid-column:auto}main{padding:12px}header{padding:0 14px}} *{box-sizing:border-box}
:root{color-scheme:dark;--bg-body:#0b1020;--bg-card:#111a2d;--bg-sub:#0d1526;--border:#24304a;--border-strong:#34415d;--text-main:#e7ebf3;--text-muted:#7f8ba3;--text-status:#9aabc5;--pre-text:#b9c5da;--thead:#91a0bb;--dot-online:#4ade80;--dot-offline:#f87171;--shadow:0 8px 30px rgba(0,0,0,.2)}
:root[data-theme="light"]{color-scheme:light;--bg-body:#f4f6fa;--bg-card:#fff;--bg-sub:#eef2f7;--border:#d1d9e4;--border-strong:#b8c3d3;--text-main:#172033;--text-muted:#647089;--text-status:#58657a;--pre-text:#26344b;--thead:#53627a;--dot-online:#16833d;--dot-offline:#c62828;--shadow:0 8px 26px rgba(28,45,72,.08)}
html,body{min-height:100%}body{margin:0;background:var(--bg-body);color:var(--text-main);font:14px/1.5 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif}header{min-height:64px;padding:0 24px;display:flex;align-items:center;justify-content:space-between;gap:14px;border-bottom:1px solid var(--border);background:var(--bg-card);position:sticky;top:0;z-index:2}
.brand-wrap{display:flex;align-items:center;gap:12px;min-width:0}
.brand-logo{width:36px;height:36px;border-radius:8px;object-fit:cover;flex:none;box-shadow:0 2px 8px rgba(0,0,0,.15)}
header strong{font-size:18px}header span{margin-left:12px;color:var(--text-muted);font-size:12px}.header-actions{display:flex;align-items:center;gap:8px;flex-shrink:0}main{max-width:1400px;margin:auto;padding:22px}.grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:16px}.wide{grid-column:1/-1}.card{min-width:0;background:var(--bg-card);border:1px solid var(--border);border-radius:14px;padding:18px;box-shadow:var(--shadow)}.cardhead{display:flex;align-items:center;justify-content:space-between;gap:12px;min-width:0}.cardhead>h2{min-width:0}h2{margin:0 0 14px;font-size:16px}button,select,input,textarea{border:1px solid var(--border-strong);border-radius:9px;background:var(--bg-sub);color:var(--text-main);padding:9px 12px;font:inherit;max-width:100%}button{cursor:pointer}button:hover{filter:brightness(1.05)}button:focus-visible,select:focus-visible,input:focus-visible,textarea:focus-visible{outline:2px solid var(--border-strong);outline-offset:2px}textarea{width:100%;height:110px;resize:vertical;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;margin:8px 0}pre{white-space:pre-wrap;overflow:auto;background:var(--bg-sub);border:1px solid var(--border);border-radius:9px;padding:12px;color:var(--pre-text)}.devices{display:grid;grid-template-columns:repeat(auto-fill,minmax(220px,1fr));gap:10px}.device{min-width:0;padding:14px;border:1px solid var(--border);border-radius:10px;background:var(--bg-sub)}.device b{display:block;min-width:0;overflow-wrap:anywhere;word-break:break-all}.dot{display:inline-block;width:8px;height:8px;border-radius:50%;background:var(--dot-online);vertical-align:middle;flex:none;margin-right:7px}.offline .dot{background:var(--dot-offline)}.muted{color:var(--text-muted)}.status{margin-top:3px;font-size:12px;color:var(--text-status);overflow-wrap:anywhere;word-break:break-word}.actions{display:flex;flex-wrap:wrap;gap:8px}.actions button{flex:1 1 150px}#device{min-width:180px}.tablewrap{width:100%;max-width:100%;overflow-x:auto;overscroll-behavior-x:contain}table{width:100%;min-width:760px;border-collapse:collapse}th,td{text-align:left;padding:9px;border-bottom:1px solid var(--border);font-size:12px;white-space:nowrap}th{color:var(--thead)}.login{display:grid;place-items:center;min-height:100vh;padding:20px}.login form{width:min(380px,90vw);background:var(--bg-card);border:1px solid var(--border);border-radius:16px;padding:28px;box-shadow:var(--shadow)}.login input,.login button{width:100%;margin-top:10px}.login h1{margin:0}.login p,#error{color:var(--text-muted)}
@media(max-width:800px){.grid{grid-template-columns:1fr}.wide{grid-column:auto}main{padding:12px}header{padding:0 14px}.header-actions{gap:6px}.card{padding:15px}.cardhead{flex-wrap:wrap}.cardhead>#device{width:100%;min-width:0}.actions button{flex:1 1 140px}}
@media(max-width:680px){header{align-items:flex-start;padding-top:12px;padding-bottom:12px}header span{display:none}.brand-wrap{padding-top:2px}.brand-logo{width:32px;height:32px}.header-actions{flex-direction:column;align-items:stretch;width:112px}.header-actions button{width:100%;padding:8px 9px}.devices{grid-template-columns:1fr}.cardhead{flex-direction:column;align-items:stretch;gap:8px}.cardhead h2{margin-bottom:0}.cardhead button,#device{width:100%;min-width:0}.actions button{flex:1 1 calc(50% - 4px)}}
@media(max-width:450px){main{padding:9px}.card{padding:13px;border-radius:12px}.actions{display:grid;grid-template-columns:1fr 1fr}.actions button{width:100%;min-width:0}.login form{padding:22px}.header-actions{width:104px}}
@media(prefers-reduced-motion:reduce){*,*::before,*::after{transition:none!important}}
/* 主题切换极简矢量图标按钮 */
.btn-icon{display:inline-flex;align-items:center;justify-content:center;width:38px;height:38px;padding:0;border-radius:9px;background:var(--bg-sub);border:1px solid var(--border-strong);color:var(--text-main);cursor:pointer;transition:background .2s,border-color .2s}
.btn-icon:hover{filter:brightness(1.1)}
.theme-svg{display:none;width:18px;height:18px}
:root[data-theme="dark"] .svg-sun{display:block;color:#facc15}
:root[data-theme="light"] .svg-moon{display:block;color:#475569}
/* 设备卡片与画像升级 (方案 1: 经典主副标题分行) */
.devices{display:grid;grid-template-columns:repeat(auto-fill,minmax(280px,1fr));gap:12px}
.device-card{min-width:0;padding:16px;border:1px solid var(--border);border-radius:12px;background:var(--bg-sub);display:flex;flex-direction:column;gap:12px}
.v1-head{display:flex;flex-direction:column;gap:4px;min-width:0}
.v1-row1{display:flex;align-items:center;justify-content:space-between;gap:8px;min-width:0}
.v1-title{display:flex;align-items:center;gap:8px;min-width:0;flex:1}
.v1-name{font-size:16px;font-weight:700;color:var(--text-main);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:block}
.v1-row2{font-size:12px;color:var(--text-muted);padding-left:16px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
.btn-revoke{padding:2px 8px;font-size:11px;border-radius:5px;background:transparent;border:1px solid var(--border-strong);color:var(--dot-offline);cursor:pointer;flex-shrink:0}
.btn-revoke:hover{background:rgba(239,68,68,.15);border-color:var(--dot-offline)}
/* 资源画像 2列紧凑栅格 */
.profile-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:6px 12px;padding:10px 12px;background:var(--bg-card);border:1px solid var(--border);border-radius:8px;font-size:12px}
.p-item{display:flex;justify-content:space-between;align-items:center;gap:6px;min-height:20px}
.p-label{color:var(--text-muted);font-weight:500;font-size:11px}
.p-val{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;font-weight:600;font-size:12px;color:var(--text-main);white-space:nowrap}
.badge-docker-text{padding:1px 6px;border-radius:4px;font-size:11px;font-weight:700}
.badge-docker-text.yes{background:rgba(34,197,94,.15);color:var(--dot-online);border:1px solid rgba(34,197,94,.3)}
.badge-docker-text.no{background:rgba(148,163,184,.15);color:var(--text-muted);border:1px solid var(--border)}
+106 -8
View File
@@ -1,12 +1,110 @@
const $=s=>document.querySelector(s); const $=s=>document.querySelector(s);
async function api(path,opt={}){let r=await fetch("/panel/api"+path,opt);if(r.status===401){location.href="/panel/login";throw Error("unauthorized")}if(!r.ok)throw Error(await r.text());return r.json()} (function(){
function esc(v){return String(v??"").replace(/[&<>"]/g,c=>({"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;"}[c]))} const b=$("#themeToggle");
async function loadDevices(){let ds=await api("/devices");$("#devices").innerHTML=ds.map(d=>`<div class="device ${d.status==="online"?"":"offline"}"><b><i class="dot"></i>${esc(d.name)}</b><div class="status">${esc(d.status)} · ${d.is_local?"local":"remote"} · ${esc(d.arch||"")}/${esc(d.os||"")}</div></div>`).join("");$("#device").innerHTML=ds.map(d=>`<option>${esc(d.name)}</option>`).join("")} if(!b)return;
async function loadAudits(){let a=await api("/audits?limit=100");$("#audits").innerHTML=a.map(x=>`<tr><td>${new Date(x.timestamp*1000).toLocaleString()}</td><td>${esc(x.device)}</td><td>${esc(x.action)}</td><td><code>${esc(x.command)}</code></td><td>${x.exit_code}</td><td>${x.duration_ms}ms</td><td>${esc(x.caller_ip)}</td></tr>`).join("")} b.onclick=()=>{
$("#refresh").onclick=loadDevices;$("#auditRefresh").onclick=loadAudits; const current=document.documentElement.dataset.theme||"dark";
$("#run").onclick=async()=>{let o=$("#output");o.textContent="执行中…";try{let x=await api("/exec",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({device:$("#device").value,command:$("#command").value,timeout:30})});o.textContent=`exit_code: ${x.exit_code}\n\nstdout:\n${x.stdout}\n\nstderr:\n${x.stderr}\nduration: ${x.duration_ms}ms`}catch(e){o.textContent=e.message}}; const next=current==="light"?"dark":"light";
document.documentElement.dataset.theme=next;
localStorage.setItem("vpc_theme",next);
};
})();
async function api(path,opt={}){
let r=await fetch("/panel/api"+path,opt);
if(r.status===401){location.href="/panel/login";throw Error("unauthorized")}
if(!r.ok)throw Error(await r.text());
return r.json()
}
function esc(v){
return String(v??"").replace(/[&<>"]/g,c=>({"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;"}[c]))
}
async function removeDevice(name){
if(!confirm(`确认注销并踢出节点 [${name}] 吗?\n注销后该节点将被断开并禁止再次连入。`)) return;
try{
await api("/devices?name="+encodeURIComponent(name), {method: "DELETE"});
await loadDevices();
}catch(e){
alert("注销失败: "+e.message);
}
}
async function loadDevices(){
let all=await api("/devices");
let ds=all.filter(d=>!d.is_local);
$("#devices").innerHTML=ds.map(d=>{
const p = d.profile || {};
const role = p.role || "APPLICATION";
const isOnline = d.status === "online";
const statusText = isOnline ? "在线" : "离线";
const archOs = (d.arch || d.os) ? `${esc(d.arch||"")}/${esc(d.os||"")} · ` : "";
const cpuStr = p.cpu_cores ? `${p.cpu_cores}C · ${p.cpu_usage_percent ?? 0}%` : '-';
const loadStr = p.load_1m !== undefined ? p.load_1m.toFixed(2) : '-';
const memStr = p.mem_available ? `${p.mem_available} (${p.mem_percent}%)` : (p.mem_percent !== undefined ? `${p.mem_percent}%` : '-');
const diskStr = p.disk_free ? `${p.disk_free} (${p.disk_percent}%)` : (p.disk_percent !== undefined ? `${p.disk_percent}%` : '-');
const psiStr = p.io_psi !== undefined ? p.io_psi.toFixed(2) : '-';
const dockerVal = p.docker ? 'YES' : 'NO';
const dockerClass = p.docker ? 'yes' : 'no';
return `
<div class="device-card ${isOnline ? "online" : "offline"}">
<div class="v1-head">
<div class="v1-row1">
<div class="v1-title">
<span class="dot"></span>
<strong class="v1-name" title="${esc(d.name)}">${esc(d.name)}</strong>
</div>
<button class="btn-revoke" onclick="removeDevice('${esc(d.name)}')">注销</button>
</div>
<div class="v1-row2">${archOs}${statusText}</div>
</div>
<div class="profile-grid">
<div class="p-item"><span class="p-label">CPU</span><span class="p-val">${cpuStr}</span></div>
<div class="p-item"><span class="p-label">LOAD</span><span class="p-val">${loadStr}</span></div>
<div class="p-item"><span class="p-label">MEM</span><span class="p-val">${memStr}</span></div>
<div class="p-item"><span class="p-label">DISK</span><span class="p-val">${diskStr}</span></div>
<div class="p-item"><span class="p-label">IO PSI</span><span class="p-val">${psiStr}</span></div>
<div class="p-item"><span class="p-label">DOCKER</span><span class="p-val badge-docker-text ${dockerClass}">${dockerVal}</span></div>
</div>
</div>
`;
}).join("");
$("#device").innerHTML=ds.map(d=>'<option>'+esc(d.name)+'</option>').join("");
}
async function loadAudits(){
let a=await api("/audits?limit=100");
$("#audits").innerHTML=a.map(x=>'<tr><td>'+new Date(x.timestamp*1000).toLocaleString()+'</td><td>'+esc(x.device)+'</td><td>'+esc(x.action)+'</td><td><code>'+esc(x.command)+'</code></td><td>'+x.exit_code+'</td><td>'+x.duration_ms+'ms</td><td>'+esc(x.caller_ip)+'</td></tr>').join("")
}
$("#refresh").onclick=loadDevices;
$("#auditRefresh").onclick=loadAudits;
$("#run").onclick=async()=>{
let o=$("#output");
o.textContent="执行中…";
try{
let x=await api("/exec",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({device:$("#device").value,command:$("#command").value,timeout:30})});
o.textContent=`exit_code: ${x.exit_code}\n\nstdout:\n${x.stdout}\n\nstderr:\n${x.stderr}\nduration: ${x.duration_ms}ms`
}catch(e){
o.textContent=e.message
}
};
$("#copySchema").onclick=()=>navigator.clipboard.writeText(location.origin+"/openapi.json"); $("#copySchema").onclick=()=>navigator.clipboard.writeText(location.origin+"/openapi.json");
$("#copyPrompt").onclick=()=>navigator.clipboard.writeText("你是我的私有 VPS 运维助手。执行操作前确认目标设备;优先使用 list_devices 确认节点状态;高风险操作先向用户确认。"); $("#copyPrompt").onclick=()=>navigator.clipboard.writeText("你是我的私有 VPS 运维助手。执行操作前确认目标设备;优先使用 list_devices 确认节点状态;高风险操作先向用户确认。");
$("#rotateKey").onclick=async()=>{if(!confirm("轮换后旧 API Key 会立即失效,确认继续?"))return;try{let x=await api("/key/rotate",{method:"POST"});$("#newKey").textContent="新 API Key(仅本次显示):\n"+x.api_key}catch(e){$("#newKey").textContent=e.message}}; $("#rotateKey").onclick=async()=>{
$("#logout").onclick=async()=>{await fetch("/panel/logout",{method:"POST"});location.href="/panel/login"}; if(!confirm("轮换后旧 API Key 会立即失效,确认继续?"))return;
try{
let x=await api("/key/rotate",{method:"POST"});
$("#newKey").textContent="新 API Key(仅本次显示):\n"+x.api_key
}catch(e){
$("#newKey").textContent=e.message
}
};
$("#logout").onclick=async()=>{
await fetch("/panel/logout",{method:"POST"});
location.href="/panel/login"
};
loadDevices().then(loadAudits).catch(console.error); loadDevices().then(loadAudits).catch(console.error);
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

+1 -13
View File
@@ -1,13 +1 @@
<!doctype html> <!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><script>(function(){try{var t=localStorage.getItem("vpc_theme");if(t!=="light"&&t!=="dark")t=matchMedia("(prefers-color-scheme:light)").matches?"light":"dark";document.documentElement.dataset.theme=t}catch(e){document.documentElement.dataset.theme="dark"}})();</script><title>VPS-Commander</title><link rel="stylesheet" href="/static/app.css"></head><body><header><div class="brand-wrap"><img src="/static/icon.png" alt="logo" class="brand-logo"><div><strong>VPS-Commander</strong><span>Private Infrastructure Console</span></div></div><div class="header-actions"><button id="themeToggle" type="button" class="btn-icon" title="切换主题" aria-label="切换主题"><svg class="theme-svg svg-sun" viewBox="0 0 24 24" width="18" height="18" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="5"></circle><line x1="12" y1="1" x2="12" y2="3"></line><line x1="12" y1="21" x2="12" y2="23"></line><line x1="4.22" y1="4.22" x2="5.64" y2="5.64"></line><line x1="18.36" y1="18.36" x2="19.78" y2="19.78"></line><line x1="1" y1="12" x2="3" y2="12"></line><line x1="21" y1="12" x2="23" y2="12"></line><line x1="4.22" y1="19.78" x2="5.64" y2="18.36"></line><line x1="18.36" y1="5.64" x2="19.78" y2="4.22"></line></svg><svg class="theme-svg svg-moon" viewBox="0 0 24 24" width="18" height="18" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"></path></svg></button><button id="logout" type="button">退出</button></div></header><main><section class="grid"><article class="card wide"><div class="cardhead"><h2>设备看板</h2><button id="refresh" type="button">刷新</button></div><div id="devices" class="devices"></div></article><article class="card"><h2>Actions 向导</h2><p>当前 Hub 的 OpenAPI Schema:</p><div class="actions"><button id="copySchema" type="button">复制 Schema 地址</button><button id="copyPrompt" type="button">复制 System Prompt</button><button id="rotateKey" type="button">轮换 API Key</button></div><pre id="schemaHint">/openapi.json</pre><pre id="newKey"></pre></article><article class="card wide"><div class="cardhead"><h2>快速控制台</h2><select id="device"></select></div><textarea id="command" placeholder="输入 Shell 命令,例如 uname -a"></textarea><div><button id="run" type="button">执行</button></div><pre id="output"></pre></article><article class="card wide"><div class="cardhead"><h2>审计日志</h2><button id="auditRefresh" type="button">刷新</button></div><div class="tablewrap"><table><thead><tr><th>时间</th><th>设备</th><th>动作</th><th>命令/路径</th><th>退出码</th><th>耗时</th><th>来源</th></tr></thead><tbody id="audits"></tbody></table></div></article></section></main><script src="/static/app.js"></script></body></html>
<html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
<title>VPS-Commander</title><link rel="stylesheet" href="/static/app.css"></head>
<body>
<header><div><strong>VPS-Commander</strong><span>Private Infrastructure Console</span></div><button id="logout">退出</button></header>
<main>
<section class="grid">
<article class="card wide"><div class="cardhead"><h2>设备看板</h2><button id="refresh">刷新</button></div><div id="devices" class="devices"></div></article>
<article class="card"><h2>Actions 向导</h2><p>当前 Hub 的 OpenAPI Schema:</p><button id="copySchema">复制 Schema 地址</button><button id="copyPrompt">复制 System Prompt</button><button id="rotateKey">轮换 API Key</button><pre id="schemaHint">/openapi.json</pre><pre id="newKey"></pre></article>
<article class="card wide"><div class="cardhead"><h2>快速控制台</h2><select id="device"></select></div><textarea id="command" placeholder="输入 Shell 命令,例如 uname -a"></textarea><div><button id="run">执行</button></div><pre id="output"></pre></article>
<article class="card wide"><div class="cardhead"><h2>审计日志</h2><button id="auditRefresh">刷新</button></div><div class="tablewrap"><table><thead><tr><th>时间</th><th>设备</th><th>动作</th><th>命令/路径</th><th>退出码</th><th>耗时</th><th>来源</th></tr></thead><tbody id="audits"></tbody></table></div></article>
</section>
</main><script src="/static/app.js"></script></body></html>
+1 -1
View File
@@ -1 +1 @@
<!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>VPS-Commander Login</title><link rel="stylesheet" href="/static/app.css"></head><body class="login"><form id="login"><h1>VPS-Commander</h1><p>Private Infrastructure Console</p><input id="password" type="password" placeholder="面板密码" autocomplete="current-password"><button>登录</button><div id="error"></div></form><script>document.querySelector("#login").onsubmit=async e=>{e.preventDefault();let r=await fetch("/panel/login",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({password:document.querySelector("#password").value})});if(r.ok)location.href="/";else document.querySelector("#error").textContent="密码错误或未配置面板密码";}</script></body></html> <!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><script>(function(){try{var t=localStorage.getItem("vpc_theme");if(t!=="light"&&t!=="dark")t=matchMedia("(prefers-color-scheme:light)").matches?"light":"dark";document.documentElement.dataset.theme=t}catch(e){document.documentElement.dataset.theme="dark"}})();</script><title>VPS-Commander Login</title><link rel="stylesheet" href="/static/app.css"></head><body class="login"><form id="login"><h1>VPS-Commander</h1><p>Private Infrastructure Console</p><input id="password" type="password" placeholder="面板密码" autocomplete="current-password"><button type="submit">登录</button><div id="error"></div></form><script>document.querySelector("#login").onsubmit=async e=>{e.preventDefault();let r=await fetch("/panel/login",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({password:document.querySelector("#password").value})});if(r.ok)location.href="/";else document.querySelector("#error").textContent="密码错误或未配置面板密码"};</script></body></html>