feat: adding reconnect channel for authentication purposes
This commit is contained in:
@@ -146,20 +146,20 @@ func (b *SafeWebsocketClientBuilder) Build(ctx context.Context) (*SafeWebsocketC
|
|||||||
}
|
}
|
||||||
|
|
||||||
type SafeWebsocketClient struct {
|
type SafeWebsocketClient struct {
|
||||||
baseHost string
|
baseHost string
|
||||||
basePort uint16
|
basePort uint16
|
||||||
useTLS bool
|
useTLS bool
|
||||||
path *string
|
path *string
|
||||||
rawQuery *string
|
rawQuery *string
|
||||||
dataChannel chan []byte
|
dataChannel chan []byte
|
||||||
mu *custom_rwmutex.CustomRwMutex
|
mu *custom_rwmutex.CustomRwMutex
|
||||||
conn *websocket.Conn
|
conn *websocket.Conn
|
||||||
cancelFuncs []context.CancelFunc
|
cancelFuncs []context.CancelFunc
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
reconnectCh chan struct{}
|
reconnectCh chan struct{}
|
||||||
isConnected bool
|
reconnectChans []chan struct{}
|
||||||
|
isConnected bool
|
||||||
doneMap *SafeMap[string, chan struct{}]
|
doneMap *SafeMap[string, chan struct{}]
|
||||||
}
|
}
|
||||||
|
|
||||||
func (wsClient *SafeWebsocketClient) connect() error {
|
func (wsClient *SafeWebsocketClient) connect() error {
|
||||||
@@ -301,7 +301,6 @@ func (wsClient *SafeWebsocketClient) reconnectHandler() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
wsClient.isConnected = false
|
wsClient.isConnected = false
|
||||||
|
|
||||||
time.Sleep(100 * time.Millisecond)
|
time.Sleep(100 * time.Millisecond)
|
||||||
|
|
||||||
isInnerLoop := true
|
isInnerLoop := true
|
||||||
@@ -324,7 +323,11 @@ func (wsClient *SafeWebsocketClient) reconnectHandler() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if wsClient.reconnectChans != nil {
|
||||||
|
for _, reconnectCh := range wsClient.reconnectChans {
|
||||||
|
reconnectCh <- struct{}{}
|
||||||
|
}
|
||||||
|
}
|
||||||
case <-wsClient.ctx.Done():
|
case <-wsClient.ctx.Done():
|
||||||
log.Println("reconnect handler stopped due to client shutdown")
|
log.Println("reconnect handler stopped due to client shutdown")
|
||||||
wsClient.Close()
|
wsClient.Close()
|
||||||
@@ -333,6 +336,16 @@ 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 {
|
func (wsClient *SafeWebsocketClient) DataChannel() <-chan []byte {
|
||||||
return wsClient.dataChannel
|
return wsClient.dataChannel
|
||||||
}
|
}
|
||||||
@@ -350,6 +363,12 @@ func (wsClient *SafeWebsocketClient) Close() error {
|
|||||||
cancel()
|
cancel()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if wsClient.reconnectChans != nil {
|
||||||
|
for _, reconnectChan := range wsClient.reconnectChans {
|
||||||
|
close(reconnectChan)
|
||||||
|
}
|
||||||
|
}
|
||||||
if wsClient.conn != nil {
|
if wsClient.conn != nil {
|
||||||
wsClient.conn.Close()
|
wsClient.conn.Close()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,6 +34,12 @@ func main() {
|
|||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
for range wsClient.ReconnectChannel() {
|
||||||
|
fmt.Println("Reconnection Success")
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
dataChannel := wsClient.DataChannel()
|
dataChannel := wsClient.DataChannel()
|
||||||
|
|
||||||
for data := range dataChannel {
|
for data := range dataChannel {
|
||||||
|
|||||||
Reference in New Issue
Block a user