From c73d46169a2326279f473f049878889b08db2d2e Mon Sep 17 00:00:00 2001 From: gospider <2216403312@qq.com> Date: Mon, 6 May 2024 10:53:55 +0800 Subject: [PATCH] sync --- client.go | 2 +- dial.go | 2 +- go.mod | 10 +++++----- go.sum | 10 ++++++++++ requests.go | 4 ++-- tools.go | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/client.go b/client.go index a11845e..542a4b0 100644 --- a/client.go +++ b/client.go @@ -112,7 +112,7 @@ func (obj *Client) do(req *http.Request, option *RequestOption) (resp *http.Resp if err != nil { return resp, fmt.Errorf("failed to parse Location header %q: %v", loc, err) } - ireq, err := newRequestWithContext(req.Context(), http.MethodGet, u, nil) + ireq, err := NewRequestWithContext(req.Context(), http.MethodGet, u, nil) if err != nil { return resp, err } diff --git a/dial.go b/dial.go index 592256b..37346bf 100644 --- a/dial.go +++ b/dial.go @@ -398,7 +398,7 @@ func (obj *DialClient) clientVerifyHttps(ctx context.Context, scheme string, pro return errors.New("clientVerifyHttps not found port") } } - connectReq, err := newRequestWithContext(ctx, http.MethodConnect, &url.URL{Opaque: addr}, nil) + connectReq, err := NewRequestWithContext(ctx, http.MethodConnect, &url.URL{Opaque: addr}, nil) if err != nil { return err } diff --git a/go.mod b/go.mod index e3bbdef..8cdc9c2 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,9 @@ require ( github.com/gospider007/ja3 v0.0.0-20240501035452-cf16a59548ef github.com/gospider007/net v0.0.0-20240414111018-b6269c96a78a github.com/gospider007/re v0.0.0-20240227100911-e27255e48eff - github.com/gospider007/tools v0.0.0-20231202084937-8b2bc66f8198 + github.com/gospider007/tools v0.0.0-20240506025307-b6a12cb9b897 github.com/gospider007/websocket v0.0.0-20240331132617-8217ca7a8439 - github.com/refraction-networking/utls v1.6.4 + github.com/refraction-networking/utls v1.6.6 golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f golang.org/x/net v0.24.0 ) @@ -41,10 +41,10 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/crypto v0.22.0 // indirect - golang.org/x/image v0.15.0 // indirect + golang.org/x/image v0.16.0 // indirect golang.org/x/mod v0.17.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect golang.org/x/tools v0.20.0 // indirect ) diff --git a/go.sum b/go.sum index 0625422..9aa2a72 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,8 @@ github.com/gospider007/re v0.0.0-20240227100911-e27255e48eff h1:tiTX2nKAnHZ45Jac github.com/gospider007/re v0.0.0-20240227100911-e27255e48eff/go.mod h1:X58uk0/F3mVskuQOZng0ZKJiAt3ETn0wxuLN//rVZrE= github.com/gospider007/tools v0.0.0-20231202084937-8b2bc66f8198 h1:phk1GNobIIQWL5/G5dtgs35hotucdYv2FScMjlHHZ+Q= github.com/gospider007/tools v0.0.0-20231202084937-8b2bc66f8198/go.mod h1:wiILK6EotceHz/Rnb6ux8PzY3sr5OV+mYuIcbtxpkYI= +github.com/gospider007/tools v0.0.0-20240506025307-b6a12cb9b897 h1:mm5n6R2rpdQdVQQoF3R2G3S9Korqdg/HmSBpDSNbGWY= +github.com/gospider007/tools v0.0.0-20240506025307-b6a12cb9b897/go.mod h1:SSPom4hxk4K/og0XoN/NmiyUxNnbm9kOc308uXXot0w= github.com/gospider007/websocket v0.0.0-20240331132617-8217ca7a8439 h1:0z+HxyPMDgSacyiOrY2dyL+eQ0wsGJDeJP/f7TanU2I= github.com/gospider007/websocket v0.0.0-20240331132617-8217ca7a8439/go.mod h1:c3KpZ5HtL/iiIUG4CrOu0ycSPoJPUjgtNT3cdAfnKa4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -60,6 +62,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/refraction-networking/utls v1.6.4 h1:aeynTroaYn7y+mFtqv8D0bQ4bw0y9nJHneGxJ7lvRDM= github.com/refraction-networking/utls v1.6.4/go.mod h1:2VL2xfiqgFAZtJKeUTlf+PSYFs3Eu7km0gCtXJ3m8zs= +github.com/refraction-networking/utls v1.6.6 h1:igFsYBUJPYM8Rno9xUuDoM5GQrVEqY4llzEXOkL43Ig= +github.com/refraction-networking/utls v1.6.6/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= @@ -94,6 +98,8 @@ golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2 golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8= golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= +golang.org/x/image v0.16.0 h1:9kloLAKhUufZhA12l5fwnx2NZW39/we1UhBesW433jw= +golang.org/x/image v0.16.0/go.mod h1:ugSZItdV4nOxyqp56HmXwH0Ry0nBCpjnZdpDaIHdoPs= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= @@ -119,6 +125,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -130,6 +138,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/requests.go b/requests.go index 6231a6b..20ba009 100644 --- a/requests.go +++ b/requests.go @@ -310,7 +310,7 @@ func (obj *Client) request(ctx context.Context, option *RequestOption) (response return response, tools.WrapError(err, errors.New("tempRequest init body error"), err) } //create request - reqs, err := newRequestWithContext(response.ctx, option.Method, href, body) + reqs, err := NewRequestWithContext(response.ctx, option.Method, href, body) if err != nil { return response, tools.WrapError(errFatal, errors.New("tempRequest 构造request失败"), err) } @@ -363,7 +363,7 @@ func (obj *Client) request(ctx context.Context, option *RequestOption) (response response.response, err = obj.do(reqs, option) response.isNewConn = ctxData.isNewConn if err != nil { - err = tools.WrapError(err, "roundTripper error") + err = tools.WrapError(err, "client do error") return } if response.response == nil { diff --git a/tools.go b/tools.go index 1c449be..e809a27 100644 --- a/tools.go +++ b/tools.go @@ -169,7 +169,7 @@ func httpWrite(r *http.Request, w *bufio.Writer, orderHeaders []string) (err err } return w.Flush() } -func newRequestWithContext(ctx context.Context, method string, u *url.URL, body io.Reader) (*http.Request, error) { +func NewRequestWithContext(ctx context.Context, method string, u *url.URL, body io.Reader) (*http.Request, error) { req := (&http.Request{}).WithContext(ctx) if method == "" { req.Method = http.MethodGet