TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-27 01:50:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
GoEdgeLab
2024-04-15 12:20:31 +08:00
parent 184a0cef53
commit 62d7ae55b6
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/nodes/http_cache_task_manager.go
View File

@@ -16,6 +16,7 @@ import (
"github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/goman"
"github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/TeaOSLab/EdgeNode/internal/remotelogs"
"github.com/TeaOSLab/EdgeNode/internal/rpc" "github.com/TeaOSLab/EdgeNode/internal/rpc"
"github.com/TeaOSLab/EdgeNode/internal/utils"
connutils "github.com/TeaOSLab/EdgeNode/internal/utils/conns" connutils "github.com/TeaOSLab/EdgeNode/internal/utils/conns"
"github.com/iwind/TeaGo/Tea" "github.com/iwind/TeaGo/Tea"
"io" "io"
@@ -245,7 +246,9 @@ func (this *HTTPCacheTaskManager) fetchKey(key *pb.HTTPCacheTaskKey) error {
} }
// 读取内容，以便于生成缓存 // 读取内容，以便于生成缓存
_, err = io.Copy(io.Discard, resp.Body) var buf = utils.BytePool16k.Get()
_, err = io.CopyBuffer(io.Discard, resp.Body, buf.Bytes)
utils.BytePool16k.Put(buf)
if err != nil { if err != nil {
if err != io.EOF { if err != io.EOF {
err = this.simplifyErr(err) err = this.simplifyErr(err)

21
internal/nodes/http_request_websocket.go
View File

@@ -128,8 +128,8 @@ func (this *HTTPRequest) doWebsocket(requestHost string, isLastRetry bool) (shou
go func() { go func() {
// 读取第一个响应 // 读取第一个响应
var respReader = NewWebsocketResponseReader(originConn) var respReader = NewWebsocketResponseReader(originConn)
resp, err := http.ReadResponse(bufio.NewReader(respReader), this.RawReq) resp, respErr := http.ReadResponse(bufio.NewReader(respReader), this.RawReq)
if err != nil || resp == nil { if respErr != nil || resp == nil {
if resp != nil && resp.Body != nil { if resp != nil && resp.Body != nil {
_ = resp.Body.Close() _ = resp.Body.Close()
} }
@@ -160,8 +160,8 @@ func (this *HTTPRequest) doWebsocket(requestHost string, isLastRetry bool) (shou
if headerIndex > 0 { if headerIndex > 0 {
var leftBytes = headerBytes[headerIndex+4:] var leftBytes = headerBytes[headerIndex+4:]
if len(leftBytes) > 0 { if len(leftBytes) > 0 {
_, err = clientConn.Write(leftBytes) _, writeErr := clientConn.Write(leftBytes)
if err != nil { if writeErr != nil {
if resp.Body != nil { if resp.Body != nil {
_ = resp.Body.Close() _ = resp.Body.Close()
} }
@@ -181,22 +181,25 @@ func (this *HTTPRequest) doWebsocket(requestHost string, isLastRetry bool) (shou
var buf = utils.BytePool4k.Get() var buf = utils.BytePool4k.Get()
defer utils.BytePool4k.Put(buf) defer utils.BytePool4k.Put(buf)
for { for {
n, err := originConn.Read(buf.Bytes) n, readErr := originConn.Read(buf.Bytes)
if n > 0 { if n > 0 {
this.writer.sentBodyBytes += int64(n) this.writer.sentBodyBytes += int64(n)
_, err = clientConn.Write(buf.Bytes[:n]) _, writeErr := clientConn.Write(buf.Bytes[:n])
if err != nil { if writeErr != nil {
break break
} }
} }
if err != nil { if readErr != nil {
break break
} }
} }
_ = clientConn.Close() _ = clientConn.Close()
_ = originConn.Close() _ = originConn.Close()
}() }()
_, _ = io.Copy(originConn, clientConn)
var buf = utils.BytePool4k.Get()
_, _ = io.CopyBuffer(originConn, clientConn, buf.Bytes)
utils.BytePool4k.Put(buf)
return return
} }

4
internal/waf/action_post_307.go
View File

@@ -119,7 +119,9 @@ func (this *Post307Action) Perform(waf *WAF, group *RuleGroup, set *RuleSet, req
// 清空请求内容 // 清空请求内容
var req = request.WAFRaw() var req = request.WAFRaw()
if req.ContentLength > 0 && req.Body != nil { if req.ContentLength > 0 && req.Body != nil {
_, _ = io.Copy(io.Discard, req.Body) var buf = utils.BytePool16k.Get()
_, _ = io.CopyBuffer(io.Discard, req.Body, buf.Bytes)
utils.BytePool16k.Put(buf)
_ = req.Body.Close() _ = req.Body.Close()
} }