good morning!!!!

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

revert

parent b71d3313
Branches
Tags v0.0.18
No related merge requests found
...@@ -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(ctx context.Context) (ServerCodec, error) { return newClient(ctx, func(cctx context.Context) (ServerCodec, error) {
conn, resp, err := websocket.Dial(ctx, endpoint, opts) conn, resp, err := websocket.Dial(cctx, endpoint, opts)
if err != nil { if err != nil {
hErr := wsHandshakeError{err: err} hErr := wsHandshakeError{err: err}
if resp != nil { if resp != nil {
......
...@@ -12,13 +12,13 @@ import ( ...@@ -12,13 +12,13 @@ import (
var jzon = jsoniter.Config{ var jzon = jsoniter.Config{
IndentionStep: 0, IndentionStep: 0,
MarshalFloatWith6Digits: false, MarshalFloatWith6Digits: false,
EscapeHTML: true, EscapeHTML: false,
SortMapKeys: false, SortMapKeys: false,
UseNumber: false, UseNumber: false,
DisallowUnknownFields: false, DisallowUnknownFields: false,
TagKey: "", TagKey: "",
OnlyTaggedField: false, OnlyTaggedField: false,
ValidateJsonRawMessage: true, ValidateJsonRawMessage: false,
ObjectFieldMustBeSimpleString: false, ObjectFieldMustBeSimpleString: false,
CaseSensitive: false, CaseSensitive: false,
}.Froze() }.Froze()
...@@ -37,15 +37,12 @@ func read(ctx context.Context, c *websocket.Conn, v interface{}) (err error) { ...@@ -37,15 +37,12 @@ func read(ctx context.Context, c *websocket.Conn, v interface{}) (err error) {
if err != nil { if err != nil {
return err return err
} }
b := bufpool.GetStd() b := bufpool.GetStd()
defer bufpool.PutStd(b) defer bufpool.PutStd(b)
_, err = b.ReadFrom(r) _, err = b.ReadFrom(r)
if err != nil { if err != nil {
return err return err
} }
err = jzon.Unmarshal(b.Bytes(), v) err = jzon.Unmarshal(b.Bytes(), v)
if err != nil { if err != nil {
return fmt.Errorf("failed to unmarshal JSON: %w", err) return fmt.Errorf("failed to unmarshal JSON: %w", err)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment