|
|
|
|
@@ -157,8 +157,8 @@ type SafeWebsocketClient struct {
|
|
|
|
|
cancelFuncs []context.CancelFunc
|
|
|
|
|
ctx context.Context
|
|
|
|
|
reconnectCh chan struct{}
|
|
|
|
|
reconnectChans []chan struct{}
|
|
|
|
|
isConnected bool
|
|
|
|
|
|
|
|
|
|
doneMap *SafeMap[string, chan struct{}]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -301,7 +301,6 @@ func (wsClient *SafeWebsocketClient) reconnectHandler() {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
wsClient.isConnected = false
|
|
|
|
|
|
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
|
|
|
|
|
|
isInnerLoop := true
|
|
|
|
|
@@ -324,7 +323,11 @@ func (wsClient *SafeWebsocketClient) reconnectHandler() {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if wsClient.reconnectChans != nil {
|
|
|
|
|
for _, reconnectCh := range wsClient.reconnectChans {
|
|
|
|
|
reconnectCh <- struct{}{}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
case <-wsClient.ctx.Done():
|
|
|
|
|
log.Println("reconnect handler stopped due to client shutdown")
|
|
|
|
|
wsClient.Close()
|
|
|
|
|
@@ -333,10 +336,26 @@ func (wsClient *SafeWebsocketClient) reconnectHandler() {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (wsClient *SafeWebsocketClient) ReconnectChannel() <-chan struct{} {
|
|
|
|
|
reconnectCh := make(chan struct{})
|
|
|
|
|
wsClient.mu.WriteHandler(func() error {
|
|
|
|
|
wsClient.reconnectChans = append(wsClient.reconnectChans, reconnectCh)
|
|
|
|
|
return nil
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
return reconnectCh
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (wsClient *SafeWebsocketClient) DataChannel() <-chan []byte {
|
|
|
|
|
return wsClient.dataChannel
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (wsClient *SafeWebsocketClient) WriteJSON(message any) error {
|
|
|
|
|
return wsClient.mu.WriteHandler(func() error {
|
|
|
|
|
return wsClient.conn.WriteJSON(message)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (wsClient *SafeWebsocketClient) Close() error {
|
|
|
|
|
wsClient.mu.WriteHandler(func() error {
|
|
|
|
|
if wsClient.cancelFuncs != nil {
|
|
|
|
|
@@ -344,6 +363,12 @@ func (wsClient *SafeWebsocketClient) Close() error {
|
|
|
|
|
cancel()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if wsClient.reconnectChans != nil {
|
|
|
|
|
for _, reconnectChan := range wsClient.reconnectChans {
|
|
|
|
|
close(reconnectChan)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if wsClient.conn != nil {
|
|
|
|
|
wsClient.conn.Close()
|
|
|
|
|
}
|
|
|
|
|
|