Skip to content

Commit

Permalink
sync
Browse files Browse the repository at this point in the history
  • Loading branch information
gospider007 committed Jan 4, 2024
1 parent d225f8f commit a6067ae
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 36 deletions.
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ go 1.21.3

require (
github.com/gospider007/bar v0.0.0-20231215084215-956cfa59ce61
github.com/gospider007/bs4 v0.0.0-20231215085603-439260f5a702
github.com/gospider007/bs4 v0.0.0-20240101025928-00848c76b4c5
github.com/gospider007/gson v0.0.0-20231215083934-e7762897c4db
github.com/gospider007/gtls v0.0.0-20231215082710-ea089e961bcc
github.com/gospider007/ja3 v0.0.0-20231218052956-f5775dfbd8c3
github.com/gospider007/net v0.0.0-20231215081728-064725ce355a
github.com/gospider007/gtls v0.0.0-20240104034426-5073ca328e04
github.com/gospider007/ja3 v0.0.0-20240104034350-073c71b66be1
github.com/gospider007/net v0.0.0-20240104034506-5448a8a979e3
github.com/gospider007/re v0.0.0-20231024115818-adfd03636256
github.com/gospider007/tools v0.0.0-20231202084937-8b2bc66f8198
github.com/gospider007/websocket v0.0.0-20231215083826-2227da2a2a13
github.com/gospider007/websocket v0.0.0-20240104034652-af938aeed446
github.com/refraction-networking/utls v1.6.0
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
golang.org/x/net v0.19.0
)

Expand All @@ -22,7 +22,7 @@ require (
github.com/andybalholm/brotli v1.0.6 // indirect
github.com/andybalholm/cascadia v1.3.2 // indirect
github.com/caddyserver/certmagic v0.20.0 // indirect
github.com/cloudflare/circl v1.3.6 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/gospider007/blog v0.0.0-20231121084103-59a004dafccf // indirect
github.com/gospider007/kinds v0.0.0-20231024093643-7a4424f2d30e // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand Down
40 changes: 16 additions & 24 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsVi
github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
github.com/caddyserver/certmagic v0.20.0 h1:bTw7LcEZAh9ucYCRXyCpIrSAGplplI0vGYJ4BpCQ/Fc=
github.com/caddyserver/certmagic v0.20.0/go.mod h1:N4sXgpICQUskEWpj7zVzvWD41p3NYacrNoZYiRM2jTg=
github.com/cloudflare/circl v1.3.6 h1:/xbKIqSHbZXHwkhbrhrt2YOHIwYJlXH94E3tI/gDlUg=
github.com/cloudflare/circl v1.3.6/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand All @@ -21,32 +21,30 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/pprof v0.0.0-20231205033806-a5a03c77bf08 h1:PxlBVtIFHR/mtWk2i0gTEdCz+jBnqiuHNSki0epDbVs=
github.com/google/pprof v0.0.0-20231205033806-a5a03c77bf08/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
github.com/google/pprof v0.0.0-20231212022811-ec68065c825e h1:bwOy7hAFd0C91URzMIEBfr6BAz29yk7Qj0cy6S7DJlU=
github.com/google/pprof v0.0.0-20231212022811-ec68065c825e/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
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-20231215085603-439260f5a702 h1:VJ81oFNgaEFPD/aI1ch0OOuNmaS/ky/aADy1CCsQCUk=
github.com/gospider007/bs4 v0.0.0-20231215085603-439260f5a702/go.mod h1:/Kd0QEWHP0QkP/sI/V8R/JLu3GHxtSf6qR+fr1qdNoY=
github.com/gospider007/bs4 v0.0.0-20240101025928-00848c76b4c5 h1:DVGyxDUAwFed1RkaGKyIOZdB7ezQbJi0FVshnQQfwec=
github.com/gospider007/bs4 v0.0.0-20240101025928-00848c76b4c5/go.mod h1:/Kd0QEWHP0QkP/sI/V8R/JLu3GHxtSf6qR+fr1qdNoY=
github.com/gospider007/gson v0.0.0-20231215083934-e7762897c4db h1:EXDXNnZ1jizcq39yUv/svUD4snk9fR67e5aN5sFni0I=
github.com/gospider007/gson v0.0.0-20231215083934-e7762897c4db/go.mod h1:tL+3YduR/6ofo4cdv4lpBw5+nph0OJ11x1uOKLyo9Ro=
github.com/gospider007/gtls v0.0.0-20231215082710-ea089e961bcc h1:69I4vx/fPY5A0EV2Mxf97iCY7ttBsCXWt6U3B0XRZwE=
github.com/gospider007/gtls v0.0.0-20231215082710-ea089e961bcc/go.mod h1:QoA/cKZfGzg2uNG6SqE/alXi1ONl5l17jOUn0+p/aQc=
github.com/gospider007/ja3 v0.0.0-20231216073617-0c1a87228845 h1:lVoHp1YqpwoZJgBnzj8VupzNBqWVS4lggTWoFAIx03I=
github.com/gospider007/ja3 v0.0.0-20231216073617-0c1a87228845/go.mod h1:wqFAnfFI26Dc8nM4vSFUuP3Lylf4OHSEztUCdhRb4A0=
github.com/gospider007/ja3 v0.0.0-20231218052956-f5775dfbd8c3 h1:XAUW+PhkTPwpFZKkQ9/Hf8u4KPTlRKaZL7/bhc5foko=
github.com/gospider007/ja3 v0.0.0-20231218052956-f5775dfbd8c3/go.mod h1:dZtxNhm9/A5fhukvXfVZY3ZN+TCjQt1ObzsWQp/zLQQ=
github.com/gospider007/gtls v0.0.0-20240104034426-5073ca328e04 h1:iAmk4YVKoOllDO9LryTAMWUgjEAALG1KYWLiRim+LfI=
github.com/gospider007/gtls v0.0.0-20240104034426-5073ca328e04/go.mod h1:3yfOTfRE03+Itp1M+paIy+AJVVpoTFyRyqJboTNLrSg=
github.com/gospider007/ja3 v0.0.0-20240104034350-073c71b66be1 h1:NU1aqbSjMkUt6h8Zi0djuOwsMBsc/9uwiCF3mNE3uMw=
github.com/gospider007/ja3 v0.0.0-20240104034350-073c71b66be1/go.mod h1:HOb9iaH7Dp3Yfv0Pxo9v2xL6juIyXWSblsKPHIAp44s=
github.com/gospider007/kinds v0.0.0-20231024093643-7a4424f2d30e h1:lmX6IQKkrNDbXfHsvrv1Uz0MoG2v5+4VC6Gdh9irUNY=
github.com/gospider007/kinds v0.0.0-20231024093643-7a4424f2d30e/go.mod h1:nB4OMmd8Ji92yEmgjbHcqLcBHTAhSSmlGNb2JpTYK9A=
github.com/gospider007/net v0.0.0-20231215081728-064725ce355a h1:ZQFHnC3rVqKCVud2nhWLbwrz81PGQAiqnYH8h0a0QMY=
github.com/gospider007/net v0.0.0-20231215081728-064725ce355a/go.mod h1:SpSZEVVotfx4jMj0gv2NsmW1UhAg7RvhC01jbmYrEWg=
github.com/gospider007/net v0.0.0-20240104034506-5448a8a979e3 h1:eY2J1hf9k6djbyOA381SiQRFN2/m8IYFtzsMzIFvOlg=
github.com/gospider007/net v0.0.0-20240104034506-5448a8a979e3/go.mod h1:zIL9nqjoT2IJdR8+Bd0kfRf3jgPhfDQWJQSAPutRBh4=
github.com/gospider007/re v0.0.0-20231024115818-adfd03636256 h1:Z6kHRANoWB+/4rDzq51vBts0rIXilDrF8pdRNmbMJi4=
github.com/gospider007/re v0.0.0-20231024115818-adfd03636256/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/websocket v0.0.0-20231215083826-2227da2a2a13 h1:s+qc8TnHAcc97Si5m3mpl+Q2YYm7aFEn+qElRLELisM=
github.com/gospider007/websocket v0.0.0-20231215083826-2227da2a2a13/go.mod h1:9KISQz9TF5iN04Ieuaa8N5g5pe2ZC4TJlqAq64/SI0U=
github.com/gospider007/websocket v0.0.0-20240104034652-af938aeed446 h1:JmTBH/ow7RAxM+dW3XuV3GOEnnP10s9wX6lDzN+6NtE=
github.com/gospider007/websocket v0.0.0-20240104034652-af938aeed446/go.mod h1:yFlXngTH3Vh3LMNGpYCaK41Ruv+zEScL9zZ2AmhzBbo=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
Expand Down Expand Up @@ -75,8 +73,6 @@ 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/quic-go/quic-go v0.40.1 h1:X3AGzUNFs0jVuO3esAGnTfvdgvL4fq655WaOi1snv1Q=
github.com/quic-go/quic-go v0.40.1/go.mod h1:PeN7kuVJ4xZbxSv/4OX6S1USOX8MJvydwpTx31vx60c=
github.com/refraction-networking/utls v1.5.5-0.20231216063210-c4ba3ff3af8d h1:dcwi0PDpFqcZ+PgPvQjcz7VNZM3yMeGvv2L162fn3IQ=
github.com/refraction-networking/utls v1.5.5-0.20231216063210-c4ba3ff3af8d/go.mod h1:kHJ6R9DFFA0WsRgBM35iiDku4O7AqPR6y79iuzW7b10=
github.com/refraction-networking/utls v1.6.0 h1:X5vQMqVx7dY7ehxxqkFER/W6DSjy8TMqSItXm8hRDYQ=
github.com/refraction-networking/utls v1.6.0/go.mod h1:kHJ6R9DFFA0WsRgBM35iiDku4O7AqPR6y79iuzW7b10=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand Down Expand Up @@ -112,14 +108,10 @@ go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 h1:qCEDpW1G+vcj3Y7Fy52pEM1AWm3abj8WimGYejI3SC4=
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4=
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4=
golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
Expand Down
5 changes: 0 additions & 5 deletions response.go
Original file line number Diff line number Diff line change
Expand Up @@ -281,13 +281,8 @@ func (obj *Response) ReadBody() (err error) {
bar: bar.NewClient(obj.response.ContentLength),
body: bBody,
}, obj.response.Body)
// err = tools.CopyWitchContext(obj.response.Request.Context(), &barBody{
// bar: bar.NewClient(obj.response.ContentLength),
// body: bBody,
// }, obj.response.Body)
} else {
_, err = io.Copy(bBody, obj.response.Body)
// err = tools.CopyWitchContext(obj.ctx, bBody, obj.response.Body)
}
if err != nil {
obj.ForceCloseConn()
Expand Down
30 changes: 30 additions & 0 deletions test/cookies/setCookies_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package main

import (
"context"
"log"
"net/http"
"testing"

"github.com/gospider007/requests"
)

func TestSetCookies(t *testing.T) {
session, _ := requests.NewClient(context.TODO())

_, err := session.Get(context.TODO(), "https://www.baidu.com")
if err != nil {
log.Panic(err)
}
_, err = session.Get(context.TODO(), "https://www.baidu.com", requests.RequestOption{
RequestCallBack: func(ctx context.Context, request *http.Request, response *http.Response) error {
if request.Cookies() == nil {
log.Panic("cookie is nil")
}
return nil
},
})
if err != nil {
log.Panic(err)
}
}

0 comments on commit a6067ae

Please sign in to comment.