fix: adding lock for cancel function slices

v1/client/client.go

@@ -3,6 +3,7 @@ package client
 import (
 	"context"
 	"fmt"
+	"io"
 	"log"
 	"net/url"
 	"strings"
@@ -16,6 +17,7 @@ import (
 
 const (
 	pingPeriod   = 10 * time.Second
+	readDeadline = 10 * time.Second
 )
 
 type SafeMap[K comparable, V any] struct {
@@ -64,6 +66,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 +87,7 @@ type SafeWebsocketClientBuilder struct {
 	rawQuery       *string
 	useTLS         *bool
 	channelSize    *int64
-	authenticateFn func() error
+	authenticateFn func(*SafeWebsocketClient) error
 }
 
 func NewSafeWebsocketClientBuilder() *SafeWebsocketClientBuilder {
@@ -93,7 +109,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
 }
@@ -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,6 +233,13 @@ func (wsClient *SafeWebsocketClient) connect() error {
 		return nil
 	})
 
+	pingCtx, pingCancel := context.WithCancel(context.Background())
+	go wsClient.startPingTicker(pingCtx)
+	wsClient.mu.WriteHandler(func() error {
+		wsClient.cancelFuncs = append(wsClient.cancelFuncs, pingCancel)
+		return nil
+	})
+
 	if wsClient.conn != nil {
 		wsClient.conn.Close()
 	}
@@ -218,23 +247,93 @@ func (wsClient *SafeWebsocketClient) connect() error {
 	wsClient.isConnected = true
 
 	if wsClient.authenticateFn != nil {
-		if err := wsClient.authenticateFn(); err != 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():
+				fmt.Println("Writer stopped due to client shutdown")
+				return
+			case data := <-wsClient.writeChan:
+				if conn == nil {
+					wsClient.triggerReconnect()
+					return
+				}
+				messageType := websocket.TextMessage
+				switch data.MessageType {
+				case MessageTypePing:
+					messageType = websocket.PingMessage
+				case MessageTypePong:
+					messageType = websocket.PongMessage
+				case MessageTypeClose:
+					messageType = websocket.CloseMessage
+				}
+				writer, err := conn.NextWriter(messageType)
+				if err != nil {
+					return
+				}
+
+				if _, err := writer.Write(data.Data); err != nil {
+					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():
+				fmt.Println("Reader stopped due to client shutdown")
+				return
+			default:
+				if conn == nil {
+					return
+				}
+				if err := conn.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
+					fmt.Printf("error on read deadline: %v\n", err)
+					return
+				}
+				_, reader, err := conn.NextReader()
+				if err != nil {
+					fmt.Printf("Next Reader Closed: %v\n", err)
+					wsClient.triggerReconnect()
+					return
+				}
+
+				readerBytes, err := io.ReadAll(reader)
+				if err != nil {
+					fmt.Printf("io reader failed: %v\n", err)
+					wsClient.triggerReconnect()
+					return
+				}
+				select {
+				case wsClient.dataChannel <- readerBytes:
+				case <-ctx.Done():
+					return
+				default:
+					fmt.Println("Data channel full, dropping message")
+				}
+
+			}
+
+		}
+	}()
+
 	return nil
 }
 
@@ -248,54 +347,48 @@ 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,
 			}
 		}
 	}
 }
 
+// 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("")
+// 				}
+// 				return nil
+// 			}); err != nil {
+// 				return
+// 			}
+// 		}
+// 	}
+// }
+
 func (wsClient *SafeWebsocketClient) triggerReconnect() {
 	select {
 	case wsClient.reconnectCh <- struct{}{}:
@@ -310,6 +403,7 @@ func (wsClient *SafeWebsocketClient) reconnectHandler() {
 		select {
 		case <-wsClient.reconnectCh:
 			log.Println("Reconnect triggered")
+
 			if wsClient.cancelFuncs != nil {
 				for _, cancel := range wsClient.cancelFuncs {
 					cancel()
@@ -335,6 +429,8 @@ func (wsClient *SafeWebsocketClient) reconnectHandler() {
 					isInnerLoop = false
 					continue
 				case <-wsClient.ctx.Done():
+					log.Println("reconnect handler stopped due to client shutdown")
+					wsClient.Close()
 					return
 				}
 			}
@@ -365,14 +461,15 @@ 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 {
 	if wsClient.cancelFuncs != nil {
 		for _, cancel := range wsClient.cancelFuncs {
 			cancel()
@@ -388,8 +485,6 @@ func (wsClient *SafeWebsocketClient) Close() error {
 		wsClient.conn.Close()
 	}
 	wsClient.isConnected = false
-		return nil
-	})
 	close(wsClient.dataChannel)
 
 	return nil

v1/examples/client/main.go

@@ -43,6 +43,7 @@ func main() {
 	dataChannel := wsClient.DataChannel()
 
 	for data := range dataChannel {
+		// _ = data
 		fmt.Println(string(data))
 	}
 }