feat(ws): A3 WebSocket 统一连接管理 — 心跳/注册表/监控/优雅关闭
- 新增 pkg/wshub/manager.go 统一 WebSocket 连接管理器 (WSManager) - 6 个 WebSocket handler 全部迁移: WebShell/kubectl/PodExec/Audit/Metrics/Pipeline - 心跳机制: ping(30s) + pong handler + read deadline(60s) 自动检测死连接 - 连接注册表: 元数据(类型/用户/远程地址/连接时间/最后活跃) - 每用户连接限制 MaxConnsPerUser=15 防资源耗尽 - 监控端点: GET /api/v1/ws/stats + GET /api/v1/ws/connections - 优雅关闭: CloseAll() 发送 CloseGoingAway 帧并关闭所有连接 - 消除 3 个重复 websocket.Upgrader 变量统一为 WSManager 内部 upgrader - 6/6 A3 测试通过, 17/17 回归测试通过
This commit is contained in:
1 parent
00a98e210d
commit
e4f1018ca1
13 files changed
+508
-58
No files matched your search
@@ -5,6 +5,9 @@ import (
|
||||
"log"
|
||||
"sync"
|
||||
|
||||
"ezops/middleware"
|
||||
"ezops/pkg/wshub"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gorilla/websocket"
|
||||
)
|
||||
@@ -85,17 +88,21 @@ func (h *MetricsHub) Broadcast(update MetricsUpdate) {
|
||||
|
||||
// MetricsWSHandler 处理 /ws/metrics 的 WebSocket 连接 // Logan.Li
|
||||
type MetricsWSHandler struct {
|
||||
hub *MetricsHub
|
||||
hub *MetricsHub
|
||||
wsMgr *wshub.WSManager
|
||||
}
|
||||
|
||||
// NewMetricsWSHandler 创建 WebSocket metrics 处理器
|
||||
func NewMetricsWSHandler(hub *MetricsHub) *MetricsWSHandler {
|
||||
return &MetricsWSHandler{hub: hub}
|
||||
func NewMetricsWSHandler(hub *MetricsHub, wsMgr *wshub.WSManager) *MetricsWSHandler {
|
||||
return &MetricsWSHandler{hub: hub, wsMgr: wsMgr}
|
||||
}
|
||||
|
||||
// ServeWS 升级 HTTP → WebSocket,注册到 Hub,保持连接
|
||||
func (h *MetricsWSHandler) ServeWS(c *gin.Context) {
|
||||
conn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
|
||||
userID := middleware.GetUserID(c)
|
||||
username := middleware.GetUsername(c)
|
||||
|
||||
conn, info, err := h.wsMgr.Upgrade(c, wshub.TypeMetrics, userID, username)
|
||||
if err != nil {
|
||||
log.Printf("[MetricsWS] WebSocket 升级失败: %v", err)
|
||||
return
|
||||
@@ -104,8 +111,9 @@ func (h *MetricsWSHandler) ServeWS(c *gin.Context) {
|
||||
h.hub.Register(conn)
|
||||
defer func() {
|
||||
h.hub.Unregister(conn)
|
||||
conn.Close()
|
||||
h.wsMgr.Unregister(info)
|
||||
}()
|
||||
h.wsMgr.StartHeartbeat(conn, info)
|
||||
|
||||
// 保持连接,读取消息(客户端可能发 ping)
|
||||
for {
|
||||
|
||||
Reference in new issue
Block a user