Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e011931436 | |||
| 70d9a37a4e | |||
| 2ab2e07b9b |
@@ -16,7 +16,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
pingPeriod = 10 * time.Second
|
pingPeriod = 10 * time.Second
|
||||||
readDeadline = 120 * time.Second
|
readDeadline = 30 * time.Second
|
||||||
)
|
)
|
||||||
|
|
||||||
type SafeMap[K comparable, V any] struct {
|
type SafeMap[K comparable, V any] struct {
|
||||||
@@ -68,10 +68,10 @@ func (sm *SafeMap[K, V]) Len() int {
|
|||||||
type MessageType uint
|
type MessageType uint
|
||||||
|
|
||||||
const (
|
const (
|
||||||
MessageTypeText MessageType = iota + 1
|
MessageTypeText MessageType = websocket.TextMessage
|
||||||
MessageTypePing MessageType = iota
|
MessageTypePing MessageType = websocket.PingMessage
|
||||||
MessageTypePong MessageType = iota
|
MessageTypePong MessageType = websocket.PongMessage
|
||||||
MessageTypeClose MessageType = iota
|
MessageTypeClose MessageType = websocket.CloseMessage
|
||||||
)
|
)
|
||||||
|
|
||||||
type Message struct {
|
type Message struct {
|
||||||
@@ -193,6 +193,7 @@ type SafeWebsocketClient struct {
|
|||||||
authenticateFn func(*SafeWebsocketClient) error
|
authenticateFn func(*SafeWebsocketClient) error
|
||||||
|
|
||||||
writeChan chan Message
|
writeChan chan Message
|
||||||
|
pongChan chan error
|
||||||
}
|
}
|
||||||
|
|
||||||
func (wsClient *SafeWebsocketClient) connect() 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 {
|
if err := c.WriteMessage(int(data.MessageType), data.Data); err != nil {
|
||||||
log.Printf("error on write message: %v\n", err)
|
log.Printf("error on write message: %v\n", err)
|
||||||
wsClient.triggerReconnect()
|
wsClient.triggerReconnect()
|
||||||
|
if data.MessageType == MessageTypePong {
|
||||||
|
wsClient.pongChan <- err
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -328,15 +332,12 @@ func (wsClient *SafeWebsocketClient) connect() error {
|
|||||||
MessageType: MessageTypePong,
|
MessageType: MessageTypePong,
|
||||||
Data: []byte(pingData),
|
Data: []byte(pingData),
|
||||||
}
|
}
|
||||||
// if err := conn.WriteMessage(websocket.PongMessage, []byte(pingData)); err != nil {
|
|
||||||
// if err == websocket.ErrCloseSent {
|
select {
|
||||||
// return nil
|
case err := <-wsClient.pongChan:
|
||||||
// }
|
return err
|
||||||
// if netErr, ok := err.(interface{ Timeout() bool }); ok && netErr.Timeout() {
|
default:
|
||||||
// return nil
|
}
|
||||||
// }
|
|
||||||
// return err
|
|
||||||
// }
|
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user