websocket 三 client 结构体去重:嵌入共享 wsClientCore(close/enqueue 单份实现)

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":75,"tsc_errors":0,"vitest_failed":0,"vitest_total":126}
This commit is contained in:
ryan
2026-08-26 09:49:35 +08:00
parent 0dd2cf9e80
commit efd8268a5d
5 changed files with 69 additions and 67 deletions
+9 -29
View File
@@ -12,7 +12,7 @@ import (
"time"
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"
)
const (
@@ -30,24 +30,12 @@ const (
type AgentStatusHandler func(ctx context.Context, nodeID, remoteAddr string, payload json.RawMessage)
type agentClient struct {
nodeID string
wsClientCore
remoteAddr string
conn *websocket.Conn
send chan Message
done chan struct{}
onStatus AgentStatusHandler
once sync.Once
}
func (c *agentClient) close() {
if c == nil {
return
}
c.once.Do(func() {
close(c.done)
_ = c.conn.Close()
})
}
type agentHub struct {
mu sync.RWMutex
@@ -65,11 +53,13 @@ func ServeAgent(c *gin.Context, nodeID string, onStatus AgentStatusHandler) {
}
client := &agentClient{
nodeID: nodeID,
wsClientCore: wsClientCore{
nodeID: nodeID,
conn: conn,
send: make(chan Message, wsChannelBuf),
done: make(chan struct{}),
},
remoteAddr: c.Request.RemoteAddr,
conn: conn,
send: make(chan Message, wsChannelBuf),
done: make(chan struct{}),
onStatus: onStatus,
}
defaultAgentHub.register(client)
@@ -222,13 +212,3 @@ func agentWSReadTimeout() time.Duration {
func (c *agentClient) writePump() {
runWritePump(c.nodeID, c.conn, c.done, c.send, c.close, "agent ws")
}
func (c *agentClient) enqueue(message Message) bool {
select {
case <-c.done:
return false
case c.send <- message:
return true
default:
return false
}
}