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

Websocket也支持失败自动重试

Browse Source
This commit is contained in:
刘祥超
2022-09-16 09:37:49 +08:00
parent 30bd66958c
commit c0f0ec43bb
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/nodes/http_request_reverse_proxy.go
View File

@@ -240,7 +240,7 @@ func (this *HTTPRequest) doOriginRequest(failedOriginIds []int64, failedLnNodeId
// 判断是否为Websocket请求 // 判断是否为Websocket请求
if this.RawReq.Header.Get("Upgrade") == "websocket" { if this.RawReq.Header.Get("Upgrade") == "websocket" {
this.doWebsocket(requestHost) shouldRetry = this.doWebsocket(requestHost, isLastRetry)
return return
} }

9
internal/nodes/http_request_websocket.go
View File

@@ -9,7 +9,7 @@ import (
) )
// 处理Websocket请求 // 处理Websocket请求
func (this *HTTPRequest) doWebsocket(requestHost string) { func (this *HTTPRequest) doWebsocket(requestHost string, isLastRetry bool) (shouldRetry bool) {
if this.web.WebsocketRef == nil || !this.web.WebsocketRef.IsOn || this.web.Websocket == nil || !this.web.Websocket.IsOn { if this.web.WebsocketRef == nil || !this.web.WebsocketRef.IsOn || this.web.Websocket == nil || !this.web.Websocket.IsOn {
this.writer.WriteHeader(http.StatusForbidden) this.writer.WriteHeader(http.StatusForbidden)
this.addError(errors.New("websocket have not been enabled yet")) this.addError(errors.New("websocket have not been enabled yet"))
@@ -43,13 +43,16 @@ func (this *HTTPRequest) doWebsocket(requestHost string) {
// TODO 增加N次错误重试，重试的时候需要尝试不同的源站 // TODO 增加N次错误重试，重试的时候需要尝试不同的源站
originConn, _, err := OriginConnect(this.origin, this.requestServerPort(), this.RawReq.RemoteAddr, requestHost) originConn, _, err := OriginConnect(this.origin, this.requestServerPort(), this.RawReq.RemoteAddr, requestHost)
if err != nil { if err != nil {
this.write50x(err, http.StatusBadGateway, "Failed to connect origin site", "源站连接失败", false) if isLastRetry {
this.write50x(err, http.StatusBadGateway, "Failed to connect origin site", "源站连接失败", false)
}
// 增加失败次数 // 增加失败次数
SharedOriginStateManager.Fail(this.origin, requestHost, this.reverseProxy, func() { SharedOriginStateManager.Fail(this.origin, requestHost, this.reverseProxy, func() {
this.reverseProxy.ResetScheduling() this.reverseProxy.ResetScheduling()
}) })
shouldRetry = true
return return
} }
@@ -98,4 +101,6 @@ func (this *HTTPRequest) doWebsocket(requestHost string) {
_ = originConn.Close() _ = originConn.Close()
}() }()
_, _ = io.Copy(originConn, clientConn) _, _ = io.Copy(originConn, clientConn)
return
} }