fix: fixing data race

internal/hub.go

@@ -1,7 +1,6 @@
 package internal
 
 import (
-	"fmt"
 	"log"
 	"time"
 
@@ -125,7 +124,7 @@ func ReadPump(c *Client, h *Hub) {
 		}
 
 		if messageType == websocket.TextMessage {
-			fmt.Printf("Received: %s\n", message)
+			log.Printf("Received: %s\n", message)
 		}
 	}
 }

v1/client/client.go

@@ -16,6 +16,7 @@ import (
 
 const (
 	pingPeriod   = 10 * time.Second
+	readDeadline = 30 * time.Second
 )
 
 type SafeMap[K comparable, V any] struct {
@@ -64,6 +65,20 @@ func (sm *SafeMap[K, V]) Len() int {
 	return count
 }
 
+type MessageType uint
+
+const (
+	MessageTypeText  MessageType = iota + 1
+	MessageTypePing  MessageType = iota
+	MessageTypePong  MessageType = iota
+	MessageTypeClose MessageType = iota
+)
+
+type Message struct {
+	MessageType MessageType
+	Data        []byte
+}
+
 type SafeWebsocketClientBuilder struct {
 	baseHost       *string `nil_checker:"required"`
 	basePort       *uint16 `nil_checker:"required"`
@@ -71,7 +86,7 @@ type SafeWebsocketClientBuilder struct {
 	rawQuery       *string
 	useTLS         *bool
 	channelSize    *int64
-	authenticateFn func() error
+	authenticateFn func(*SafeWebsocketClient) error
 }
 
 func NewSafeWebsocketClientBuilder() *SafeWebsocketClientBuilder {
@@ -93,7 +108,7 @@ func (b *SafeWebsocketClientBuilder) UseTLS(useTLS bool) *SafeWebsocketClientBui
 	return b
 }
 
-func (b *SafeWebsocketClientBuilder) AuthenticateFn(authenticateFn func() error) *SafeWebsocketClientBuilder {
+func (b *SafeWebsocketClientBuilder) AuthenticateFn(authenticateFn func(*SafeWebsocketClient) error) *SafeWebsocketClientBuilder {
 	b.authenticateFn = authenticateFn
 	return b
 }
@@ -140,6 +155,7 @@ func (b *SafeWebsocketClientBuilder) Build(ctx context.Context) (*SafeWebsocketC
 		reconnectCh: make(chan struct{}, 1),
 		isConnected: false,
 		doneMap:     NewSafeMap[string, chan struct{}](),
+		writeChan:   make(chan Message),
 	}
 
 	if b.authenticateFn != nil {
@@ -161,16 +177,22 @@ type SafeWebsocketClient struct {
 	useTLS   bool
 	path     *string
 	rawQuery *string
+
 	dataChannel chan []byte
 	mu          *custom_rwmutex.CustomRwMutex
 	conn        *websocket.Conn
 	cancelFuncs []context.CancelFunc
+
 	ctx    context.Context
+	Cancel context.CancelFunc
+
 	reconnectCh    chan struct{}
 	reconnectChans []chan struct{}
 	isConnected    bool
 	doneMap        *SafeMap[string, chan struct{}]
-	authenticateFn func() error
+	authenticateFn func(*SafeWebsocketClient) error
+
+	writeChan chan Message
 }
 
 func (wsClient *SafeWebsocketClient) connect() error {
@@ -211,28 +233,97 @@ func (wsClient *SafeWebsocketClient) connect() error {
 		return nil
 	})
 
+	pingCtx, pingCancel := context.WithCancel(context.Background())
+	wsClient.mu.WriteHandler(func() error {
+		wsClient.cancelFuncs = append(wsClient.cancelFuncs, pingCancel)
+		return nil
+	})
+
+	go wsClient.startPingTicker(pingCtx)
+
 	if wsClient.conn != nil {
 		wsClient.conn.Close()
 	}
 	wsClient.conn = conn
 	wsClient.isConnected = true
 
-	if err := wsClient.authenticateFn(); err != nil {
+	if wsClient.authenticateFn != nil {
+		if err := wsClient.authenticateFn(wsClient); err != nil {
 			return err
 		}
+	}
 
+	go func() {
+		ctx, cancel := context.WithCancel(context.Background())
 		wsClient.mu.WriteHandler(func() error {
-
-		pingCtx, pingCancel := context.WithCancel(context.Background())
-		go wsClient.startPingTicker(pingCtx)
-		wsClient.cancelFuncs = append(wsClient.cancelFuncs, pingCancel)
-
-		receiverCtx, receiverCancel := context.WithCancel(context.Background())
-		go wsClient.startReceiveHandler(receiverCtx)
-		wsClient.cancelFuncs = append(wsClient.cancelFuncs, receiverCancel)
-
+			wsClient.cancelFuncs = append(wsClient.cancelFuncs, cancel)
 			return nil
 		})
+
+		for {
+			select {
+			case <-ctx.Done():
+				log.Println("Writer stopped due to client shutdown")
+				return
+			case data := <-wsClient.writeChan:
+				if conn == nil {
+					wsClient.triggerReconnect()
+					return
+				}
+
+				if err := conn.WriteMessage(int(data.MessageType), data.Data); err != nil {
+					log.Printf("error on write message: %v\n", err)
+					wsClient.triggerReconnect()
+					return
+				}
+			}
+		}
+	}()
+
+	go func() {
+		ctx, cancel := context.WithCancel(context.Background())
+		wsClient.mu.WriteHandler(func() error {
+			wsClient.cancelFuncs = append(wsClient.cancelFuncs, cancel)
+			return nil
+		})
+
+		for {
+			select {
+			case <-ctx.Done():
+				log.Println("Reader stopped due to client shutdown")
+				return
+			default:
+				if conn == nil {
+					wsClient.triggerReconnect()
+					return
+				}
+				if err := conn.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
+					log.Printf("error on read deadline: %v\n", err)
+					return
+				}
+
+				messageType, data, err := conn.ReadMessage()
+				if err != nil {
+					log.Printf("error on read message: %v\n", err)
+					wsClient.triggerReconnect()
+					return
+				}
+
+				if messageType != websocket.TextMessage {
+					continue
+				}
+
+				select {
+				case wsClient.dataChannel <- data:
+				case <-ctx.Done():
+					return
+				default:
+					log.Println("Data channel full, dropping message")
+				}
+			}
+		}
+	}()
+
 	return nil
 }
 
@@ -246,49 +337,9 @@ func (wsClient *SafeWebsocketClient) startPingTicker(ctx context.Context) {
 			log.Println("ping ticker stopped")
 			return
 		case <-ticker.C:
-			wsClient.mu.WriteHandler(func() error {
-				if wsClient.conn == nil {
-					return fmt.Errorf("connection closed")
-				}
-				if err := wsClient.conn.WriteMessage(websocket.PingMessage, []byte{}); err != nil {
-					log.Printf("Ping failed: %v. Will attempt reconnect.", err)
-					wsClient.triggerReconnect()
-				}
-				return nil
-			})
-		}
-	}
-}
-
-func (wsClient *SafeWebsocketClient) startReceiveHandler(ctx context.Context) {
-	for {
-		select {
-		case <-ctx.Done():
-			log.Println("receive handler stopped")
-			return
-		default:
-			if err := wsClient.mu.ReadHandler(func() error {
-				conn := wsClient.conn
-
-				if conn == nil {
-					wsClient.triggerReconnect()
-					return fmt.Errorf("connection closed")
-				}
-				_, message, err := conn.ReadMessage()
-				if err != nil {
-					wsClient.triggerReconnect()
-					return fmt.Errorf("failed to read message: %v", err)
-				}
-				select {
-				case wsClient.dataChannel <- message:
-				case <-ctx.Done():
-					log.Println("Reconnect handler stopped")
-				default:
-					log.Println("Data channel full, dropping message")
-				}
-				return nil
-			}); err != nil {
-				return
+			wsClient.writeChan <- Message{
+				MessageType: websocket.PingMessage,
+				Data:        nil,
 			}
 		}
 	}
@@ -308,11 +359,16 @@ func (wsClient *SafeWebsocketClient) reconnectHandler() {
 		select {
 		case <-wsClient.reconnectCh:
 			log.Println("Reconnect triggered")
+
+			wsClient.mu.ReadHandler(func() error {
 				if wsClient.cancelFuncs != nil {
 					for _, cancel := range wsClient.cancelFuncs {
 						cancel()
 					}
 				}
+				return nil
+			})
+
 			wsClient.isConnected = false
 			time.Sleep(100 * time.Millisecond)
 
@@ -333,6 +389,8 @@ func (wsClient *SafeWebsocketClient) reconnectHandler() {
 					isInnerLoop = false
 					continue
 				case <-wsClient.ctx.Done():
+					log.Println("reconnect handler stopped due to client shutdown")
+					wsClient.Close()
 					return
 				}
 			}
@@ -363,19 +421,23 @@ 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) Write(data []byte) error {
+	wsClient.writeChan <- Message{
+		MessageType: MessageTypeText,
+		Data:        data,
+	}
+	return nil
 }
 
 func (wsClient *SafeWebsocketClient) Close() error {
-	wsClient.mu.WriteHandler(func() error {
+	wsClient.mu.ReadHandler(func() error {
 		if wsClient.cancelFuncs != nil {
 			for _, cancel := range wsClient.cancelFuncs {
 				cancel()
 			}
 		}
+		return nil
+	})
 
 	if wsClient.reconnectChans != nil {
 		for _, reconnectChan := range wsClient.reconnectChans {
@@ -386,9 +448,7 @@ func (wsClient *SafeWebsocketClient) Close() error {
 		wsClient.conn.Close()
 	}
 	wsClient.isConnected = false
-		return nil
-	})
-	close(wsClient.dataChannel)
+	// close(wsClient.dataChannel)
 
 	return nil
 }

v1/examples/client/main.go

@@ -29,6 +29,7 @@ func main() {
 		BasePort(8080).
 		Path("/ws/test/data_1").
 		UseTLS(false).
+		ChannelSize(30).
 		Build(ctx)
 	if err != nil {
 		log.Fatal(err)
@@ -43,6 +44,7 @@ func main() {
 	dataChannel := wsClient.DataChannel()
 
 	for data := range dataChannel {
+		// _ = data
 		fmt.Println(string(data))
 	}
 }