|
|
1abf1bb447
|
fix: 集群操作日志同步修复 — 全量回填 + 重启节点 seq 水位抬升
两个根因:
1. 离线错过条目永久缺失: token delta 被下游 trim (keep=seq>wm)，
离线节点错过的 seq 再也收不到 → 'log delta gap: want N got N+1' 死循环。
修复: OnToken 改为附带自己的全量日志 (Snapshot)，接收方 ApplyDelta 按 seq 幂等去重，
缺口节点下一轮自动补齐。日志量小(几十条)，开销可忽略。
2. 重启节点重新从 seq=1 编号: NewClusterLog 从 Seq=0 起，重启后产生的新事件
与环上历史 seq 冲突 → ApplyDelta 视为 already-have 静默丢弃 + 全量附带出现歧义 id。
修复: OnToken 收到日志时把本地 Seq 抬到环高水位之上，新编号接在历史之后。
测试: TestFullLogBackfillAfterGap / TestApplyDeltaIdempotentOnFullResend
实测: 三台集群撤销 minecraft 转发 → 三台均记录 seq=10 forward.remove;
恢复后三台均记录 seq=11 forward.add
|
2026-08-25 11:55:34 +08:00 |
|
|
|
f90627f542
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# internal/httpapi/dist/assets/index-CL42Ur3_.css
# internal/httpapi/dist/assets/index-CbqC9m-j.js
# internal/httpapi/dist/assets/index-RFHYrCiX.css
# internal/httpapi/dist/assets/index-jvouiCgh.css
# internal/httpapi/dist/index.html
# internal/store/store.go
# web/src/api.ts
# web/src/views/ClusterView.vue
|
2026-08-24 23:30:19 +08:00 |
|
|
|
2eaa26ba95
|
feat: worker 日志 CSV 导出 + 集群日志导出菜单完善
- handleAuditWorkerLogsCsv: 全环 fan-out 收集每节点 frpc 日志,
逐行展开为 CSV (node/worker_key/remote/worker_state/log_line),
Excel 可直接过滤/pivot 审计
- gatherClusterWorkerLogs: 提取 JSON 与 CSV 共用的日志聚合逻辑
- 路由: GET /audit/worker-logs.csv (read 级)
- ClusterView: 导出 worker 日志改下拉菜单 (JSON/CSV 两格式)
- api.ts: downloadAuditCsv 支持 worker-logs 类型
- gofmt: handlers_audit.go 格式对齐
|
2026-08-24 23:09:00 +08:00 |
|
|
|
ef98d9dca1
|
feat: 审计 CSV 导出 — 用户/API Key/集群操作日志一键下载
新增端点 (read 级, 审计 viewer 角色即可导出):
- GET /audit/users.csv: 账号清单 + 最后登录时间
- GET /audit/apikeys.csv: 密钥清单 (前缀+scope+最后使用+过期)
- GET /audit/cluster-log.csv: 令牌环操作日志时间线
(seq/time_utc/node/kind/detail/data_json 六列, detail 为人读摘要,
data_json 保留无损原始载荷)
安全设计:
- RFC4180 转义 (引号/逗号/换行)
- 公式注入防御: =/+/@/tab/- 开头单元格加 ' 前缀
- ISO8601 UTC 时间戳, Excel 直接排序
- 明文密钥不可逆, 仅导出展示前缀
前端:
- UsersView: 账号表/API 密钥表各加「⤓ 导出 CSV」按钮
- ClusterView: 日志导出下拉新增 CSV 选项 (走服务端生成)
- api.ts: downloadAuditCsv() 统一下载管道
测试: csvEscape 全用例 / users+apikeys CSV 内容断言 / 未认证 401
|
2026-08-24 22:53:52 +08:00 |
|
|
|
88b862b515
|
fix: 首页本地服务只显示 localOnly 转发, 集群转发不再误报为本地服务
- handleStatus 的 localStatuses 遍历所有 locals 时跳过非 localOnly,
集群转发只出现在活跃转发卡区 (per-remote 时代的残留逻辑)
- gofmt 格式化 topoKey 定义
- 同步 dist (含 ⚙/⊕ emoji 变体选择器修复)
|
2026-08-24 16:13:59 +08:00 |
|
|
|
2292ee7f3a
|
fix: 完善同事未完成的修改 — LAN 地址检测/画布删除撤销/连线删除按钮/Del 键/注释修正
- cmd/webui4frpc/main.go: 新增 primaryLANIPv4() 检测内网 LAN 地址,
解决三台内网主机间集群发现失败 (reachableAddr 只回退到 hostname)
- internal/httpapi/handlers.go: applyCanvas 新增拓扑差异检测,
画布删除连线时自动 RevokeTask 避免集群残留
- web/src/api.ts: 新增 addLink / deleteLink API 封装
- web/src/components/PortEdge.vue: × 删除按钮移到端口标签右上角 (绝对定位)
- web/src/views/CanvasView.vue: 启用 Del/Backspace 键删除选中连线
(确认对话框 + 走 onDeleteEdge 逻辑), 修正注释
- embed dist 同步
|
2026-08-24 01:03:38 +08:00 |
|
|
|
f29ec81e4a
|
feat: session-cookie login/logout + three-tier roles (superadmin/admin/viewer) with read-only UI + remove pink theme
- cookie-based auth (/login /logout) replacing Basic Auth for UI, enabling logout
- roles: superadmin (account management only), admin (full except accounts), viewer/audit (read-only status+cluster, export logs)
- readonly accounts hide edit buttons (added remote node, group ops, canvas layout/save/import, cluster manage, install) instead of greying them
- auditors see status+cluster only; ordinary admins lose the accounts nav; last-admin guard covers superadmin
- remove pink theme entirely (switcher, [data-theme=pink], leftover localStorage), keep white/blue
|
2026-08-20 09:08:15 +08:00 |
|
|
|
eda9bb9597
|
feat: cluster reliability (leader failover, crash rejoin, key exchange) + auth/users + canvas/forwards enhancements + comprehensive README + API docs
- Cluster: forwardToNext offline detection (leader+non-leader), WatchLeader 1s heartbeat fallback, 409 for standalone nodes, Node.NodeKey key exchange via token ring, ClusterPeers persistence + auto-rejoin, Forward delegates to forwardToNext (bugfix)
- Auth: Basic Auth (flag-creds fast path) + bcrypt users (admin/viewer) + Bearer API keys (read/write/admin scope)
- Frontend: UsersView (accounts+API keys), ClusterView (ring/nodeKey/tasks/topology/log), StatusView (group management, per-proxy status), CanvasView (edge toggle/group), PortEdge (disabled/group labels)
- API: handlers split (canvas/forwards/users/logs), canvas export/import, forwards group start/stop/assign/delete, cluster endpoints
- Docs: comprehensive README rewrite (all flags/APIs/auth/cluster), docs/cluster-api.md (cluster management API reference)
- Deploy: run-cluster.sh now 4-node ring + 1 isolated standalone, test-forward.sh updated for 4 nodes
- Removed plan.md (design notes consolidated into README + API docs)
|
2026-08-19 21:09:24 +08:00 |
|
|
|
b518a13446
|
feat: Phase C 完成 — ModelRouter 风格 UI 重设计 + 模拟 frps 测试 + lastSync 修复 + 集群作坊搭建
- 主题: sakura×frost 玻璃拟态 (theme.css) + SCSS 变量重映射
- 侧栏: 玻璃侧栏 246px + 渐变品牌区 + 面包屑导航
- 状态页: 玻璃 KPI 卡 + 远程节点/本地服务卡片网格
- 集群页: 英雄玻璃卡 + 横向环拓扑链 + 待办命令/活跃拓扑/日志区
- 令牌环: 新增 lastSync 上次同步时间替代周期计数
- 模拟 frps: frps2/frps3 容器 + test-forward.sh 全链路验证脚本
- 修复: BinaryPath 空导致 worker 不启动, 撤销仅撤第一个 link, 任务复活风暴 (published 追踪)
|
2026-08-18 23:38:20 +08:00 |
|
|
|
86b265637d
|
feat(web): cluster page optimized — self/leader/phase badges, ring arrow, create vs revoke command styling, topology owner highlight, colored log kinds, self highlights
|
2026-08-18 09:54:29 +08:00 |
|
|
|
40980944e5
|
feat(M6): localOnly forward option (loopback→LAN rewrite for cluster, local direct), canvas diff-based create/revoke commands, revoke task semantics, topology derived canvas on sync nodes, LAN addr helper
|
2026-08-18 09:44:38 +08:00 |
|
|
|
bf602016b4
|
feat(web): cluster page shows token ring — ring topology/leader/load, pending tasks, active forward topology with owner, incremental log sync view (e2e verified)
|
2026-08-18 09:13:20 +08:00 |
|
|
|
f6c4b91a96
|
feat(M6): token ring data plane + engine — pending adds disappear on claim, topology written back for full cluster view (per authoritative design)
|
2026-08-18 08:24:37 +08:00 |
|
|
|
5bd70b90c0
|
feat: M3 cluster page (LB groups + health check status) e2e-verified failover; M6 cache API + version path hardening + frontend cluster methods
|
2026-08-17 22:44:04 +08:00 |
|
|
|
467c7124ab
|
feat: M3 load balancing + health check (model/render/admin API status/UI)
|
2026-08-17 17:45:03 +08:00 |
|
|
|
bd3a62a017
|
fix: worker 进程并发 double-close panic + 状态页连接语义重构 + 集群页骨架
- process: spawn 不再重复起 supervise goroutine（Restart 触发旧 supervise close doneCh 后再 close → panic）；新增 closeOnce/supervising 守卫；Start 首次起 supervise，重启循环在同一 goroutine 内
- httpapi: status 增加 connState（connected/connecting/failed/not_started/disabled），由 worker 日志探测真实 frps 连接（不再把本地 worker 状态误当远程 frps 状态）
- StatusView: 远程卡片主状态改为连接状态徽标；启停按钮标注为控制本地 frpc worker；本地转发区保留 worker 状态显示
- 新增 ClusterView 集群页骨架（M3 LB+健康检查载体）+ App.vue 导航接入
- render: bandwidthLimit 从 proxy 顶层移入 transport 段（frpc 0.61 正确 schema，修复真实连不上的 bug）
|
2026-08-17 15:13:25 +08:00 |
|
|
|
58906c5a81
|
feat: M2 HTTP/HTTPS 完善
- store: Local 增加 customDomains/subdomain/locations/hostHeaderRewrite/httpHeaders/basicAuth；Remote 增加 vhostHttpPort；migrate() 补列；CRUD 读写（JSOm 编解码）
- render: http/https proxy 输出 customDomains/subdomain/locations/hostHeaderRewrite/httpHeaders/basicAuth
- main: renderRemote 透传 M2 字段（customDomains 逗号拆分 splitCSV）
- web: LocalNode 折叠 HTTP 路由高级区；RemoteNode vhostHTTPPort；StatusView 显示 HTTP 访问端口
- 测试: TestRenderHTTPAdvanced / TestRenderHTTPSUsesCustomDomains；端到端 PUT canvas→config 验证通过
|
2026-08-17 12:59:12 +08:00 |
|
|
|
07f25ea067
|
feat: M1 高级传输参数（P0）
- store: Local 增加 useEncryption/useCompression/bandwidthLimit/poolCount/metadatas/annotations；Remote 增加 transportProtocol/transportTls/transportPool/transportTlsServerName；新增 migrate() ALTER TABLE 迁移旧库
- render: 输出 transport 段（protocol/tls/poolCount）与 proxy 高级字段；补 TestRenderTransportAdvanced/OmittedWhenEmpty
- main: renderRemote 闭包透传 M1 字段到 render.Proxy
- web: LocalNode/RemoteNode 折叠高级区表单，types.ts 接口扩展
- 验证：go test 全绿、vue-tsc/build 通过、端到端 PUT canvas→frpc JSON 输出完整
|
2026-08-17 12:28:54 +08:00 |
|
|
|
e73bd834a1
|
style(web): 保持 vite.config.ts 单引号风格
|
2026-08-17 12:11:30 +08:00 |
|
|
|
7128a8c041
|
chore(web): tsconfig 显式声明 node 类型供 vite.config.ts 使用
types: [node, vite/client] 替代 @vue/tsconfig 默认的空 types（避免 process 未定义）；@types/node 已加入 devDependency
|
2026-08-17 12:10:00 +08:00 |
|
|
|
45346405c2
|
fix: vite dev proxy 端口对齐 7500（支持 VITE_PROXY_TARGET 覆盖）
原指向 127.0.0.1:17650 与后端默认 -addr 127.0.0.1:7500 不符；同步 @types/node devDependency 并纳入 tsconfig
|
2026-08-17 12:07:14 +08:00 |
|
|
|
c1936887a2
|
webui4frpc: 独立可用的可视化 frpc 控制器 (M0)
- 零 frp 源码依赖，单二进制 (Go + Vue3 + VueFlow + Element Plus)
- 画布多对多连线，渲染 tcp/udp/http/https frpc 配置
- worker 进程管理：自愈、日志轮转、崩溃退避重启
- frpc 一键安装 (GitHub Releases) + 手动指定路径
- 三页 UI：状态(默认)/连接配置/设置
- 状态页实时节点/转发状态，节点可增删改启停
- 画布冲突检查：端口/域名冲突标红 + 弹窗拦截保存
- backend 单测覆盖 store/render/process/httpapi/install
- plan.md + FRPC_FEATURES_AUDIT.md 文档
|
2026-08-17 11:00:26 +08:00 |
|
