From 822582edf9025fdef690e5ae090f337969ddf928 Mon Sep 17 00:00:00 2001 From: gospider <2216403312@qq.com> Date: Mon, 9 Dec 2024 20:50:42 +0800 Subject: [PATCH] sync --- go.mod | 12 ++++++------ go.sum | 28 ++++++++++++---------------- requests.go | 2 +- response.go | 19 +------------------ test/protocol/http2_test.go | 10 ++++++++++ 5 files changed, 30 insertions(+), 41 deletions(-) diff --git a/go.mod b/go.mod index 2397941..f98952b 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/gospider007/requests go 1.23.0 require ( - github.com/gospider007/bar v0.0.0-20231215084215-956cfa59ce61 - github.com/gospider007/bs4 v0.0.0-20241120020109-42eda1e01a18 + github.com/gospider007/bar v0.0.0-20241205091858-06f3c7e16dd9 + github.com/gospider007/bs4 v0.0.0-20241205092056-32204f68d82e github.com/gospider007/gson v0.0.0-20240912023741-2238f9748e4a github.com/gospider007/gtls v0.0.0-20240527084326-e580531eb89e - github.com/gospider007/http2 v0.0.0-20241205082628-c23dc6cfc75c + github.com/gospider007/http2 v0.0.0-20241209124643-ab437692e699 github.com/gospider007/http3 v0.0.0-20241127000428-49c74ea8f814 github.com/gospider007/ja3 v0.0.0-20240620005139-f0602f169903 github.com/gospider007/re v0.0.0-20240227100911-e27255e48eff @@ -34,8 +34,8 @@ require ( github.com/gaukas/godicttls v0.0.4 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/google/gopacket v1.1.19 // indirect - github.com/google/pprof v0.0.0-20241203143554-1e3fdc7de467 // indirect - github.com/gospider007/blog v0.0.0-20231121084103-59a004dafccf // indirect + github.com/google/pprof v0.0.0-20241206021119-61a79c692802 // indirect + github.com/gospider007/blog v0.0.0-20241205091827-6bcaf48620d4 // indirect github.com/gospider007/kinds v0.0.0-20240929092451-8f867acde255 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -46,7 +46,7 @@ require ( github.com/klauspost/pgzip v1.2.6 // indirect github.com/libdns/libdns v0.2.2 // indirect github.com/mholt/acmez/v2 v2.0.3 // indirect - github.com/mholt/archives v0.0.0-20241203232558-998c9622f6b8 // indirect + github.com/mholt/archives v0.0.0-20241207175349-5e373c52f8aa // indirect github.com/miekg/dns v1.1.62 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect diff --git a/go.sum b/go.sum index 4517f72..8344221 100644 --- a/go.sum +++ b/go.sum @@ -58,7 +58,6 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -89,27 +88,25 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20241203143554-1e3fdc7de467 h1:keEZFtbLJugfE0qHn+Ge1JCE71spzkchQobDf3mzS/4= -github.com/google/pprof v0.0.0-20241203143554-1e3fdc7de467/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20241206021119-61a79c692802 h1:US08AXzP0bLurpzFUV3Poa9ZijrRdd1zAIOVtoHEiS8= +github.com/google/pprof v0.0.0-20241206021119-61a79c692802/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= -github.com/gospider007/bar v0.0.0-20231215084215-956cfa59ce61 h1:XS7tOVjv207CKZTR+o5mSlxjP4FLfaaTkTZ11mCHL2U= -github.com/gospider007/bar v0.0.0-20231215084215-956cfa59ce61/go.mod h1:aYPgmG9340i9x9VQZhf34/XtIj7PHDTq0wSO+7zU/8s= -github.com/gospider007/blog v0.0.0-20231121084103-59a004dafccf h1:1laTsuH/wl5pZ5QlHzacX09QzvwQw0DFENoRMpGBK8Y= -github.com/gospider007/blog v0.0.0-20231121084103-59a004dafccf/go.mod h1:CCJ+hvQ0kxL+qB/Wfr1xt7xspsG4XiczhnAPVxG2m3M= -github.com/gospider007/bs4 v0.0.0-20241120020109-42eda1e01a18 h1:X0VOdziaqSlQzJLYrbPoYAZW4I1ub3rWTtQYzHIc6xE= -github.com/gospider007/bs4 v0.0.0-20241120020109-42eda1e01a18/go.mod h1:4f04luriR/6gaBqfyUFC7jgSlrlu6YJj6/ya9llb5M0= +github.com/gospider007/bar v0.0.0-20241205091858-06f3c7e16dd9 h1:mKDRxvZNftY8msmyonqGLlTAbCUYTJNYbX5Ha0REwzs= +github.com/gospider007/bar v0.0.0-20241205091858-06f3c7e16dd9/go.mod h1:dZ50Fil3qVmYCGGR9hne3RwgZRfZj+NZQE7NaKBNdPI= +github.com/gospider007/blog v0.0.0-20241205091827-6bcaf48620d4 h1:MA0vcRGiy5JPlQYPU9wg7reG4dZkW3v5Q/DVtAUJ6yQ= +github.com/gospider007/blog v0.0.0-20241205091827-6bcaf48620d4/go.mod h1:y7eLYgD+hFH2v8qrlrO5KtFTGwYxQaQuWyGAuZh7QHU= +github.com/gospider007/bs4 v0.0.0-20241205092056-32204f68d82e h1:9qj2iMbPkuY2VeXplp3mF3dfDJdhZMWZPVLK9BNGJW8= +github.com/gospider007/bs4 v0.0.0-20241205092056-32204f68d82e/go.mod h1:5QNzcd53FL191TUMzWq502w+dEICQGgrRuc9GHzeCCo= github.com/gospider007/gson v0.0.0-20240912023741-2238f9748e4a h1:Gu0mPyLzS27Ij6Chr/HDFUs36yTegGUt1kNsqbXligY= github.com/gospider007/gson v0.0.0-20240912023741-2238f9748e4a/go.mod h1:nz5cp3n/fquuXqhHdpamPnOJz/yBEKuOGsFfezpr3f8= github.com/gospider007/gtls v0.0.0-20240527084326-e580531eb89e h1:3bTAtZx+JstbWbTVRd4DivK7QDf6cJwBpWUJpVAgyjY= github.com/gospider007/gtls v0.0.0-20240527084326-e580531eb89e/go.mod h1:pUD3WKesQAdqD1W8O3v03qRYyq760iPNE8IPEILf52Y= -github.com/gospider007/http2 v0.0.0-20241124010135-caaf1749745b h1:qRpUCl+MzzjPxkZQ99wt8UY60bSckJ624j0GN8wq/QI= -github.com/gospider007/http2 v0.0.0-20241124010135-caaf1749745b/go.mod h1:pyzs3hnbrKDH/IcQN+kVxqEXJHNzEWs6Londu7MXGoE= -github.com/gospider007/http2 v0.0.0-20241205082628-c23dc6cfc75c h1:2CFs+N+ctFePWnZFCJCe7LEoL4kXYzuc+1QWCb18xkw= -github.com/gospider007/http2 v0.0.0-20241205082628-c23dc6cfc75c/go.mod h1:Fzc6H3i0C62TXC75PqZp1zY8RrRc/DBcoJ9cMFBD4/c= +github.com/gospider007/http2 v0.0.0-20241209124643-ab437692e699 h1:lSuSp9gkWVF8ASL72I7hQJxIi5dDhmx3OXmrgjbzmdU= +github.com/gospider007/http2 v0.0.0-20241209124643-ab437692e699/go.mod h1:2Q7Wo7Kl+HIBVq04kxuClLYscZVIycb5v1nGmmF3AyQ= github.com/gospider007/http3 v0.0.0-20241127000428-49c74ea8f814 h1:OIDaWoUBwWpj088inYnbyY0WZA3ffuymugYKleJqMPs= github.com/gospider007/http3 v0.0.0-20241127000428-49c74ea8f814/go.mod h1:8WGFilhW0cQMXhbxZUtUh0VxyA/+EAGgHg62ETR13eg= github.com/gospider007/ja3 v0.0.0-20240620005139-f0602f169903 h1:elWGt/rRpoPLc7dsnC8axzXnzAAyNdrtOzOgJ3OxisY= @@ -150,11 +147,10 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/libdns/libdns v0.2.2 h1:O6ws7bAfRPaBsgAYt8MDe2HcNBGC29hkZ9MX2eUSX3s= github.com/libdns/libdns v0.2.2/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ= -github.com/mholt/acmez v1.2.0 h1:1hhLxSgY5FvH5HCnGUuwbKY2VQVo8IU7rxXKSnZ7F30= github.com/mholt/acmez/v2 v2.0.3 h1:CgDBlEwg3QBp6s45tPQmFIBrkRIkBT4rW4orMM6p4sw= github.com/mholt/acmez/v2 v2.0.3/go.mod h1:pQ1ysaDeGrIMvJ9dfJMk5kJNkn7L2sb3UhyrX6Q91cw= -github.com/mholt/archives v0.0.0-20241203232558-998c9622f6b8 h1:cz2IhSw5r/yFNDdn6Ig1gG4MK4PL5BbT/AlUnQTgC2g= -github.com/mholt/archives v0.0.0-20241203232558-998c9622f6b8/go.mod h1:j/Ire/jm42GN7h90F5kzj6hf6ZFzEH66de+hmjEKu+I= +github.com/mholt/archives v0.0.0-20241207175349-5e373c52f8aa h1:SzCiDuxF6489FegHHZe/ktxpRIDhu5IemNnWlW1Fquo= +github.com/mholt/archives v0.0.0-20241207175349-5e373c52f8aa/go.mod h1:j/Ire/jm42GN7h90F5kzj6hf6ZFzEH66de+hmjEKu+I= github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ= github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= diff --git a/requests.go b/requests.go index 4c0b26a..1b3fe92 100644 --- a/requests.go +++ b/requests.go @@ -392,7 +392,7 @@ func (obj *Client) request(ctx context.Context, option *RequestOption) (response return } if response.Body() != nil { - response.rawConn = response.response.Body.(*readWriteCloser) + response.rawConn = response.Body().(*readWriteCloser) } if !response.requestOption.DisUnZip { response.requestOption.DisUnZip = response.response.Uncompressed diff --git a/response.go b/response.go index 73d0cbc..4366f7d 100644 --- a/response.go +++ b/response.go @@ -258,25 +258,8 @@ func (obj *Response) Conn() *connecotr { } return nil } - -type Body struct { - response *Response -} - -func (obj *Body) Read(p []byte) (n int, err error) { - i, err := obj.response.response.Body.Read(p) - if err == io.EOF { - obj.Close() - } - return i, err -} -func (obj *Body) Close() (err error) { - obj.response.CloseBody() - return nil -} - func (obj *Response) Body() io.ReadCloser { - return &Body{response: obj} + return obj.response.Body } // return true if response is stream diff --git a/test/protocol/http2_test.go b/test/protocol/http2_test.go index 5a343f1..823d948 100644 --- a/test/protocol/http2_test.go +++ b/test/protocol/http2_test.go @@ -18,4 +18,14 @@ func TestHttp2(t *testing.T) { if resp.Proto() != "HTTP/2.0" { t.Error("resp.Proto!= HTTP/2.0") } + resp, err = requests.Get(context.TODO(), "https://mp.weixin.qq.com") + if err != nil { + t.Error(err) + } + if resp.StatusCode() != 200 { + t.Error("resp.StatusCode!= 200") + } + if resp.Proto() != "HTTP/2.0" { + t.Error("resp.Proto!= HTTP/2.0") + } }