diff --git a/websocket.go b/websocket.go index 67a479fd003d2f17d3f54b90a27606a32cef6c59..8b4c86d05cc1fb9ff82ed24e30480f7daba32ced 100644 --- a/websocket.go +++ b/websocket.go @@ -80,8 +80,8 @@ func DialWebsocketWithDialer(ctx context.Context, endpoint, origin string, opts return nil, err } opts.HTTPHeader = header - return newClient(ctx, func(ctx context.Context) (ServerCodec, error) { - conn, resp, err := websocket.Dial(ctx, endpoint, opts) + return newClient(ctx, func(cctx context.Context) (ServerCodec, error) { + conn, resp, err := websocket.Dial(cctx, endpoint, opts) if err != nil { hErr := wsHandshakeError{err: err} if resp != nil { diff --git a/wsjson/wsjson.go b/wsjson/wsjson.go index c8d91fe3939fbbb0c7b14a2a50a0d137c03913d2..b517dbad956348cc0e386deb71890ff7367edfed 100644 --- a/wsjson/wsjson.go +++ b/wsjson/wsjson.go @@ -12,13 +12,13 @@ import ( var jzon = jsoniter.Config{ IndentionStep: 0, MarshalFloatWith6Digits: false, - EscapeHTML: true, + EscapeHTML: false, SortMapKeys: false, UseNumber: false, DisallowUnknownFields: false, TagKey: "", OnlyTaggedField: false, - ValidateJsonRawMessage: true, + ValidateJsonRawMessage: false, ObjectFieldMustBeSimpleString: false, CaseSensitive: false, }.Froze() @@ -37,15 +37,12 @@ func read(ctx context.Context, c *websocket.Conn, v interface{}) (err error) { if err != nil { return err } - b := bufpool.GetStd() defer bufpool.PutStd(b) - _, err = b.ReadFrom(r) if err != nil { return err } - err = jzon.Unmarshal(b.Bytes(), v) if err != nil { return fmt.Errorf("failed to unmarshal JSON: %w", err)