Compare commits

...

2 Commits

Author SHA1 Message Date
cf63683c9c fix: fixing panic on pong write message 2025-09-30 10:43:39 +07:00
92bd56aac0 fix: fixing data race 2025-09-30 10:33:30 +07:00

View File

@@ -220,19 +220,6 @@ func (wsClient *SafeWebsocketClient) connect() error {
return fmt.Errorf("failed to connect to %s: %w", wsClient.baseHost, err)
}
conn.SetPingHandler(func(pingData string) error {
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
}
return err
}
return nil
})
pingCtx, pingCancel := context.WithCancel(context.Background())
wsClient.mu.WriteHandler(func() error {
wsClient.cancelFuncs = append(wsClient.cancelFuncs, pingCancel)
@@ -260,18 +247,24 @@ func (wsClient *SafeWebsocketClient) connect() error {
return nil
})
var c *websocket.Conn
wsClient.mu.ReadHandler(func() error {
c = conn
return nil
})
for {
select {
case <-ctx.Done():
log.Println("Writer stopped due to client shutdown")
return
case data := <-wsClient.writeChan:
if conn == nil {
if c == nil {
wsClient.triggerReconnect()
return
}
if err := conn.WriteMessage(int(data.MessageType), data.Data); err != nil {
if err := c.WriteMessage(int(data.MessageType), data.Data); err != nil {
log.Printf("error on write message: %v\n", err)
wsClient.triggerReconnect()
return
@@ -287,22 +280,28 @@ func (wsClient *SafeWebsocketClient) connect() error {
return nil
})
var c *websocket.Conn
wsClient.mu.ReadHandler(func() error {
c = conn
return nil
})
if c == nil {
wsClient.triggerReconnect()
return
}
for {
select {
case <-ctx.Done():
log.Println("Reader stopped due to client shutdown")
return
default:
if conn == nil {
wsClient.triggerReconnect()
return
}
if err := conn.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
if err := c.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
log.Printf("error on read deadline: %v\n", err)
return
}
messageType, data, err := conn.ReadMessage()
messageType, data, err := c.ReadMessage()
if err != nil {
log.Printf("error on read message: %v\n", err)
wsClient.triggerReconnect()
@@ -324,6 +323,23 @@ 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
// }
// return err
// }
return nil
})
return nil
}