tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-10 17:26:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

websocket 三 hub 去重：抽 runWritePump 共享写泵 + 合并 agent 广播函数为 broadcastAgent

Browse Source 
Result: {"status":"keep","total_issues":8,"eslint_errors":0,"eslint_problems":0,"eslint_warnings":0,"golint_canonicalheader":0,"golint_errname":0,"golint_errorlint":1,"golint_exhaustive":0,"golint_forcetypeassert":0,"golint_gosec":0,"golint_intrange":0,"golint_modernize":3,"golint_nilnil":3,"golint_perfsprint":0,"golint_prealloc":0,"golint_recvcheck":1,"golint_test_testifylint":0,"golint_test_thelper":0,"golint_test_total":0,"golint_test_usetesting":0,"golint_total":8,"golint_usestdlibvars":0,"golint_vetx_total":0,"golint_wastedassign":0,"measure_s":77,"tsc_errors":0,"vitest_failed":0,"vitest_total":126}
This commit is contained in:
ryan
2026-08-26 09:39:30 +08:00
parent be5d067af9
commit 0dd2cf9e80
5 changed files with 57 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/apps/openflare/websocket/agent_hub.go
+7 -43
View File
@@ -132,32 +132,19 @@ func SendAgentWAFIPGroups(nodeID string, payload any) bool {
// BroadcastWAFIPGroups pushes changed WAF IP groups to all connected agents.
func BroadcastWAFIPGroups(payload any) int {
if payload == nil {
return 0
}
message := Message{Type: agentMessageTypeWAFIPGroups, Payload: payload}
defaultAgentHub.mu.RLock()
clients := make([]*agentClient, 0, len(defaultAgentHub.clients))
for _, client := range defaultAgentHub.clients {
clients = append(clients, client)
}
defaultAgentHub.mu.RUnlock()
success := 0
for _, client := range clients {
if client.enqueue(message) {
success++
}
}
return success
return broadcastAgent(agentMessageTypeWAFIPGroups, payload)
}
// BroadcastActiveConfig pushes active config metadata to all connected agents.
func BroadcastActiveConfig(payload any) int {
return broadcastAgent(agentMessageTypeActiveConfig, payload)
}
func broadcastAgent(messageType string, payload any) int {
if payload == nil {
return 0
}
message := Message{Type: agentMessageTypeActiveConfig, Payload: payload}
message := Message{Type: messageType, Payload: payload}
defaultAgentHub.mu.RLock()
clients := make([]*agentClient, 0, len(defaultAgentHub.clients))
for _, client := range defaultAgentHub.clients {
@@ -233,31 +220,8 @@ func agentWSReadTimeout() time.Duration {
}
func (c *agentClient) writePump() {
ticker := time.NewTicker(wsPingInterval)
defer ticker.Stop()
for {
select {
case <-c.done:
return
case message := <-c.send:
_ = c.conn.SetWriteDeadline(time.Now().Add(wsWriteDeadline))
if err := c.conn.WriteJSON(message); err != nil {
slog.Debug("agent ws write failed", "node_id", c.nodeID, "error", err)
c.close()
return
}
case <-ticker.C:
select {
case <-c.done:
return
case c.send <- Message{Type: messageTypePing}:
default:
}
}
}
runWritePump(c.nodeID, c.conn, c.done, c.send, c.close, "agent ws")
}
func (c *agentClient) enqueue(message Message) bool {
select {
case <-c.done: