Compare commits

...

7 Commits

9 changed files with 373 additions and 236 deletions

10
go.mod
View File

@@ -9,4 +9,12 @@ require (
github.com/google/uuid v1.6.0 github.com/google/uuid v1.6.0
) )
require git.neurocipta.com/rogerferdinan/safe-map v0.0.0-20251011004629-ab0b119a7c48 require (
git.neurocipta.com/rogerferdinan/safe-map v0.0.0-20251011004629-ab0b119a7c48
github.com/gobwas/ws v1.4.0
)
require (
github.com/gobwas/httphead v0.1.0 // indirect
github.com/gobwas/pool v0.2.1 // indirect
)

7
go.sum
View File

@@ -2,7 +2,14 @@ git.neurocipta.com/rogerferdinan/custom-rwmutex v1.0.0 h1:KnNc40SrYsg0cksIIcQy/c
git.neurocipta.com/rogerferdinan/custom-rwmutex v1.0.0/go.mod h1:9DvvHc2UZhBwEs63NgO4IhiuHnBNtTuBkTJgiMnnCss= git.neurocipta.com/rogerferdinan/custom-rwmutex v1.0.0/go.mod h1:9DvvHc2UZhBwEs63NgO4IhiuHnBNtTuBkTJgiMnnCss=
git.neurocipta.com/rogerferdinan/safe-map v0.0.0-20251011004629-ab0b119a7c48 h1:4wXSbEuwFd2gycaaGP35bjUkKEEO6WcVfJ6cetEyT5s= git.neurocipta.com/rogerferdinan/safe-map v0.0.0-20251011004629-ab0b119a7c48 h1:4wXSbEuwFd2gycaaGP35bjUkKEEO6WcVfJ6cetEyT5s=
git.neurocipta.com/rogerferdinan/safe-map v0.0.0-20251011004629-ab0b119a7c48/go.mod h1:QtIxG0BYCCq8a5qyklpSHA8qWUvKr+mfl42qF9QxTc0= git.neurocipta.com/rogerferdinan/safe-map v0.0.0-20251011004629-ab0b119a7c48/go.mod h1:QtIxG0BYCCq8a5qyklpSHA8qWUvKr+mfl42qF9QxTc0=
github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

View File

@@ -0,0 +1,56 @@
package internal
import (
"encoding/json"
"fmt"
"net/http"
)
type StatusMessageBuilder struct {
statusCode *int
message *string
}
func NewStatusMessage() *StatusMessageBuilder {
return &StatusMessageBuilder{}
}
func (sm *StatusMessageBuilder) StatusCode(statusCode int) *StatusMessageBuilder {
sm.statusCode = &statusCode
return sm
}
func (sm *StatusMessageBuilder) Message(message string) *StatusMessageBuilder {
sm.message = &message
return sm
}
func (sm *StatusMessageBuilder) Build() *StatusMessage {
return &StatusMessage{
StatusCode: sm.statusCode,
Message: sm.message,
}
}
type StatusMessage struct {
StatusCode *int
Message *string `json:"msg"`
}
func ErrorResponse(w http.ResponseWriter, statusMessage *StatusMessage) error {
if statusMessage.StatusCode == nil {
return fmt.Errorf("status code is missing")
}
if statusMessage.Message == nil {
return fmt.Errorf("message is missing")
}
w.Header().Add("Content-Type", "application/json")
w.WriteHeader(*statusMessage.StatusCode)
b, err := json.Marshal(statusMessage)
if err != nil {
return fmt.Errorf("failed to marshal JSON")
}
w.Write(b)
return nil
}

View File

