Compare commits

...

2 Commits

Author SHA1 Message Date
735f55858e fix: adding nil checker 2025-09-29 17:58:19 +07:00
5e5df9090f fix: adding back read mutex for data race 2025-09-29 17:55:24 +07:00

View File

@@ -71,6 +71,7 @@ type SafeWebsocketClientBuilder struct {
rawQuery *string
useTLS *bool
channelSize *int64
authenticateFn func() error
}
func NewSafeWebsocketClientBuilder() *SafeWebsocketClientBuilder {
@@ -92,6 +93,11 @@ func (b *SafeWebsocketClientBuilder) UseTLS(useTLS bool) *SafeWebsocketClientBui
return b
}
func (b *SafeWebsocketClientBuilder) AuthenticateFn(authenticateFn func() error) *SafeWebsocketClientBuilder {
b.authenticateFn = authenticateFn
return b
}
func (b *SafeWebsocketClientBuilder) Path(path string) *SafeWebsocketClientBuilder {
b.path = &path
return b
@@ -136,6 +142,10 @@ func (b *SafeWebsocketClientBuilder) Build(ctx context.Context) (*SafeWebsocketC
doneMap: NewSafeMap[string, chan struct{}](),
}
if b.authenticateFn != nil {
wsClient.authenticateFn = b.authenticateFn
}
go wsClient.reconnectHandler()
if err := wsClient.connect(); err != nil {
@@ -160,6 +170,7 @@ type SafeWebsocketClient struct {
reconnectChans []chan struct{}
isConnected bool
doneMap *SafeMap[string, chan struct{}]
authenticateFn func() error
}
func (wsClient *SafeWebsocketClient) connect() error {
@@ -200,15 +211,20 @@ func (wsClient *SafeWebsocketClient) connect() error {
return nil
})
wsClient.mu.WriteHandler(func() error {
if wsClient.conn != nil {
wsClient.conn.Close()
}
wsClient.conn = conn
wsClient.isConnected = true
if wsClient.authenticateFn != nil {
if err := wsClient.authenticateFn(); err != nil {
return err
}
}
wsClient.mu.WriteHandler(func() error {
pingCtx, pingCancel := context.WithCancel(context.Background())
go wsClient.startPingTicker(pingCtx)
wsClient.cancelFuncs = append(wsClient.cancelFuncs, pingCancel)
@@ -253,31 +269,32 @@ func (wsClient *SafeWebsocketClient) startReceiveHandler(ctx context.Context) {
log.Println("receive handler stopped")
return
default:
if err := wsClient.mu.ReadHandler(func() error {
conn := wsClient.conn
if conn == nil {
wsClient.triggerReconnect()
return
// return fmt.Errorf("connection closed")
return fmt.Errorf("connection closed")
}
_, message, err := conn.ReadMessage()
if err != nil {
wsClient.triggerReconnect()
// return fmt.Errorf("failed to read message: %v", err)
return
return fmt.Errorf("failed to read message: %v", err)
}
select {
case wsClient.dataChannel <- message:
case <-ctx.Done():
log.Println("Reconnect handler stopped")
return
default:
log.Println("Data channel full, dropping message")
}
return nil
}); err != nil {
return
}
}
}
}
func (wsClient *SafeWebsocketClient) triggerReconnect() {
select {