fix: client reconnection data race fix

go.mod

@@ -3,3 +3,5 @@ module git.neurocipta.com/rogerferdinan/safe-web-socket
 go 1.24.5
 
 require github.com/gorilla/websocket v1.5.3
+
+require git.neurocipta.com/rogerferdinan/custom-rwmutex v1.0.0 // indirect

go.sum

@@ -1,2 +1,4 @@
+git.neurocipta.com/rogerferdinan/custom-rwmutex v1.0.0 h1:KnNc40SrYsg0cksIIcQy/ca6bunkGADQOs1u7O/E+iY=
+git.neurocipta.com/rogerferdinan/custom-rwmutex v1.0.0/go.mod h1:9DvvHc2UZhBwEs63NgO4IhiuHnBNtTuBkTJgiMnnCss=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=

internal/hub.go

@@ -11,7 +11,7 @@ import (
 const (
 	writeWait  = 10 * time.Second
 	pongWait   = 60 * time.Second
-	pingPeriod = 55 * time.Second
+	pingPeriod = 25 * time.Second
 )
 
 type Client struct {
@@ -19,7 +19,6 @@ type Client struct {
 	Send           chan []byte
 	SubscribedPath string
 	done           chan struct{}
-	mu             *CustomRwMutex
 }
 
 func NewClient(conn *websocket.Conn, subscribedPath string) *Client {
@@ -28,7 +27,6 @@ func NewClient(conn *websocket.Conn, subscribedPath string) *Client {
 		Send:           make(chan []byte, 64),
 		SubscribedPath: subscribedPath,
 		done:           make(chan struct{}),
-		mu:             NewCustomRwMutex(),
 	}
 }
 
@@ -37,8 +35,6 @@ type Hub struct {
 	Broadcast  chan []byte
 	Register   chan *Client
 	Unregister chan *Client
-	writeMu    *CustomRwMutex
-	readMu     *CustomRwMutex
 }
 
 func NewHub() *Hub {
@@ -47,7 +43,6 @@ func NewHub() *Hub {
 		Register:   make(chan *Client),
 		Unregister: make(chan *Client),
 		Clients:    make(map[*Client]bool),
-		writeMu:    NewCustomRwMutex(),
 	}
 }
 
@@ -100,7 +95,7 @@ func WritePump(c *Client, h *Hub) {
 			}
 		case <-pingTicker.C:
 			c.Conn.SetWriteDeadline(time.Now().Add(writeWait))
-			if err := c.Conn.WriteMessage(websocket.PingMessage, nil); err != nil {
+			if err := c.Conn.WriteMessage(websocket.PingMessage, []byte{}); err != nil {
 				return
 			}
 		}

internal/mutex.go

@@ -1,33 +0,0 @@
-package internal
-
-import (
-	"sync"
-)
-
-type CustomRwMutex struct {
-	mu *sync.RWMutex
-}
-
-func NewCustomRwMutex() *CustomRwMutex {
-	return &CustomRwMutex{
-		mu: &sync.RWMutex{},
-	}
-}
-
-func (rwMu *CustomRwMutex) WriteHandler(fn func() error) error {
-	rwMu.mu.Lock()
-	defer rwMu.mu.Unlock()
-	if err := fn(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (rwMu *CustomRwMutex) ReadHandler(fn func() error) error {
-	rwMu.mu.RLock()
-	defer rwMu.mu.RUnlock()
-	if err := fn(); err != nil {
-		return err
-	}
-	return nil
-}

v1/client/client.go

@@ -6,8 +6,10 @@ import (
 	"log"
 	"net/url"
 	"strings"
+	"sync"
 	"time"
 
+	custom_rwmutex "git.neurocipta.com/rogerferdinan/custom-rwmutex"
 	"git.neurocipta.com/rogerferdinan/safe-web-socket/internal"
 	"github.com/gorilla/websocket"
 )
@@ -16,6 +18,52 @@ const (
 	pingPeriod = 10 * time.Second
 )
 
+type SafeMap[K comparable, V any] struct {
+	m sync.Map
+}
+
+func NewSafeMap[K comparable, V any]() *SafeMap[K, V] {
+	return &SafeMap[K, V]{
+		m: sync.Map{},
+	}
+}
+
+func (sm *SafeMap[K, V]) Store(key K, value V) {
+	sm.m.Store(key, value)
+}
+
+func (sm *SafeMap[K, V]) Load(key K) (value V, ok bool) {
+	val, loaded := sm.m.Load(key)
+	if !loaded {
+		return *new(V), false
+	}
+	return val.(V), true
+}
+
+func (sm *SafeMap[K, V]) Delete(key K) {
+	sm.m.Delete(key)
+}
+
+func (sm *SafeMap[K, V]) Range(f func(K, V) bool) {
+	sm.m.Range(func(key, value any) bool {
+		k, ok1 := key.(K)
+		v, ok2 := value.(V)
+		if !ok1 || !ok2 {
+			return true
+		}
+		return f(k, v)
+	})
+}
+
+func (sm *SafeMap[K, V]) Len() int {
+	count := 0
+	sm.Range(func(_ K, _ V) bool {
+		count++
+		return true
+	})
+	return count
+}
+
 type SafeWebsocketClientBuilder struct {
 	baseHost *string `nil_checker:"required"`
 	basePort *uint16 `nil_checker:"required"`
@@ -58,8 +106,6 @@ func (b *SafeWebsocketClientBuilder) Build() (*SafeWebsocketClient, error) {
 		return nil, err
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
-
 	var useTLS bool
 	if b.useTLS != nil {
 		useTLS = *b.useTLS
@@ -71,16 +117,14 @@ func (b *SafeWebsocketClientBuilder) Build() (*SafeWebsocketClient, error) {
 		useTLS:      useTLS,
 		path:        b.path,
 		rawQuery:    b.rawQuery,
-		ctx:         ctx,
-		cancel:      cancel,
 		dataChannel: make(chan []byte, 1),
-		mu:          internal.NewCustomRwMutex(),
+		mu:          custom_rwmutex.NewCustomRwMutex(),
 		reconnectCh: make(chan struct{}, 1),
 		isConnected: false,
+		doneMap:     NewSafeMap[string, chan struct{}](),
 	}
 
 	if err := wsClient.connect(); err != nil {
-		cancel()
 		return nil, fmt.Errorf("failed to establish initial connection: %v", err)
 	}
 
@@ -94,12 +138,14 @@ type SafeWebsocketClient struct {
 	path        *string
 	rawQuery    *string
 	dataChannel chan []byte
-	mu          *internal.CustomRwMutex
+	mu          *custom_rwmutex.CustomRwMutex
 	conn        *websocket.Conn
 	ctx         context.Context
 	cancel      context.CancelFunc
 	reconnectCh chan struct{}
 	isConnected bool
+
+	doneMap *SafeMap[string, chan struct{}]
 }
 
 func (wsClient *SafeWebsocketClient) connect() error {
@@ -128,21 +174,28 @@ func (wsClient *SafeWebsocketClient) connect() error {
 	}
 
 	conn.SetPingHandler(func(pingData string) error {
-		if err := conn.WriteMessage(websocket.PongMessage, []byte(pingData)); err != nil {
+		return wsClient.mu.WriteHandler(func() error {
-			if err == websocket.ErrCloseSent {
+			if err := conn.WriteMessage(websocket.PongMessage, []byte(pingData)); err != nil {
-				return nil
+				if err == websocket.ErrCloseSent {
+					return nil
+				}
+				if netErr, ok := err.(interface{ Timeout() bool }); ok && netErr.Timeout() {
+					return nil
+				}
+				return err
 			}
-			if netErr, ok := err.(interface{ Timeout() bool }); ok && netErr.Timeout() {
+			return nil
-				return nil
+		})
-			}
-			return err
-		}
-		return nil
 	})
 
 	wsClient.mu.WriteHandler(func() error {
+		wsClient.conn.Close()
+		ctx, cancel := context.WithCancel(context.Background())
+		wsClient.ctx = ctx
+		wsClient.cancel = cancel
 		wsClient.conn = conn
 		wsClient.isConnected = true
+
 		return nil
 	})
 
@@ -156,6 +209,10 @@ func (wsClient *SafeWebsocketClient) connect() error {
 func (wsClient *SafeWebsocketClient) startPingTicker() {
 	ticker := time.NewTicker(pingPeriod)
 	defer ticker.Stop()
+
+	doneKey := "startPingTicker"
+	wsClient.doneMap.Store(doneKey, make(chan struct{}))
+	done, _ := wsClient.doneMap.Load(doneKey)
 	for {
 		select {
 		case <-ticker.C:
@@ -166,7 +223,7 @@ func (wsClient *SafeWebsocketClient) startPingTicker() {
 				}
 				return nil
 			})
-		case <-wsClient.ctx.Done():
+		case <-done:
 			log.Println("Ping ticker stopped")
 			return
 		}
@@ -174,29 +231,28 @@ func (wsClient *SafeWebsocketClient) startPingTicker() {
 }
 
 func (wsClient *SafeWebsocketClient) startReceiveHandler() {
+	doneKey := "startReceiveHandler"
+	wsClient.doneMap.Store(doneKey, make(chan struct{}))
+	done, _ := wsClient.doneMap.Load(doneKey)
+
 	for {
 		select {
-		case <-wsClient.reconnectCh:
+		case <-done:
-		case <-wsClient.ctx.Done():
 			log.Println("Reconnect handler stopped")
 			return
 		default:
-			if err := wsClient.mu.WriteHandler(func() error {
+			conn := wsClient.conn
-				conn := wsClient.conn
 
-				if conn == nil {
+			if conn == nil {
-					return fmt.Errorf("no active connection, waiting for reconnect")
-				}
-				_, message, err := conn.ReadMessage()
-				if err != nil {
-					return err
-				}
-				wsClient.dataChannel <- message
-				return nil
-			}); err != nil {
 				wsClient.triggerReconnect()
 				return
 			}
+			_, message, err := conn.ReadMessage()
+			if err != nil {
+				wsClient.triggerReconnect()
+				return
+			}
+			wsClient.dataChannel <- message
 		}
 	}
 }
@@ -209,8 +265,22 @@ func (wsClient *SafeWebsocketClient) triggerReconnect() {
 }
 
 func (wsClient *SafeWebsocketClient) reconnectHandler() {
-	for range wsClient.reconnectCh {
+	doneKey := "reconnectHandler"
-		wsClient.connect()
+	wsClient.doneMap.Store(doneKey, make(chan struct{}))
+	done, _ := wsClient.doneMap.Load(doneKey)
+	for {
+		select {
+		case <-wsClient.reconnectCh:
+			wsClient.cancel()
+			wsClient.connect()
+
+			wsClient.doneMap.Range(func(s string, c chan struct{}) bool {
+				c <- struct{}{}
+				return true
+			})
+		case <-done:
+			return
+		}
 	}
 }