fix: readPump and writePump hotfix
This commit is contained in:
82
v1/client/client.go
Normal file
82
v1/client/client.go
Normal file
@@ -0,0 +1,82 @@
|
||||
package client
|
||||
|
||||
// import (
|
||||
// "context"
|
||||
// "fmt"
|
||||
// "time"
|
||||
|
||||
// "git.neurocipta.com/rogerferdinan/safe-web-socket/internal"
|
||||
// "github.com/gorilla/websocket"
|
||||
// )
|
||||
|
||||
// const (
|
||||
// pingPeriod = 30 * time.Second
|
||||
// )
|
||||
|
||||
// type SafeWebsocketClientBuilder struct {
|
||||
// baseHost *string `nil_checker:"required"`
|
||||
// basePort *uint16 `nil_checker:"required"`
|
||||
// }
|
||||
|
||||
// func NewSafeWebsocketClientBuilder() *SafeWebsocketClientBuilder {
|
||||
// return &SafeWebsocketClientBuilder{}
|
||||
// }
|
||||
|
||||
// func (b *SafeWebsocketClientBuilder) BaseHost(host string) *SafeWebsocketClientBuilder {
|
||||
// b.baseHost = &host
|
||||
// return b
|
||||
// }
|
||||
|
||||
// func (b *SafeWebsocketClientBuilder) BasePort(port uint16) *SafeWebsocketClientBuilder {
|
||||
// b.basePort = &port
|
||||
// return b
|
||||
// }
|
||||
|
||||
// func (b *SafeWebsocketClientBuilder) Build() (*SafeWebsocketClient, error) {
|
||||
// if err := internal.NilChecker(b); err != nil {
|
||||
// return nil, err
|
||||
// }
|
||||
|
||||
// ctx, cancel := context.WithCancel(context.Background())
|
||||
|
||||
// wsClient := SafeWebsocketClient{
|
||||
// baseHost: b.baseHost,
|
||||
// basePort: b.basePort,
|
||||
// ctx: ctx,
|
||||
// cancel: cancel,
|
||||
// reconnectCh: make(chan struct{}, 1),
|
||||
// isConnected: false,
|
||||
// }
|
||||
|
||||
// if err := wsClient.connect(); err != nil {
|
||||
// cancel()
|
||||
// return nil, fmt.Errorf("failed to establish initial connection: %v", err)
|
||||
// }
|
||||
|
||||
// wsClient.startPingTicker()
|
||||
// wsClient.startReceiveHandler()
|
||||
|
||||
// return &wsClient, nil
|
||||
// }
|
||||
|
||||
// type SafeWebsocketClient struct {
|
||||
// baseHost *string
|
||||
// basePort *uint16
|
||||
// mu *internal.CustomRwMutex
|
||||
// ctx context.Context
|
||||
// cancel context.CancelFunc
|
||||
// reconnectCh chan struct{}
|
||||
// isConnected bool
|
||||
// }
|
||||
|
||||
// func (wsClient *SafeWebsocketClient) connect() error {
|
||||
// url := fmt.Sprintf("%s:%d", *wsClient.baseHost, *wsClient.basePort)
|
||||
// conn, _, err := websocket.DefaultDialer.Dial(url, nil)
|
||||
// if err != nil {
|
||||
// return fmt.Errorf("failed to connect to %s: %w", *wsClient.baseHost, err)
|
||||
// }
|
||||
|
||||
// conn.SetPingHandler(func(pingData string) error {
|
||||
// conn.WriteMessage(websocket.PongMessage, []byte(pingData))
|
||||
// })
|
||||
// }
|
||||
@@ -12,13 +12,13 @@ func main() {
|
||||
BaseHost("localhost").
|
||||
BasePort(8080).
|
||||
HandleFuncWebsocket("/ws/test/", "data_1", func(c chan []byte) {
|
||||
ticker := time.NewTicker(100 * time.Millisecond)
|
||||
ticker := time.NewTicker(10 * time.Millisecond)
|
||||
for range ticker.C {
|
||||
c <- []byte(time.Now().Format("2006-01-02 15:04:05") + "_data_1")
|
||||
}
|
||||
}).
|
||||
HandleFuncWebsocket("/ws/test/", "data_2", func(c chan []byte) {
|
||||
ticker := time.NewTicker(100 * time.Millisecond)
|
||||
ticker := time.NewTicker(10 * time.Millisecond)
|
||||
for range ticker.C {
|
||||
c <- []byte(time.Now().Format("2006-01-02 15:04:05") + "_data_2")
|
||||
}
|
||||
|
||||
@@ -70,9 +70,9 @@ func (b *SafeWebsocketServerBuilder) HandleFuncWebsocket(
|
||||
}
|
||||
c := internal.NewClient(conn, subscribedPath)
|
||||
h.Register <- c
|
||||
internal.WritePump(c, h)
|
||||
internal.ReadPump(c)
|
||||
writeFunc(h.Broadcast)
|
||||
go internal.WritePump(c, h)
|
||||
go internal.ReadPump(c, h)
|
||||
go writeFunc(h.Broadcast)
|
||||
})
|
||||
return b
|
||||
}
|
||||
@@ -85,7 +85,6 @@ func (b *SafeWebsocketServerBuilder) Build() (*SafeWebsocketServer, error) {
|
||||
safeServer := SafeWebsocketServer{
|
||||
url: fmt.Sprintf("%s:%d", *b.baseHost, *b.basePort),
|
||||
mux: b.mux,
|
||||
mu: internal.NewCustomRwMutex(),
|
||||
}
|
||||
return &safeServer, nil
|
||||
}
|
||||
@@ -94,7 +93,6 @@ type SafeWebsocketServer struct {
|
||||
hub *internal.Hub
|
||||
mux *http.ServeMux
|
||||
url string
|
||||
mu *internal.CustomRwMutex
|
||||
}
|
||||
|
||||
func (s *SafeWebsocketServer) ListenAndServe() error {
|
||||
|
||||
Reference in New Issue
Block a user