@@ -3,6 +3,7 @@ package internal
import ( import (
"fmt" "fmt"
"log" "log"
"sync"
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
@@ -12,7 +13,8 @@ import (
const ( const (
writeWait = 10 * time.Second writeWait = 10 * time.Second
pongWait = 60 * time.Second pongWait = 60 * time.Second
pingPeriod = 25 * time.Second pingPeriod = (pongWait * 9) / 10
maxMessageSize = 512
) )
type Client struct { type Client struct {
@@ -20,16 +22,16 @@ type Client struct {
Conn *websocket.Conn Conn *websocket.Conn
Send chan []byte Send chan []byte
SubscribedPath string SubscribedPath string
done chan struct{} mu sync.Mutex
} }
func NewClient(conn *websocket.Conn, subscribedPath string) *Client { func NewClient(conn *websocket.Conn, subscribedPath string) *Client {
return &Client{ return &Client{
ID: uuid.NewString(), ID: uuid.NewString(),
Conn: conn, Conn: conn,
Send: make(chan []byte, 1), Send: make(chan []byte, 256),
SubscribedPath: subscribedPath, SubscribedPath: subscribedPath,
done: make(chan struct{}, 1), mu: sync.Mutex{},
} }
} }
@@ -42,9 +44,9 @@ type Hub struct {
func NewHub() *Hub { func NewHub() *Hub {
return &Hub{ return &Hub{
Broadcast: make(chan []byte, 1), Broadcast: make(chan []byte, 256),
Register: make(chan *Client, 1), Register: make(chan *Client, 10),
Unregister: make(chan *Client, 1), Unregister: make(chan *Client, 10),
Clients: make(map[*Client]bool), Clients: make(map[*Client]bool),
} }
} }
@@ -55,23 +57,22 @@ func (h *Hub) Run() {
select { select {
case client := <-h.Register: case client := <-h.Register:
h.Clients[client] = true h.Clients[client] = true
log.Println("Client registered") log.Printf("Client registered %s\n", client.ID)
case c := <-h.Unregister: case client := <-h.Unregister:
if v, ok := h.Clients[c]; ok { if _, ok := h.Clients[client]; ok {
fmt.Println(v, c) delete(h.Clients, client)
delete(h.Clients, c) close(client.Send)
close(c.Send)
} }
log.Println("Client Unregistered") log.Printf("Client Unregistered %s\n", client.ID)
case message := <-h.Broadcast: case message := <-h.Broadcast:
for client := range h.Clients { for client := range h.Clients {
client.Send <- message select {
// select { case client.Send <- message:
// case client.Send <- message: default:
// default: close(client.Send)
// close(client.Send) delete(h.Clients, client)
// delete(h.Clients, client) log.Printf("Client %s removed (slow/disconnected)", client.ID)
// } }
} }
} }
} }
@@ -90,23 +91,36 @@ func WritePump(c *Client, h *Hub) {
select { select {
case message, ok := <-c.Send: case message, ok := <-c.Send:
c.Conn.SetWriteDeadline(time.Now().Add(writeWait)) c.Conn.SetWriteDeadline(time.Now().Add(writeWait))
if !ok { if !ok {
c.Conn.WriteMessage(websocket.CloseMessage, []byte{}) c.Conn.WriteMessage(websocket.CloseMessage, []byte{})
fmt.Println(ok)
return return
} }
if err := c.Conn.WriteMessage(websocket.TextMessage, message); err != nil { w, err := c.Conn.NextWriter(websocket.TextMessage)
fmt.Println(err) if err != nil {
return
}
w.Write(message)
// Queue queued messages in the same buffer (optional optimization)
n := len(c.Send)
for i := 0; i < n; i++ {
w.Write(<-c.Send)
}
if err := w.Close(); err != nil {
return return
} }
case <-pingTicker.C: case <-pingTicker.C:
c.Conn.SetWriteDeadline(time.Now().Add(writeWait)) c.Conn.SetWriteDeadline(time.Now().Add(writeWait))
if err := c.Conn.WriteMessage(websocket.PingMessage, []byte{}); err != nil {
if err := c.Conn.WriteMessage(websocket.PingMessage, nil); err != nil {
fmt.Println(err) fmt.Println(err)
return return
} }
} }
} }
} }
@@ -116,15 +130,16 @@ func ReadPump(c *Client, h *Hub) {
c.Conn.Close() c.Conn.Close()
}() }()
c.Conn.SetReadLimit(1024) c.Conn.SetReadLimit(maxMessageSize)
c.Conn.SetReadDeadline(time.Now().Add(pongWait)) c.Conn.SetReadDeadline(time.Now().Add(pongWait))
c.Conn.SetPongHandler(func(string) error { c.Conn.SetPongHandler(func(string) error {
c.Conn.SetReadDeadline(time.Now().Add(pongWait)) c.Conn.SetReadDeadline(time.Now().Add(pongWait))
return nil return nil
}) })
for { for {
messageType, message, err := c.Conn.ReadMessage() _, message, err := c.Conn.ReadMessage()
if err != nil { if err != nil {
if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
log.Printf("WebSocket error: %v", err) log.Printf("WebSocket error: %v", err)
@@ -132,8 +147,6 @@ func ReadPump(c *Client, h *Hub) {
break break
} }
if messageType == websocket.TextMessage {
log.Printf("Received: %s\n", message) log.Printf("Received: %s\n", message)
} }
} }
}

