fix: pong data race
This commit is contained in:
@@ -193,6 +193,7 @@ type SafeWebsocketClient struct {
|
||||
authenticateFn func(*SafeWebsocketClient) error
|
||||
|
||||
writeChan chan Message
|
||||
pongChan chan error
|
||||
}
|
||||
|
||||
func (wsClient *SafeWebsocketClient) connect() error {
|
||||
@@ -267,6 +268,9 @@ func (wsClient *SafeWebsocketClient) connect() error {
|
||||
if err := c.WriteMessage(int(data.MessageType), data.Data); err != nil {
|
||||
log.Printf("error on write message: %v\n", err)
|
||||
wsClient.triggerReconnect()
|
||||
if data.MessageType == MessageTypePong {
|
||||
wsClient.pongChan <- err
|
||||
}
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -324,18 +328,15 @@ func (wsClient *SafeWebsocketClient) connect() error {
|
||||
}()
|
||||
|
||||
conn.SetPingHandler(func(pingData string) error {
|
||||
// wsClient.writeChan <- Message{
|
||||
// MessageType: MessageTypePong,
|
||||
// Data: []byte(pingData),
|
||||
// }
|
||||
if err := conn.WriteMessage(websocket.PongMessage, []byte(pingData)); err != nil {
|
||||
if err == websocket.ErrCloseSent {
|
||||
return nil
|
||||
}
|
||||
if netErr, ok := err.(interface{ Timeout() bool }); ok && netErr.Timeout() {
|
||||
return nil
|
||||
}
|
||||
wsClient.writeChan <- Message{
|
||||
MessageType: MessageTypePong,
|
||||
Data: []byte(pingData),
|
||||
}
|
||||
|
||||
select {
|
||||
case err := <-wsClient.pongChan:
|
||||
return err
|
||||
default:
|
||||
}
|
||||
return nil
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user