paadi/tecamino-dbm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix concurrent write new sendPong channel

Browse Source
This commit is contained in:
Adrian Zürcher
2025-06-22 08:58:14 +02:00
parent 91ea59ed6e
commit 59c7705ca1
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
websocket/models/client.go
View File

@@ -27,13 +27,14 @@ const (
type Client struct { type Client struct {
Id string Id string
Connected bool `json:"connected"` Connected bool `json:"connected"`
Conn *websocket.Conn `json:"-"` conn *websocket.Conn `json:"-"`
OnOpen func() OnOpen func()
OnMessage func(data []byte) OnMessage func(data []byte)
OnClose func(code int, reason string) OnClose func(code int, reason string)
OnError func(err error) OnError func(err error)
OnPing func() OnPing func()
OnPong func() OnPong func()
sendPong chan string
send chan []byte send chan []byte
unregister chan []byte unregister chan []byte
} }
@@ -66,7 +67,8 @@ func ConnectNewClient(id string, c *gin.Context) (*Client, error) {
client := &Client{ client := &Client{
Id: id, Id: id,
Connected: true, Connected: true,
Conn: conn, conn: conn,
sendPong: make(chan string),
send: make(chan []byte), send: make(chan []byte),
unregister: make(chan []byte), unregister: make(chan []byte),
} }
@@ -77,7 +79,8 @@ func ConnectNewClient(id string, c *gin.Context) (*Client, error) {
} }
conn.SetWriteDeadline(time.Now().Add(writeWait)) conn.SetWriteDeadline(time.Now().Add(writeWait))
conn.SetReadDeadline(time.Now().Add(writeWait)) conn.SetReadDeadline(time.Now().Add(writeWait))
return conn.WriteMessage(websocket.PongMessage, []byte(appData)) client.sendPong <- appData
return nil
}) })
conn.SetPongHandler(func(string) error { conn.SetPongHandler(func(string) error {
@@ -99,9 +102,9 @@ func (c *Client) Read() {
c.OnOpen() c.OnOpen()
} }
c.Conn.SetReadDeadline(time.Now().Add(writeWait)) c.conn.SetReadDeadline(time.Now().Add(writeWait))
for c.Connected { for c.Connected {
msgType, msg, err := c.Conn.ReadMessage() msgType, msg, err := c.conn.ReadMessage()
if err != nil { if err != nil {
c.handleError(fmt.Errorf("read error (id:%s): %w", c.Id, err)) c.handleError(fmt.Errorf("read error (id:%s): %w", c.Id, err))
return return
@@ -128,30 +131,30 @@ func (c *Client) Write() {
ticker := time.NewTicker(pingPeriod) ticker := time.NewTicker(pingPeriod)
defer func() { defer func() {
ticker.Stop() ticker.Stop()
c.Conn.Close() c.conn.Close()
}() }()
for { for {
select { select {
case message, ok := <-c.send: case message, ok := <-c.send:
c.Conn.SetWriteDeadline(time.Now().Add(writeWait)) c.conn.SetWriteDeadline(time.Now().Add(writeWait))
if !ok { if !ok {
// The hub closed the channel. // The hub closed the channel.
if err := c.Conn.WriteMessage(websocket.CloseMessage, []byte{}); err != nil { if err := c.conn.WriteMessage(websocket.CloseMessage, []byte{}); err != nil {
c.handleError(err) c.handleError(err)
return return
} }
c.handleError(fmt.Errorf("server %s closed channel", c.Id)) c.handleError(fmt.Errorf("server %s closed channel", c.Id))
return return
} else { } else {
if err := c.Conn.WriteMessage(websocket.TextMessage, message); err != nil { if err := c.conn.WriteMessage(websocket.TextMessage, message); err != nil {
c.handleError(err) c.handleError(err)
return return
} }
} }
case <-ticker.C: case <-ticker.C:
c.Conn.SetWriteDeadline(time.Now().Add(writeWait)) c.conn.SetWriteDeadline(time.Now().Add(writeWait))
if err := c.Conn.WriteMessage(websocket.PingMessage, nil); err != nil { if err := c.conn.WriteMessage(websocket.PingMessage, nil); err != nil {
c.handleError(err) c.handleError(err)
return return
} }
@@ -159,9 +162,15 @@ func (c *Client) Write() {
if c.OnPing != nil { if c.OnPing != nil {
c.OnPing() c.OnPing()
} }
case message, ok := <-c.sendPong:
if ok {
c.conn.WriteMessage(websocket.PongMessage, []byte(message))
}
case message := <-c.unregister: case message := <-c.unregister:
c.Conn.WriteMessage(websocket.CloseMessage, message) c.conn.WriteMessage(websocket.CloseMessage, message)
c.Connected = false c.Connected = false
close(c.sendPong)
close(c.send) close(c.send)
close(c.unregister) close(c.unregister)
return return
@@ -175,7 +184,7 @@ func (c *Client) handleJsonPing(msg []byte) (isPing bool) {
err := json.Unmarshal(msg, &wsMsg) err := json.Unmarshal(msg, &wsMsg)
if err == nil && wsMsg.IsPing() { if err == nil && wsMsg.IsPing() {
c.Conn.SetReadDeadline(time.Now().Add(writeWait)) c.conn.SetReadDeadline(time.Now().Add(writeWait))
// Respond with pong JSON // Respond with pong JSON
select { select {
case c.send <- GetPongByteSlice(): case c.send <- GetPongByteSlice():