View File

@@ -4,6 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"log" "log"
"net/http"
"net/url" "net/url"
"strings" "strings"
"time" "time"
@@ -17,6 +18,7 @@ import (
const ( const (
pingPeriod = 10 * time.Second pingPeriod = 10 * time.Second
readDeadline = 30 * time.Second readDeadline = 30 * time.Second
writeDeadline = 10 * time.Second
) )
type MessageType uint type MessageType uint
@@ -36,6 +38,7 @@ type Message struct {
type SafeWebsocketClientBuilder struct { type SafeWebsocketClientBuilder struct {
baseHost *string `nil_checker:"required"` baseHost *string `nil_checker:"required"`
basePort *uint16 `nil_checker:"required"` basePort *uint16 `nil_checker:"required"`
headers *map[string]string
path *string path *string
rawQuery *string rawQuery *string
isDrop *bool isDrop *bool
@@ -58,6 +61,11 @@ func (b *SafeWebsocketClientBuilder) BasePort(port uint16) *SafeWebsocketClientB
return b return b
} }
func (b *SafeWebsocketClientBuilder) Headers(headers map[string]string) *SafeWebsocketClientBuilder {
b.headers = &headers
return b
}
func (b *SafeWebsocketClientBuilder) UseTLS(useTLS bool) *SafeWebsocketClientBuilder { func (b *SafeWebsocketClientBuilder) UseTLS(useTLS bool) *SafeWebsocketClientBuilder {
b.useTLS = &useTLS b.useTLS = &useTLS
return b return b
@@ -117,6 +125,7 @@ func (b *SafeWebsocketClientBuilder) Build(ctx context.Context) (*SafeWebsocketC
wsClient := SafeWebsocketClient{ wsClient := SafeWebsocketClient{
baseHost: *b.baseHost, baseHost: *b.baseHost,
basePort: *b.basePort, basePort: *b.basePort,
headers: b.headers,
useTLS: *b.useTLS, useTLS: *b.useTLS,
isDrop: *b.isDrop, isDrop: *b.isDrop,
path: b.path, path: b.path,
@@ -142,6 +151,8 @@ func (b *SafeWebsocketClientBuilder) Build(ctx context.Context) (*SafeWebsocketC
type SafeWebsocketClient struct { type SafeWebsocketClient struct {
baseHost string baseHost string
basePort uint16 basePort uint16
headers *map[string]string
isDrop bool isDrop bool
useTLS bool useTLS bool
path *string path *string
@@ -159,7 +170,6 @@ type SafeWebsocketClient struct {
doneMap *safemap.SafeMap[string, chan struct{}] doneMap *safemap.SafeMap[string, chan struct{}]
writeChan chan Message writeChan chan Message
pongChan chan error
} }
func (wsClient *SafeWebsocketClient) connect() error { func (wsClient *SafeWebsocketClient) connect() error {
@@ -173,219 +183,88 @@ func (wsClient *SafeWebsocketClient) connect() error {
Scheme: scheme, Scheme: scheme,
Host: fmt.Sprintf("%s:%d", wsClient.baseHost, wsClient.basePort), Host: fmt.Sprintf("%s:%d", wsClient.baseHost, wsClient.basePort),
} }
if wsClient.path != nil && strings.TrimSpace(*wsClient.path) != "" { if wsClient.path != nil && strings.TrimSpace(*wsClient.path) != "" {
newURL.Path = *wsClient.path newURL.Path = *wsClient.path
} }
if wsClient.rawQuery != nil && strings.TrimSpace(*wsClient.rawQuery) != "" { if wsClient.rawQuery != nil && strings.TrimSpace(*wsClient.rawQuery) != "" {
newURL.RawQuery = *wsClient.rawQuery 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 { if err != nil {
return fmt.Errorf("failed to connect to %s: %w", wsClient.baseHost, err) return fmt.Errorf("failed to connect to %s: %w", wsClient.baseHost, err)
} }
pingCtx, pingCancel := context.WithCancel(context.Background()) pingCtx, pingCancel := context.WithCancel(context.Background())
pumpCtx, pumpCancel := context.WithCancel(context.Background())
wsClient.mu.WriteHandler(func() error { wsClient.mu.WriteHandler(func() error {
wsClient.cancelFuncs = append(wsClient.cancelFuncs, pingCancel) if wsClient.conn != nil {
wsClient.conn.Close()
}
wsClient.conn = conn
wsClient.cancelFuncs = append(wsClient.cancelFuncs, pingCancel, pumpCancel)
return nil return nil
}) })
go wsClient.startPingTicker(pingCtx) go wsClient.startPingTicker(pingCtx)
go wsClient.writePump(pumpCtx, conn)
go wsClient.readPump(pumpCtx, conn)
if wsClient.conn != nil { conn.SetPingHandler(func(pingData string) error {
wsClient.conn.Close() if err := conn.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
}
wsClient.conn = conn
wsClient.isConnected = true
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
}
func (wsClient *SafeWebsocketClient) writePump() {
ctx, cancel := context.WithCancel(context.Background())
wsClient.mu.WriteHandler(func() error {
wsClient.cancelFuncs = append(wsClient.cancelFuncs, cancel)
return nil
})
var c *websocket.Conn
wsClient.mu.ReadHandler(func() error {
c = wsClient.conn
return nil
})
for {
select {
case <-ctx.Done():
log.Println("Writer canceled by context")
return
case data := <-wsClient.writeChan:
if c == nil {
return
}
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
}
}
}
}
func (wsClient *SafeWebsocketClient) readPump() {
ctx, cancel := context.WithCancel(context.Background())
wsClient.mu.WriteHandler(func() error {
wsClient.cancelFuncs = append(wsClient.cancelFuncs, cancel)
return nil
})
var c *websocket.Conn
wsClient.mu.ReadHandler(func() error {
c = wsClient.conn
return nil
})
if wsClient.isDrop {
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) log.Printf("error on read deadline: %v\n", err)
return return err
} }
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:
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) {
ticker := time.NewTicker(pingPeriod)
defer ticker.Stop()
for {
select {
case <-ctx.Done():
log.Println("ping ticker canceled by context")
return
case <-ticker.C:
wsClient.writeChan <- Message{ wsClient.writeChan <- Message{
MessageType: websocket.PingMessage, MessageType: MessageTypePong,
Data: []byte{}, Data: []byte(pingData),
}
}
}
} }
return nil
})
func (wsClient *SafeWebsocketClient) triggerReconnect() { conn.SetPongHandler(func(pingData string) error {
select { if err := conn.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
case wsClient.reconnectCh <- struct{}{}: log.Printf("error on read deadline: %v\n", err)
default: return err
} }
return nil
})
wsClient.isConnected = true
return nil
} }
func (wsClient *SafeWebsocketClient) reconnectHandler() { func (wsClient *SafeWebsocketClient) reconnectHandler() {
backoff := 1 * time.Second backoff := 1 * time.Second
maxBackoff := 30 * time.Second maxBackoff := 15 * time.Second
for { for {
select { select {
case <-wsClient.reconnectCh: case <-wsClient.reconnectCh:
log.Println("Reconnect triggered") log.Println("Reconnect triggered")
wsClient.mu.ReadHandler(func() error { wsClient.mu.WriteHandler(func() error {
if wsClient.cancelFuncs != nil { if wsClient.cancelFuncs != nil {
for _, cancel := range wsClient.cancelFuncs { for _, cancel := range wsClient.cancelFuncs {
cancel() cancel()
} }
wsClient.cancelFuncs = nil
} }
return nil return nil
}) })
wsClient.isConnected = false wsClient.isConnected = false
isInnerLoop := true isInnerLoop := true
for isInnerLoop { for isInnerLoop {
log.Printf("Attempting reconnect in %v...", backoff) log.Printf("Attempting reconnect in %v...", backoff)
@@ -410,7 +289,15 @@ func (wsClient *SafeWebsocketClient) reconnectHandler() {
} }
if wsClient.reconnectChans != nil { if wsClient.reconnectChans != nil {
for _, reconnectCh := range wsClient.reconnectChans { for _, reconnectCh := range wsClient.reconnectChans {
reconnectCh <- struct{}{} select {
case reconnectCh <- struct{}{}:
default: // prevent blocking if chan is full
}
}
if len(wsClient.reconnectChans) > 1 {
wsClient.reconnectChans = wsClient.reconnectChans[1:]
} else {
wsClient.reconnectChans = nil
} }
} }
case <-wsClient.ctx.Done(): case <-wsClient.ctx.Done():
@@ -421,6 +308,96 @@ func (wsClient *SafeWebsocketClient) reconnectHandler() {
} }
} }
func (wsClient *SafeWebsocketClient) writePump(ctx context.Context, c *websocket.Conn) {
defer func() {
c.Close()
}()
for {
select {
case <-ctx.Done():
log.Println("Writer canceled by context")
return
case data := <-wsClient.writeChan:
if err := c.SetWriteDeadline(time.Now().Add(writeDeadline)); err != nil {
log.Printf("error setting write deadline: %v", err)
return
}
if err := c.WriteMessage(int(data.MessageType), data.Data); err != nil {
log.Printf("error on write message: %v\n", err)
wsClient.triggerReconnect() // Trigger reconnect on write failure
return
}
}
}
}
func (wsClient *SafeWebsocketClient) readPump(ctx context.Context, c *websocket.Conn) {
defer func() {
wsClient.triggerReconnect()
c.Close()
}()
for {
select {
case <-ctx.Done():
log.Println("Reader canceled by context")
return
default:
// Set read deadline
if err := c.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
return
}
messageType, data, err := c.ReadMessage()
if err != nil {
log.Printf("error on read message: %v\n", err)
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")
}
}
}
}
}
func (wsClient *SafeWebsocketClient) startPingTicker(ctx context.Context) {
ticker := time.NewTicker(pingPeriod)
defer ticker.Stop()
for {
select {
case <-ctx.Done():
log.Println("ping ticker canceled by context")
return
case <-ticker.C:
wsClient.writeChan <- Message{
MessageType: websocket.PingMessage,
Data: []byte{},
}
}
}
}
func (wsClient *SafeWebsocketClient) triggerReconnect() {
select {
case wsClient.reconnectCh <- struct{}{}:
default:
}
}
func (wsClient *SafeWebsocketClient) ReconnectChannel() <-chan struct{} { func (wsClient *SafeWebsocketClient) ReconnectChannel() <-chan struct{} {
reconnectCh := make(chan struct{}, 1) reconnectCh := make(chan struct{}, 1)
wsClient.mu.WriteHandler(func() error { wsClient.mu.WriteHandler(func() error {

View File

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

View File

@@ -0,0 +1,28 @@
package main
import (
"syscall"
)
func setMaxRLimit() {
var rLimit syscall.Rlimit
if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
panic(err)
}
rLimit.Cur = rLimit.Max
if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
panic(err)
}
}
func main() {
setMaxRLimit()
// pooler, err := netpool.New()
// http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
// if _, _, _, err := ws.UpgradeHTTP(r, w); err != nil {
// log.Fatal(err)
// }
// })
// epoller, err := MkEp
}

View File

@@ -17,8 +17,9 @@ func main() {
s, err := server.NewSafeWebsocketServerBuilder(). s, err := server.NewSafeWebsocketServerBuilder().
BaseHost("localhost"). BaseHost("localhost").
BasePort(8080). BasePort(8080).
ApiKey("abcd").
HandleFuncWebsocket("/ws/test/", "data_1", func(c chan []byte) { 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 { for range ticker.C {
jsonBytes, err := json.Marshal(ExampleData{ jsonBytes, err := json.Marshal(ExampleData{
Time: time.Now(), Time: time.Now(),
@@ -31,7 +32,7 @@ func main() {
} }
}). }).
HandleFuncWebsocket("/ws/test/", "data_2", func(c chan []byte) { 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 { for range ticker.C {
jsonBytes, err := json.Marshal(ExampleData{ jsonBytes, err := json.Marshal(ExampleData{
Time: time.Now(), Time: time.Now(),

View File

@@ -1,18 +1,32 @@
package server package server
import ( import (
"crypto/subtle"
"fmt" "fmt"
"log" "log"
"net/http" "net/http"
"strings" "strings"
"syscall"
"git.neurocipta.com/rogerferdinan/safe-web-socket/internal" "git.neurocipta.com/rogerferdinan/safe-web-socket/internal"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
) )
func setMaxRLimit() {
var rLimit syscall.Rlimit
if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
panic(err)
}
rLimit.Cur = rLimit.Max
if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
panic(err)
}
}
type SafeWebsocketServerBuilder struct { type SafeWebsocketServerBuilder struct {
baseHost *string `nil_checker:"required"` baseHost *string `nil_checker:"required"`
basePort *uint16 `nil_checker:"required"` basePort *uint16 `nil_checker:"required"`
apiKey *string `nil_checker:"required"`
upgrader *websocket.Upgrader `nil_checker:"required"` upgrader *websocket.Upgrader `nil_checker:"required"`
mux *http.ServeMux `nil_checker:"required"` mux *http.ServeMux `nil_checker:"required"`
} }
@@ -40,19 +54,22 @@ func (b *SafeWebsocketServerBuilder) BasePort(basePort uint16) *SafeWebsocketSer
return b return b
} }
func (b *SafeWebsocketServerBuilder) HandleFunc( func (b *SafeWebsocketServerBuilder) ApiKey(apiKey string) *SafeWebsocketServerBuilder {
pattern string, fn func(http.ResponseWriter, *http.Request), b.apiKey = &apiKey
) *SafeWebsocketServerBuilder { return b
}
func (b *SafeWebsocketServerBuilder) HandleFunc(pattern string, fn func(http.ResponseWriter, *http.Request)) *SafeWebsocketServerBuilder {
b.mux.HandleFunc(pattern, fn) b.mux.HandleFunc(pattern, fn)
return b return b
} }
func (b *SafeWebsocketServerBuilder) HandleFuncWebsocket( func (b *SafeWebsocketServerBuilder) HandleFuncWebsocket(pattern string, subscribedPath string, writeFunc func(writeChannel chan []byte)) *SafeWebsocketServerBuilder {
pattern string, subscribedPath string, writeFunc func(chan []byte),
) *SafeWebsocketServerBuilder {
h := internal.NewHub() h := internal.NewHub()
h.Run() h.Run()
go writeFunc(h.Broadcast)
b.mux.HandleFunc(pattern+subscribedPath, func(w http.ResponseWriter, r *http.Request) { b.mux.HandleFunc(pattern+subscribedPath, func(w http.ResponseWriter, r *http.Request) {
conn, err := b.upgrader.Upgrade(w, r, nil) conn, err := b.upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
@@ -67,9 +84,10 @@ func (b *SafeWebsocketServerBuilder) HandleFuncWebsocket(
} }
c := internal.NewClient(conn, subscribedPath) c := internal.NewClient(conn, subscribedPath)
h.Register <- c h.Register <- c
go internal.WritePump(c, h) go internal.WritePump(c, h)
go internal.ReadPump(c, h) go internal.ReadPump(c, h)
go writeFunc(h.Broadcast)
}) })
return b return b
} }
@@ -79,22 +97,41 @@ func (b *SafeWebsocketServerBuilder) Build() (*SafeWebsocketServer, error) {
return nil, err return nil, err
} }
setMaxRLimit()
safeServer := SafeWebsocketServer{ safeServer := SafeWebsocketServer{
url: fmt.Sprintf("%s:%d", *b.baseHost, *b.basePort),
mux: b.mux, mux: b.mux,
url: fmt.Sprintf("%s:%d", *b.baseHost, *b.basePort),
apiKey: *b.apiKey,
} }
return &safeServer, nil return &safeServer, nil
} }
type SafeWebsocketServer struct { type SafeWebsocketServer struct {
hub *internal.Hub
mux *http.ServeMux mux *http.ServeMux
url string url string
apiKey string
}
func (s *SafeWebsocketServer) AuthMiddleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
providedKey := r.Header.Get("X-MBX-APIKEY")
expectedKey := s.apiKey
if subtle.ConstantTimeCompare([]byte(providedKey), []byte(expectedKey)) != 1 {
internal.ErrorResponse(w, internal.NewStatusMessage().
StatusCode(http.StatusForbidden).
Message("X-MBX-APIKEY is missing").
Build())
return
}
next.ServeHTTP(w, r)
})
} }
func (s *SafeWebsocketServer) ListenAndServe() error { func (s *SafeWebsocketServer) ListenAndServe() error {
log.Printf("HTTP serve on %s\n", s.url) log.Printf("HTTP serve on %s\n", s.url)
if err := http.ListenAndServe(s.url, s.mux); err != nil { if err := http.ListenAndServe(s.url, s.AuthMiddleware(s.mux)); err != nil {
return fmt.Errorf("failed to serve websocket: %w", err) return fmt.Errorf("failed to serve websocket: %w", err)
} }
return nil return nil