Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e011931436 | |||
| 70d9a37a4e |
@@ -16,7 +16,7 @@ import (
|
||||
|
||||
const (
|
||||
pingPeriod = 10 * time.Second
|
||||
readDeadline = 120 * time.Second
|
||||
readDeadline = 30 * time.Second
|
||||
)
|
||||
|
||||
type SafeMap[K comparable, V any] struct {
|
||||
@@ -68,10 +68,10 @@ func (sm *SafeMap[K, V]) Len() int {
|
||||
type MessageType uint
|
||||
|
||||
const (
|
||||
MessageTypeText MessageType = iota + 1
|
||||
MessageTypePing MessageType = iota
|
||||
MessageTypePong MessageType = iota
|
||||
MessageTypeClose MessageType = iota
|
||||
MessageTypeText MessageType = websocket.TextMessage
|
||||
MessageTypePing MessageType = websocket.PingMessage
|
||||
MessageTypePong MessageType = websocket.PongMessage
|
||||
MessageTypeClose MessageType = websocket.CloseMessage
|
||||
)
|
||||
|
||||
type Message struct {
|
||||
@@ -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