package/requests
1
0
Fork 0
mirror of https://github.com/gospider007/requests.git synced 2025-12-24 13:57:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
gospider
2025-03-27 11:52:20 +08:00
parent 509d46000c
commit 20e1314fbc
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conn.go
View File

@@ -80,7 +80,7 @@ func (obj *connecotr) taskMain(task *reqTask) {
if errors.Is(task.err, errLastTaskRuning) {
task.isNotice = true
}
obj.CloseWithError(tools.WrapError(task.err, errors.New("taskMain close with error")))
obj.CloseWithError(tools.WrapError(task.err, "taskMain close with error"))
}
task.cnl()
if task.err == nil && task.reqCtx.response != nil && task.reqCtx.response.Body != nil {
@@ -197,5 +197,5 @@ func (obj *connPool) rwMain(done chan struct{}, conn *connecotr) {
}
func (obj *connPool) close(err error) {
obj.connPools.del(obj.connKey)
obj.forceCnl(tools.WrapError(err, errors.New("connPool close")))
obj.forceCnl(tools.WrapError(err, "connPool close"))
}

2
http.go
View File

@@ -99,7 +99,7 @@ func (obj *clientConn) send() {
}
}
default:
readErr = tools.WrapError(errLastTaskRuning, errors.New("last task not write done with read done"))
readErr = tools.WrapError(errLastTaskRuning, "last task not write done with read done")
obj.task.err = readErr
obj.CloseWithError(readErr)
return

14
requests.go
View File

@@ -215,7 +215,7 @@ func (obj *Client) request(ctx *Response) (err error) {
if ctx.option.ErrCallBack != nil {
ctx.err = err
if err2 := ctx.option.ErrCallBack(ctx); err2 != nil {
err = tools.WrapError(errFatal, err2)
err = errors.Join(errFatal, err2)
}
}
}
@@ -236,7 +236,7 @@ func (obj *Client) request(ctx *Response) (err error) {
if ctx.option.Proxy != nil {
ctx.proxys, err = parseProxy(ctx.option.Proxy)
if err != nil {
return tools.WrapError(errFatal, errors.New("tempRequest init proxy error"), err)
return errors.Join(errFatal, errors.New("tempRequest init proxy error"), err)
}
}
//init ctx,cnl
@@ -252,7 +252,7 @@ func (obj *Client) request(ctx *Response) (err error) {
ctx.filePath = re.Sub(`^/+`, "", ctx.option.Url.Path)
ctx.content, err = os.ReadFile(ctx.filePath)
if err != nil {
err = tools.WrapError(errFatal, errors.New("read filePath data error"), err)
err = errors.Join(errFatal, errors.New("read filePath data error"), err)
}
return
case "ws":
@@ -277,17 +277,17 @@ func (obj *Client) request(ctx *Response) (err error) {
body = nil
} else {
if body, err = ctx.option.initBody(ctx.ctx); err != nil {
return tools.WrapError(err, errors.New("tempRequest init body error"), err)
return errors.Join(err, errors.New("tempRequest init body error"), err)
}
}
//create request
reqs, err := NewRequestWithContext(ctx.Context(), ctx.option.Method, href, body)
if err != nil {
return tools.WrapError(errFatal, errors.New("tempRequest 构造request失败"), err)
return errors.Join(errFatal, errors.New("tempRequest 构造request失败"), err)
}
//init headers
if reqs.Header, err = ctx.option.initOrderHeaders(); err != nil {
return tools.WrapError(err, errors.New("tempRequest init headers error"), err)
return errors.Join(err, errors.New("tempRequest init headers error"), err)
}
if isWebsocket && reqs.Header.Get("Sec-WebSocket-Key") == "" {
websocket.SetClientHeadersWithOption(reqs.Header, ctx.option.WsOption)
@@ -311,7 +311,7 @@ func (obj *Client) request(ctx *Response) (err error) {
//init cookies
cookies, err := ctx.option.initCookies()
if err != nil {
return tools.WrapError(err, errors.New("tempRequest init cookies error"), err)
return errors.Join(err, errors.New("tempRequest init cookies error"), err)
}
if cookies != nil {
addCookie(reqs, cookies)