good morning!!!!

Skip to content
Snippets Groups Projects
Commit b71d3313 authored by a's avatar a
Browse files

ig

parent 74df5b75
No related branches found
No related tags found
No related merge requests found
...@@ -467,7 +467,7 @@ func (c *Client) send(ctx context.Context, op *requestOp, msg any) error { ...@@ -467,7 +467,7 @@ func (c *Client) send(ctx context.Context, op *requestOp, msg any) error {
func (c *Client) write(ctx context.Context, msg any, retry bool) error { func (c *Client) write(ctx context.Context, msg any, retry bool) error {
if c.writeConn == nil { if c.writeConn == nil {
// The previous write failed. Try to establish a new connection. // The previous write failed. Try to establish a new connection.
time.Sleep(500 * time.Millisecond) // time.Sleep(500 * time.Millisecond)
err := c.reconnect(ctx) err := c.reconnect(ctx)
if err != nil { if err != nil {
return err return err
......
...@@ -49,7 +49,7 @@ func (s *Server) WebsocketHandler(allowedOrigins []string) http.Handler { ...@@ -49,7 +49,7 @@ func (s *Server) WebsocketHandler(allowedOrigins []string) http.Handler {
conn, err := websocket.Accept(w, r, &websocket.AcceptOptions{ conn, err := websocket.Accept(w, r, &websocket.AcceptOptions{
OriginPatterns: allowedOrigins, OriginPatterns: allowedOrigins,
CompressionMode: websocket.CompressionContextTakeover, CompressionMode: websocket.CompressionContextTakeover,
CompressionThreshold: 4096, CompressionThreshold: 512,
}) })
if err != nil { if err != nil {
log.Debug().Err(err).Msg("WebSocket upgrade failed") log.Debug().Err(err).Msg("WebSocket upgrade failed")
...@@ -80,8 +80,8 @@ func DialWebsocketWithDialer(ctx context.Context, endpoint, origin string, opts ...@@ -80,8 +80,8 @@ func DialWebsocketWithDialer(ctx context.Context, endpoint, origin string, opts
return nil, err return nil, err
} }
opts.HTTPHeader = header opts.HTTPHeader = header
return newClient(ctx, func(cctx context.Context) (ServerCodec, error) { return newClient(ctx, func(ctx context.Context) (ServerCodec, error) {
conn, resp, err := websocket.Dial(cctx, endpoint, opts) conn, resp, err := websocket.Dial(ctx, endpoint, opts)
if err != nil { if err != nil {
hErr := wsHandshakeError{err: err} hErr := wsHandshakeError{err: err}
if resp != nil { if resp != nil {
...@@ -106,7 +106,7 @@ func DialWebsocket(ctx context.Context, endpoint, origin string) (*Client, error ...@@ -106,7 +106,7 @@ func DialWebsocket(ctx context.Context, endpoint, origin string) (*Client, error
} }
dialer := &websocket.DialOptions{ dialer := &websocket.DialOptions{
CompressionMode: websocket.CompressionContextTakeover, CompressionMode: websocket.CompressionContextTakeover,
CompressionThreshold: 4096, CompressionThreshold: 512,
HTTPHeader: header, HTTPHeader: header,
} }
return DialWebsocketWithDialer(ctx, endpoint, origin, dialer) return DialWebsocketWithDialer(ctx, endpoint, origin, dialer)
...@@ -160,10 +160,10 @@ func heartbeat(ctx context.Context, c *websocket.Conn, d time.Duration) { ...@@ -160,10 +160,10 @@ func heartbeat(ctx context.Context, c *websocket.Conn, d time.Duration) {
func newWebsocketCodec(ctx context.Context, c *websocket.Conn, host string, req http.Header) ServerCodec { func newWebsocketCodec(ctx context.Context, c *websocket.Conn, host string, req http.Header) ServerCodec {
c.SetReadLimit(wsMessageSizeLimit) c.SetReadLimit(wsMessageSizeLimit)
jsonWriter := func(v any) error { jsonWriter := func(v any) error {
return wsjson.Write(context.Background(), c, v) return wsjson.Write(ctx, c, v)
} }
jsonReader := func(v any) error { jsonReader := func(v any) error {
return wsjson.Read(context.Background(), c, v) return wsjson.Read(ctx, c, v)
} }
conn := websocket.NetConn(ctx, c, websocket.MessageText) conn := websocket.NetConn(ctx, c, websocket.MessageText)
wc := &websocketCodec{ wc := &websocketCodec{
......
...@@ -18,7 +18,7 @@ var jzon = jsoniter.Config{ ...@@ -18,7 +18,7 @@ var jzon = jsoniter.Config{
DisallowUnknownFields: false, DisallowUnknownFields: false,
TagKey: "", TagKey: "",
OnlyTaggedField: false, OnlyTaggedField: false,
ValidateJsonRawMessage: false, ValidateJsonRawMessage: true,
ObjectFieldMustBeSimpleString: false, ObjectFieldMustBeSimpleString: false,
CaseSensitive: false, CaseSensitive: false,
}.Froze() }.Froze()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment