fix: messageType typo

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

@@ -3,7 +3,6 @@ package client
 import (
 	"context"
 	"fmt"
-	"io"
 	"log"
 	"net/url"
 	"strings"
@@ -17,7 +16,7 @@ import (
 
 const (
 	pingPeriod   = 10 * time.Second
-	readDeadline = 10 * time.Second
+	readDeadline = 30 * time.Second
 )
 
 type SafeMap[K comparable, V any] struct {
@@ -69,10 +68,10 @@ func (sm *SafeMap[K, V]) Len() int {
 type MessageType uint
 
 const (
-	MessageTypeText  MessageType = iota + 1
-	MessageTypePing  MessageType = iota
-	MessageTypePong  MessageType = iota
-	MessageTypeClose MessageType = iota
+	MessageTypeText  MessageType = websocket.TextMessage
+	MessageTypePing  MessageType = websocket.PingMessage
+	MessageTypePong  MessageType = websocket.PongMessage
+	MessageTypeClose MessageType = websocket.CloseMessage
 )
 
 type Message struct {
@@ -194,6 +193,7 @@ type SafeWebsocketClient struct {
 	authenticateFn func(*SafeWebsocketClient) error
 
 	writeChan chan Message
+	pongChan  chan error
 }
 
 func (wsClient *SafeWebsocketClient) connect() error {
@@ -221,26 +221,14 @@ func (wsClient *SafeWebsocketClient) connect() error {
 		return fmt.Errorf("failed to connect to %s: %w", wsClient.baseHost, err)
 	}
 
-	conn.SetPingHandler(func(pingData string) error {
-		if err := conn.WriteMessage(websocket.PongMessage, []byte(pingData)); err != nil {
-			if err == websocket.ErrCloseSent {
-				return nil
-			}
-			if netErr, ok := err.(interface{ Timeout() bool }); ok && netErr.Timeout() {
-				return nil
-			}
-			return err
-		}
-		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
 	})
 
+	go wsClient.startPingTicker(pingCtx)
+
 	if wsClient.conn != nil {
 		wsClient.conn.Close()
 	}
@@ -259,31 +247,30 @@ func (wsClient *SafeWebsocketClient) connect() error {
 			wsClient.cancelFuncs = append(wsClient.cancelFuncs, cancel)
 			return nil
 		})
+
+		var c *websocket.Conn
+		wsClient.mu.ReadHandler(func() error {
+			c = conn
+			return nil
+		})
+
 		for {
 			select {
 			case <-ctx.Done():
-				fmt.Println("Writer stopped due to client shutdown")
+				log.Println("Writer stopped due to client shutdown")
 				return
 			case data := <-wsClient.writeChan:
-				if conn == nil {
+				if c == 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 {
+				if err := c.WriteMessage(int(data.MessageType), data.Data); err != nil {
+					log.Printf("error on write message: %v\n", err)
+					wsClient.triggerReconnect()
+					if data.MessageType == MessageTypePong {
+						wsClient.pongChan <- err
+					}
 					return
 				}
 			}
@@ -296,45 +283,64 @@ func (wsClient *SafeWebsocketClient) connect() error {
 			wsClient.cancelFuncs = append(wsClient.cancelFuncs, cancel)
 			return nil
 		})
+
+		var c *websocket.Conn
+
+		wsClient.mu.ReadHandler(func() error {
+			c = conn
+			return nil
+		})
+		if c == nil {
+			wsClient.triggerReconnect()
+			return
+		}
 		for {
 			select {
 			case <-ctx.Done():
-				fmt.Println("Reader stopped due to client shutdown")
+				log.Println("Reader stopped due to client shutdown")
 				return
 			default:
-				if conn == nil {
+				if err := c.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
+					log.Printf("error on read deadline: %v\n", err)
 					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()
+
+				messageType, data, err := c.ReadMessage()
 				if err != nil {
-					fmt.Printf("Next Reader Closed: %v\n", err)
+					log.Printf("error on read message: %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
+				if messageType != websocket.TextMessage {
+					continue
 				}
+
 				select {
-				case wsClient.dataChannel <- readerBytes:
+				case wsClient.dataChannel <- data:
 				case <-ctx.Done():
 					return
 				default:
-					fmt.Println("Data channel full, dropping message")
+					log.Println("Data channel full, dropping message")
 				}
-
 			}
-
 		}
 	}()
 
+	conn.SetPingHandler(func(pingData string) error {
+		wsClient.writeChan <- Message{
+			MessageType: MessageTypePong,
+			Data:        []byte(pingData),
+		}
+
+		select {
+		case err := <-wsClient.pongChan:
+			return err
+		default:
+		}
+		return nil
+	})
+
 	return nil
 }
 
@@ -350,46 +356,12 @@ func (wsClient *SafeWebsocketClient) startPingTicker(ctx context.Context) {
 		case <-ticker.C:
 			wsClient.writeChan <- Message{
 				MessageType: websocket.PingMessage,
-				Data:        nil,
+				Data:        []byte{},
 			}
 		}
 	}
 }
 
-// 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{}{}:
@@ -493,7 +465,7 @@ func (wsClient *SafeWebsocketClient) Close() error {
 		wsClient.conn.Close()
 	}
 	wsClient.isConnected = false
-	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)