Improve

Author: Simple-Tracker

BTN.go

@@ -170,10 +170,17 @@ Docker version is configured through the same name variable configuration, which
 | execCommand_FetchFailed | string | Empty | Execute external command (FetchFailed). First parameter is regarded as an external program path, execute the command when number of fetch failures exceeds set threshold |
 | execCommand_Run | string | Empty | Execute external command (Run). First parameter is regarded as an external program path, execute the command when program starts |
 | execCommand_Ban | string | Empty | Execute external command (Ban). First parameter is regarded as an external program path, and each parameter should be separated by ```\|```, command can use ```{peerIP}```/```{peerPort}```/```{torrentInfoHash}``` to use related info (peerPort=-1 means ban all port) |
-| execCommand_Ban | string | Empty | Execute external command (Ban). First parameter is regarded as an external program path, and each parameter should be separated by ```\|```, command can use ```{peerIP}```/```{peerPort}```/```{torrentInfoHash}``` to use related info (peerPort=-1 means ban all port) |
 | execCommand_Unban | string | Empty | Execute external command (Unban). First parameter is regarded as an external program path, and each parameter should be separated by ```\|```, command can use ```{peerIP}```/```{peerPort}```/```{torrentInfoHash}``` to use related info (peerPort=-1 means ban all port) |
 | syncServerURL | string | Empty | Sync server URL. Sync server will submit TorrentMap to server and receive BlockIPCIDR from server |
 | syncServerToken | string | Empty | Sync server Token. Some sync server may require authentication |
