From eb1e90559ca2ea0ec06a6e402d715a0fb854ee36 Mon Sep 17 00:00:00 2001
From: a <a@a.a>
Date: Sat, 17 Sep 2022 10:59:59 -0500
Subject: [PATCH] revert
---
websocket.go | 4 ++--
wsjson/wsjson.go | 7 ++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/websocket.go b/websocket.go
index 67a479f..8b4c86d 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 c8d91fe..b517dba 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)
--
GitLab