feat: adding ping & pong handler

v1/client/client.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"net/http"
 	"net/url"
 	"strings"
 	"time"
@@ -36,6 +37,7 @@ type Message struct {
 type SafeWebsocketClientBuilder struct {
 	baseHost         *string `nil_checker:"required"`
 	basePort         *uint16 `nil_checker:"required"`
+	headers          *map[string]string
 	path             *string
 	rawQuery         *string
 	isDrop           *bool
@@ -58,6 +60,11 @@ func (b *SafeWebsocketClientBuilder) BasePort(port uint16) *SafeWebsocketClientB
 	return b
 }
 
+func (b *SafeWebsocketClientBuilder) Headers(headers map[string]string) *SafeWebsocketClientBuilder {
+	b.headers = &headers
+	return b
+}
+
 func (b *SafeWebsocketClientBuilder) UseTLS(useTLS bool) *SafeWebsocketClientBuilder {
 	b.useTLS = &useTLS
 	return b
@@ -117,6 +124,7 @@ func (b *SafeWebsocketClientBuilder) Build(ctx context.Context) (*SafeWebsocketC
 	wsClient := SafeWebsocketClient{
 		baseHost:    *b.baseHost,
 		basePort:    *b.basePort,
+		headers:     b.headers,
 		useTLS:      *b.useTLS,
 		isDrop:      *b.isDrop,
 		path:        b.path,
@@ -142,6 +150,8 @@ func (b *SafeWebsocketClientBuilder) Build(ctx context.Context) (*SafeWebsocketC
 type SafeWebsocketClient struct {
 	baseHost string
 	basePort uint16
+	headers  *map[string]string
+
 	isDrop   bool
 	useTLS   bool
 	path     *string
@@ -159,7 +169,6 @@ type SafeWebsocketClient struct {
 	doneMap        *safemap.SafeMap[string, chan struct{}]
 
 	writeChan chan Message
-	pongChan  chan error
 }
 
 func (wsClient *SafeWebsocketClient) connect() error {
@@ -182,7 +191,15 @@ func (wsClient *SafeWebsocketClient) connect() error {
 		newURL.RawQuery = *wsClient.rawQuery
 	}
 
-	conn, _, err := websocket.DefaultDialer.Dial(newURL.String(), nil)
+	header := make(http.Header)
+
+	if wsClient.headers != nil {
+		for k, v := range *wsClient.headers {
+			header.Set(k, v)
+		}
+	}
+
+	conn, _, err := websocket.DefaultDialer.Dial(newURL.String(), header)
 	if err != nil {
 		return fmt.Errorf("failed to connect to %s: %w", wsClient.baseHost, err)
 	}
@@ -201,23 +218,30 @@ func (wsClient *SafeWebsocketClient) connect() error {
 	wsClient.conn = conn
 	wsClient.isConnected = true
 
+	conn.SetPingHandler(func(pingData string) error {
+		if err := conn.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
+			log.Printf("error on read deadline: %v\n", err)
+			return err
+		}
+
+		wsClient.writeChan <- Message{
+			MessageType: MessageTypePong,
+			Data:        []byte(pingData),
+		}
+		return nil
+	})
+
+	conn.SetPongHandler(func(pingData string) error {
+		if err := conn.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
+			log.Printf("error on read deadline: %v\n", err)
+			return err
+		}
+		return nil
+	})
+
 	go wsClient.writePump()
 	go wsClient.readPump()
 
-	// 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
 }
 
@@ -246,9 +270,6 @@ func (wsClient *SafeWebsocketClient) writePump() {
 
 			if err := c.WriteMessage(int(data.MessageType), data.Data); err != nil {
 				log.Printf("error on write message: %v\n", err)
-				if data.MessageType == MessageTypePong {
-					wsClient.pongChan <- err
-				}
 				return
 			}
 		}
@@ -268,78 +289,43 @@ func (wsClient *SafeWebsocketClient) readPump() {
 		return nil
 	})
 
-	if wsClient.isDrop {
-		for {
+	for {
+		select {
+		case <-ctx.Done():
+			log.Println("Reader canceled by context")
+			return
+		default:
+			if c == nil {
+				return
+			}
+
+			if err := c.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
+				log.Printf("error on read deadline: %v\n", err)
+				return
+			}
+
+			messageType, data, err := c.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():
-				log.Println("Reader canceled by context")
 				return
 			default:
-				if c == nil {
-					return
-				}
-
-				if err := c.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
-					log.Printf("error on read deadline: %v\n", err)
-					return
-				}
-
-				messageType, data, err := c.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:
+				if wsClient.isDrop {
 					log.Println("Data channel full, dropping message")
 				}
 			}
 		}
-	} else {
-		for {
-			select {
-			case <-ctx.Done():
-				log.Println("Reader canceled by context")
-				return
-			default:
-				if c == nil {
-					return
-				}
-
-				if err := c.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
-					log.Printf("error on read deadline: %v\n", err)
-					return
-				}
-
-				messageType, data, err := c.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
-				}
-			}
-		}
 	}
-
 }
 
 func (wsClient *SafeWebsocketClient) startPingTicker(ctx context.Context) {

v1/examples/client/main.go

@@ -8,10 +8,18 @@ import (
 	"os/signal"
 	"syscall"
 
+	"net/http"
+	_ "net/http/pprof"
+
 	"git.neurocipta.com/rogerferdinan/safe-web-socket/v1/client"
 )
 
 func main() {
+	go func() {
+		log.Println("Starting pprof server on :6060")
+		log.Println(http.ListenAndServe(":6060", nil))
+	}()
+
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
 
@@ -27,7 +35,9 @@ func main() {
 	wsClient, err := client.NewSafeWebsocketClientBuilder().
 		BaseHost("localhost").
 		BasePort(8080).
-		Path("/ws/test/data_1").
+		Headers(map[string]string{
+			"X-MBX-APIKEY": "abcd",
+		}).Path("/ws/test/data_1").
 		UseTLS(false).
 		ChannelSize(1).
 		Build(ctx)
@@ -44,7 +54,7 @@ func main() {
 	dataChannel := wsClient.DataChannel()
 
 	for data := range dataChannel {
-		// _ = data
-		fmt.Println(string(data))
+		_ = data
+		// fmt.Println(string(data))
 	}
 }

v1/examples/server/main.go

@@ -17,9 +17,9 @@ func main() {
 	s, err := server.NewSafeWebsocketServerBuilder().
 		BaseHost("localhost").
 		BasePort(8080).
-		ApiKey("").
+		ApiKey("abcd").
 		HandleFuncWebsocket("/ws/test/", "data_1", func(c chan []byte) {
-			ticker := time.NewTicker(10 * time.Millisecond)
+			ticker := time.NewTicker(100 * time.Millisecond)
 			for range ticker.C {
 				jsonBytes, err := json.Marshal(ExampleData{
 					Time: time.Now(),
@@ -32,7 +32,7 @@ func main() {
 			}
 		}).
 		HandleFuncWebsocket("/ws/test/", "data_2", func(c chan []byte) {
-			ticker := time.NewTicker(10 * time.Millisecond)
+			ticker := time.NewTicker(100 * time.Millisecond)
 			for range ticker.C {
 				jsonBytes, err := json.Marshal(ExampleData{
 					Time: time.Now(),

v1/server/server.go

@@ -115,6 +115,7 @@ func (s *SafeWebsocketServer) AuthMiddleware(next http.Handler) http.Handler {
 				StatusCode(http.StatusForbidden).
 				Message("X-MBX-APIKEY is missing").
 				Build())
+			return
 		}
 		next.ServeHTTP(w, r)
 	})