+| btnConfigureURL | string | Empty | BTN server URL. Currently not available, [What is BTN?](https://docs.pbh-btn.com/en/docs/btn/intro/) |
+| btnAppID | string | Empty | BTN AppID. Some BTN servers may require authentication |
+| btnAppSecret | string | Empty | BTN AppSecret. Some BTN servers may require authentication |
+| btnSyncRules | bool | true (Enable) | Sync BTN server cloud ban rules |
+| btnSyncException | bool | true (Enable) | Sync BTN server cloud exception rules (whitelist) |
+| btnSubmitPeers | bool | false (Disable) | Submit Peer snapshots to BTN server |
+| btnSubmitBans | bool | false (Disable) | Submit local ban records to BTN server |
+| btnSubmitHistories | bool | false (Disable) | Submit Peer traffic delta history snapshots to BTN server |
 | blockList | []string | Empty (Included in config.json) | Block client list. Judge PeerID or ClientName at the same time, case-insensitive, support regular expression |
 | blockListURL | []string | Empty | Block client list URL. Support format is same as blockList, one rule per line |
 | blockListFile | []string | Empty | Block client list File. Support format is same as blockList, one rule per line |

README.en.md

@@ -173,6 +173,14 @@ Docker 版本通过相同名称的环境变量配置, 通过自动转换环境
 | execCommand_Unban | string | 空 | 执行外部命令 (Unban). 首个参数被视作外部程序路径, 各参数均应使用 ```\|``` 分割, 命令可以使用 ```{peerIP}```/```{peerPort}```/```{torrentInfoHash}``` 来使用相关信息 (peerPort=-1 意味着全端口封禁) |
 | syncServerURL | string | 空 | 同步服务器 URL. 同步服务器会将 TorrentMap 提交至服务器, 并从服务器接收屏蔽 IPCIDR 列表 |
 | syncServerToken | string | 空 | 同步服务器 Token. 部分同步服务器可能需要认证 |
+| btnConfigureURL | string | 空 | BTN 服务器 URL. 目前尚不可用, [什么是 BTN?](https://docs.pbh-btn.com/docs/btn/intro/) |
+| btnAppID | string | 空 | BTN AppID. 部分 BTN 服务器可能需要认证 |
+| btnAppSecret | string | 空 | BTN AppSecret. 部分 BTN 服务器可能需要认证 |
+| btnSyncRules | bool | true (启用) | 同步 BTN 服务器的云端封禁规则 |
+| btnSyncException | bool | true (启用) | 同步 BTN 服务器的云端例外规则 (白名单) |
+| btnSubmitPeers | bool | false (禁用) | 上报 Peer 快照至 BTN 服务器 |
+| btnSubmitBans | bool | false (禁用) | 上报本地封禁记录至 BTN 服务器 |
+| btnSubmitHistories | bool | false (禁用) | 上报 Peer 流量增量历史至 BTN 服务器 |
 | blockList | []string | 空 (于 config.json 附带) | 屏蔽客户端列表. 同时判断 PeerID 及 ClientName, 不区分大小写, 支持正则表达式 |
 | blockListURL | []string | 空 | 屏蔽客户端列表 URL. 支持格式同 blockList, 一行一条 |
 | blockListFile | []string | 空 | 屏蔽客户端列表文件. 支持格式同 blockList, 一行一条 |

README.md

@@ -4,12 +4,14 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"flag"
+	"fmt"
 	"log"
 	"net/http"
 	"net/http/cookiejar"
 	"os"
 	"path/filepath"
 	"reflect"
+	"runtime"
 	"strings"
 	"sync"
 	"time"
@@ -45,6 +47,10 @@ type ConfigStruct struct {
 	LogToFile                     bool
 	LogDebug                      bool
 	Listen                        string
+	WebUI                         bool
+	WebUIListen                   string
+	WebUIUsername                 string
+	WebUIPassword                 string
 	ClientType                    string
 	ClientURL                     string
 	ClientUsername                string
@@ -62,6 +68,11 @@ type ConfigStruct struct {
 	BTNConfigureURL               string
 	BTNAppID                      string
 	BTNAppSecret                  string
+	BTNSyncRules                  bool
+	BTNSyncException              bool
+	BTNSubmitPeers                bool
+	BTNSubmitBans                 bool
+	BTNSubmitHistories            bool
 	BlockList                     []string
 	BlockListURL                  []string
 	BlockListFile                 []string
@@ -84,15 +95,11 @@ type ConfigStruct struct {
 	BanByRelativePUStartMB        uint32
 	BanByRelativePUStartPrecent   float64
 	BanByRelativePUAntiErrorRatio float64
-	WebUI                         bool
-	WebUIListen                   string
-	WebUIUsername                 string
-	WebUIPassword                 string
 }
 
 var programName = "qBittorrent-ClientBlocker"
 var programVersion = "Unknown"
-var programUserAgent = programName + "/" + programVersion
+var programUserAgent = fmt.Sprintf("%s/%s (%s, %s)", programName, programVersion, runtime.GOOS, runtime.GOARCH)
 
 var shortFlag_ShowVersion bool
 var longFlag_ShowVersion bool
@@ -119,6 +126,7 @@ var lastModMutex sync.RWMutex
 
 // currentTimestamp 记录当前的 UNIX 时间戳.
 var currentTimestamp int64 = 0
+var programStartTimestamp = time.Now().Unix()
 
 // configLastFetch 记录上次加载配置的具体时间.
 var configLastFetch int64 = 0
@@ -181,6 +189,10 @@ var config = ConfigStruct{
 	LogToFile:                     true,
 	LogDebug:                      false,
 	Listen:                        "127.0.0.1:26262",
+	WebUI:                         false,
+	WebUIListen:                   "127.0.0.1:7222",
+	WebUIUsername:                 "",
+	WebUIPassword:                 "",
 	ClientType:                    "",
 	ClientURL:                     "",
 	ClientUsername:                "",
@@ -196,6 +208,13 @@ var config = ConfigStruct{
 	SyncServerURL:                 "",
 	SyncServerToken:               "",
 	BTNConfigureURL:               "",
+	BTNAppID:                      "",
+	BTNAppSecret:                  "",
+	BTNSyncRules:                  true,
+	BTNSyncException:              true,
+	BTNSubmitPeers:                false,
+	BTNSubmitBans:                 false,
+	BTNSubmitHistories:            false,
 	BlockList:                     []string{},
 	BlockListURL:                  []string{},
 	BlockListFile:                 []string{},
@@ -218,10 +237,6 @@ var config = ConfigStruct{
 	BanByRelativePUStartMB:        20,
 	BanByRelativePUStartPrecent:   2,
 	BanByRelativePUAntiErrorRatio: 3,
-	WebUI:                         false,
-	WebUIListen:                   "127.0.0.1:7222",
-	WebUIUsername:                 "",
-	WebUIPassword:                 "",
 }
 
 func SetBlockListFromContent(blockListContent []string, blockListSource string) int {

config.go

@@ -120,11 +120,20 @@ var defaultLangContent = map[string]string{
 	"Success-SyncWithServer":                           "成功与同步服务器同步",
 	"StartServer_ListeningOn":                          "监听于: %s",
 
+	"Failed-GetQBPreferences":                          "获取 qBittorrent 偏好设置失败",
+
 	// ShadowBan 部分.
 	"Warning-ShadowBanAPINotExist": "未检测到 ShadowBan API, 将使用常规方法",
 	"Warning-ShadowBanAPIDisabled": "未启用 ShadowBan API, 将使用常规方法",
 	"Failed-UnknownShadowBanAPI":   "检测到未知 Shadow Ban API, 将使用常规方法",
-	"Failed-GetQBPreferences":      "获取 qBittorrent 偏好设置失败",
+
+	// BTN 部分.
+	"Success-BTNRegLoaded":                             "BTN 规则加载成功, 版本: %s",
+	"Success-BTNExceptionLoaded":                       "BTN 例外规则加载成功, 版本: %s",
+	"Success-BTNConfigLoaded":                          "BTN 配置加载成功",
+	"Debug-BTNNoChange":                                "BTN 规则/例外无变化",
+	"Debug-BTNConfigNoChange":                          "BTN 配置无变化",
+	"Error-BTNVersionMismatch":                         "BTN 协议版本不匹配: 服务器要求 [%d, %d], 但我们支持 3。BTN 模块已禁用。",
 }
 
 func LoadLang(langCode string) bool {

i18n.go

@@ -106,9 +106,16 @@
 	"Success-SyncWithServer": "Sync with server success",
 	"StartServer_ListeningOn": "Listening on: %s",
 
-	// Part ShadowBan.
+	"Failed-GetQBPreferences": "Failed to get qBittorrent preferences",
+
 	"Warning-ShadowBanAPINotExist": "ShadowBan API not detected, and the normal method will be used",
 	"Warning-ShadowBanAPIDisabled": "ShadowBan API is disabled, and the normal method will be used",
 	"Failed-UnknownShadowBanAPI": "Detected unknown ShadowBan API, and the normal method will be used",
-	"Failed-GetQBPreferences": "Failed to get qBittorrent preferences"
+
+	"Success-BTNRegLoaded": "BTN rules loaded successfully, version: %s",
+	"Success-BTNExceptionLoaded": "BTN exception rules loaded successfully, version: %s",
+	"Success-BTNConfigLoaded": "BTN configuration loaded successfully",
+	"Debug-BTNNoChange": "BTN rules/exceptions have not changed",
+	"Debug-BTNConfigNoChange": "BTN configuration has not changed",
+	"Error-BTNVersionMismatch": "BTN protocol version mismatch: server requires [%d, %d], but we support 3. BTN module disabled."
 }

lang/en.json

@@ -103,7 +103,7 @@ func IsProgressNotMatchUploaded_Relative(torrentTotalSize int64, peerInfo PeerIn
 
 // CheckAllTorrent 对所有种子和 Peer 进行分析.
 func CheckAllTorrent(torrentMap map[string]TorrentInfoStruct, lastTorrentMap map[string]TorrentInfoStruct) (int, int) {
-	if ((config.IPUploadedCheck && config.IPUpCheckPerTorrentRatio > 0) || config.BanByRelativeProgressUploaded) && len(lastTorrentMap) > 0 && currentTimestamp > (lastTorrentCleanTimestamp+int64(config.TorrentMapCleanInterval)) {
+	if ((config.IPUploadedCheck && config.IPUpCheckPerTorrentRatio > 0) || config.BanByRelativeProgressUploaded || config.BTNSubmitHistories) && (currentTimestamp > (lastTorrentCleanTimestamp + int64(config.TorrentMapCleanInterval))) {
 		blockCount := 0
 		ipBlockCount := 0
 

torrent.go

@@ -50,7 +50,6 @@ type WebUIBlockPeer struct {
 	Uploaded   int64    `json:"uploaded"`
 }
 
-var startTimestamp = time.Now().Unix()
 
 func WebUI_IsPath(path string) bool {
 	return path == "/" || path == "/api/status" || path == "/api/peers" || path == "/api/logs"
@@ -150,7 +149,7 @@ func WebUI_GetStatus(w http.ResponseWriter, r *http.Request) {
 	resp := StatusResponse{
 		ProgramName:      programName,
 		ProgramVersion:   programVersion,
-		UptimeSeconds:    time.Now().Unix() - startTimestamp,
+		UptimeSeconds:    time.Now().Unix() - programStartTimestamp,
 		ClientType:       currentClientType,
 		ClientURL:        config.ClientURL,
 		LoadedExtensions: loadedExtensions,