Improve proxy logic

Author: Simple-Tracker

README.en.md

@@ -147,7 +147,7 @@ Docker version is configured through the same name variable configuration, which
 | ignoreFailureExit | bool | false | Ignore failure exit. If enabled, it will continue to retry after first detection of the client fails or authentication fails |
 | sleepTime | uint32 | 20 (MicroSec) | Query waiting time of each Torrent Peers. Short interval can make blocking Peer faster but may cause client lag, Long interval can help average CPU usage |
 | timeout | uint32 | 6 (MillSec) | Request timeout. If interval is too short, peer may not be properly blocked. If interval is too long, timeout request will affect blocking other peer |
-| proxy | string | Auto | Use proxy. Set to empty to disable this behavior but still automatically detect proxy on first load |
+| proxy | string | Auto | Use proxy. Proxy will still automatically detect proxy on first load. Empty: Disable proxy; Auto: Automatic (use proxy only for external resources); All: Use proxy |
 | longConnection | bool | true | Long connection. Enable to reduce resource consumption |
 | logPath | string | logs | Log path. Must enable logToFile |
 | logToFile | bool | true | Log general information to file. If enabled, it can be used for general analysis and statistical purposes |

README.md

@@ -147,7 +147,7 @@ Docker 版本通过相同名称的环境变量配置, 通过自动转换环境
 | ignoreFailureExit | bool | false (禁用) | 忽略失败退出. 启用后会使得首次检测客户端失败或认证失败后继续重试 |
 | sleepTime | uint32 | 20 (毫秒) | 查询每个 Torrent Peers 的等待时间. 短间隔可使屏蔽 Peer 更快但可能造成客户端卡顿, 长间隔有助于平均 CPU 资源占用 |
 | timeout | uint32 | 6 (秒) | 请求超时. 过短间隔可能会造成无法正确屏蔽 Peer, 过长间隔会使超时请求影响屏蔽其它 Peer 的性能 |
-| proxy | string | Auto (自动) | 使用代理. 设置为空可以禁止此行为, 但仍会在首次加载配置文件时自动检测代理 |
+| proxy | string | Auto (自动) | 使用代理. 仍会在首次加载配置文件时自动检测代理. 空: 禁止使用代理; Auto: 自动 (仅对外部资源使用代理); All: 使用代理 |
 | longConnection | bool | true (启用) | 长连接. 启用可降低资源消耗 |
 | logPath | string | logs | 日志目录. 须先启用 logToFile |
 | logToFile | bool | true (启用) | 记录普通信息到日志. 启用后可用于一般的分析及统计用途 |

config.go

@@ -126,7 +126,7 @@ var httpTransport = &http.Transport{
 }
 
 var httpClient http.Client
-var httpClientWithoutCookie http.Client
+var httpClientExternal http.Client // 没有 Cookie.
 
 var httpServer = http.Server{
 	ReadTimeout:  30,
@@ -499,14 +499,20 @@ func InitConfig() {
 		httpTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: false}
 	}
 
+	httpTransportExternal := httpTransport.Clone()
+
 	if config.Proxy == "Auto" {
+		// Aka default. 仅对外部资源使用代理.
+		httpTransport.Proxy = nil
+		httpTransportExternal.Proxy = GetProxy
+	} else if config.Proxy == "All" {
 		httpTransport.Proxy = GetProxy
+		httpTransportExternal.Proxy = GetProxy
 	} else {
 		httpTransport.Proxy = nil
+		httpTransportExternal.Proxy = nil
 	}
 
-	httpTransportWithoutCookie := httpTransport.Clone()
-
 	if config.LongConnection {
 		httpTransport.DisableKeepAlives = false
 	}
@@ -522,9 +528,9 @@ func InitConfig() {
 		},
 	}
 
-	httpClientWithoutCookie = http.Client{
+	httpClientExternal = http.Client{
 		Timeout:   currentTimeout,
-		Transport: httpTransportWithoutCookie,
+		Transport: httpTransportExternal,
 		CheckRedirect: func(req *http.Request, via []*http.Request) error {
 			return http.ErrUseLastResponse
 		},

console.go

@@ -351,7 +351,7 @@ func Stop() {
 	DeleteIPFilter()
 	SubmitBlockPeer(nil)
 	httpClient.CloseIdleConnections()
-	httpClientWithoutCookie.CloseIdleConnections()
+	httpClientExternal.CloseIdleConnections()
 	StopServer()
 	Platform_Stop()
 

request.go

@@ -8,7 +8,7 @@ import (
 
 var fetchFailedCount = 0
 
-func NewRequest(isPOST bool, url string, postdata string, withAuth bool, withHeader *map[string]string) *http.Request {
+func NewRequest(isPOST bool, url string, postdata string, external bool, withHeader *map[string]string) *http.Request {
 	var request *http.Request
 	var err error
 
@@ -47,29 +47,29 @@ func NewRequest(isPOST bool, url string, postdata string, withAuth bool, withHea
 		request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 	}
 
-	if currentClientType == "Transmission" && withAuth && Tr_csrfToken != "" {
+	if currentClientType == "Transmission" && external && Tr_csrfToken != "" {
 		request.Header.Set("X-Transmission-Session-Id", Tr_csrfToken)
 	}
 
-	if withAuth && config.UseBasicAuth && config.ClientUsername != "" {
+	if external && config.UseBasicAuth && config.ClientUsername != "" {
 		request.SetBasicAuth(config.ClientUsername, config.ClientPassword)
 	}
 
 	return request
 }
-func Fetch(url string, tryLogin bool, withCookie bool, withHeader *map[string]string) (int, http.Header, []byte) {
-	request := NewRequest(false, url, "", withCookie, withHeader)
+func Fetch(url string, tryLogin bool, external bool, withHeader *map[string]string) (int, http.Header, []byte) {
+	request := NewRequest(false, url, "", external, withHeader)
 	if request == nil {
 		return -1, nil, nil
 	}
 
 	var response *http.Response
 	var err error
 
-	if withCookie {
+	if external {
 		response, err = httpClient.Do(request)
 	} else {
-		response, err = httpClientWithoutCookie.Do(request)
+		response, err = httpClientExternal.Do(request)
 	}
 
 	if err != nil {
@@ -141,19 +141,19 @@ func Fetch(url string, tryLogin bool, withCookie bool, withHeader *map[string]st
 
 	return response.StatusCode, response.Header, responseBody
 }
-func Submit(url string, postdata string, tryLogin bool, withCookie bool, withHeader *map[string]string) (int, http.Header, []byte) {
-	request := NewRequest(true, url, postdata, withCookie, withHeader)
+func Submit(url string, postdata string, tryLogin bool, external bool, withHeader *map[string]string) (int, http.Header, []byte) {
+	request := NewRequest(true, url, postdata, external, withHeader)
 	if request == nil {
 		return -1, nil, nil
 	}
 
 	var response *http.Response
 	var err error
 
-	if withCookie {
+	if external {
 		response, err = httpClient.Do(request)
 	} else {
-		response, err = httpClientWithoutCookie.Do(request)
+		response, err = httpClientExternal.Do(request)
 	}
 
 	if err != nil {