Improve & Add BitComet WebUI API

Author: Simple-Tracker

client.go

@@ -43,7 +43,7 @@ func DetectClient() bool {
 	// 先尝试 qBittorrent.
 	qb := &QBClient{}
 	if config.ClientType == "" || config.ClientType == qb.GetClientType() {
-		if qB_GetAPIVersion() {
+		if qb.Detect() {
 			currentClient = qb
 			currentClientType = qb.GetClientType()
 			Log("DetectClient", GetLangText("Success-DetectClient"), true, currentClientType)
@@ -54,7 +54,7 @@ func DetectClient() bool {
 	// 再尝试 Transmission.
 	tr := &TRClient{}
 	if config.ClientType == "" || config.ClientType == tr.GetClientType() {
-		if Tr_DetectVersion() {
+		if tr.Detect() {
 			currentClient = tr
 			currentClientType = tr.GetClientType()
 			Log("DetectClient", GetLangText("Success-DetectClient"), true, currentClientType)
@@ -65,7 +65,7 @@ func DetectClient() bool {
 	// 最后尝试 BitComet.
 	bc := &BCClient{}
 	if config.ClientType == "" || config.ClientType == bc.GetClientType() {
-		if BC_DetectClient() {
+		if bc.Detect() {
 			currentClient = bc
 			currentClientType = bc.GetClientType()
 			Log("DetectClient", GetLangText("Success-DetectClient"), true, currentClientType)

client_BitComet.go

@@ -2,13 +2,16 @@ package main
 
 import (
 	"bytes"
+	"encoding/json"
 	"github.com/PuerkitoBio/goquery"
 	"strconv"
 	"strings"
 )
 
 // BCClient 实现了 BitComet 的客户端接口.
-type BCClient struct{}
+type BCClient struct {
+	Version int // 1: HTML, 2: JSON (v2.09+)
+}
 
 func (c *BCClient) GetClientType() string {
 	return "BitComet"
@@ -28,6 +31,10 @@ func (c *BCClient) Login() bool {
 
 // FetchTorrents 获取所有活动的种子列表.
 func (c *BCClient) FetchTorrents() ([]*Torrent, error) {
+	if c.Version == 2 {
+		return c.FetchTorrents_v2()
+	}
+
 	torrents := BC_FetchTorrents()
 	if torrents == nil {
 		return nil, nil
@@ -46,6 +53,10 @@ func (c *BCClient) FetchTorrents() ([]*Torrent, error) {
 
 // FetchTorrentPeers 获取特定种子的 Peer 列表.
 func (c *BCClient) FetchTorrentPeers(torrent *Torrent) ([]*Peer, error) {
+	if c.Version == 2 {
+		return c.FetchTorrentPeers_v2(torrent)
+	}
+
 	peers := BC_FetchTorrentPeers(torrent.Hash)
 	if peers == nil {
 		return nil, nil
@@ -68,7 +79,101 @@ func (c *BCClient) FetchTorrentPeers(torrent *Torrent) ([]*Peer, error) {
 }
 
 func (c *BCClient) SubmitBlockPeer(blockPeerMap map[string]BlockPeerInfoStruct) bool {
-	return false // BitComet 暂未通过 WebUI 实现封禁.
+	if c.Version == 2 {
+		return c.BC_SubmitBlockPeer_v2(blockPeerMap)
+	}
+	return false // BitComet 1.x 暂未通过 WebUI 实现封禁.
+}
+
+// Version 2 实现逻辑.
+func (c *BCClient) FetchTorrents_v2() ([]*Torrent, error) {
+	_, _, responseBody := Fetch(config.ClientURL+"/api_v2/task_list/get?state_group=ACTIVE", true, true, false, nil)
+	if responseBody == nil {
+		return nil, nil
+	}
+
+	var resp BC_v2_TaskListResponse
+	if err := json.Unmarshal(responseBody, &resp); err != nil {
+		Log("FetchTorrents_v2", GetLangText("Error-Parse"), true, err.Error())
+		return nil, err
+	}
+
+	var result []*Torrent
+	for _, t := range resp.TaskList {
+		if strings.ToUpper(t.Type) != "BT" {
+			continue
+		}
+		result = append(result, &Torrent{
+			Hash:       t.TaskID,
+			TotalSize:  t.Size,
+			Tracker:    "BitComet-v2",
+			LeechCount: int64(t.LeechCount),
+		})
+	}
+	return result, nil
+}
+
+func (c *BCClient) FetchTorrentPeers_v2(torrent *Torrent) ([]*Peer, error) {
+	_, _, responseBody := Fetch(config.ClientURL+"/api/task/peers/get?task_id="+torrent.Hash+"&groups=peers_connected", true, true, false, nil)
+	if responseBody == nil {
+		return nil, nil
+	}
+
+	var resp BC_v2_PeerListResponse
+	if err := json.Unmarshal(responseBody, &resp); err != nil {
+		Log("FetchTorrentPeers_v2", GetLangText("Error-Parse"), true, err.Error())
+		return nil, err
+	}
+
+	var result []*Peer
+	for _, p := range resp.PeerList {
+		result = append(result, &Peer{
+			IP:         p.IP,
+			Port:       p.Port,
+			Client:     p.Client,
+			DlSpeed:    p.DlSpeed,
+			UpSpeed:    p.UpSpeed,
+			Progress:   p.Progress / 100.0, // API 返回通常是 0-100.
+			Downloaded: p.Downloaded,
+			Uploaded:   p.Uploaded,
+		})
+	}
+	return result, nil
+}
+
+func (c *BCClient) BC_SubmitBlockPeer_v2(blockPeerMap map[string]BlockPeerInfoStruct) bool {
+	// 按 Torrent 分组 IP 以匹配 ban_ip 接口要求.
+	taskIPs := make(map[string][]string)
+	for peerIP, peerInfo := range blockPeerMap {
+		if peerInfo.InfoHash != "" {
+			taskIPs[peerInfo.InfoHash] = append(taskIPs[peerInfo.InfoHash], peerIP)
+		}
+	}
+
+	if len(taskIPs) == 0 {
+		return true
+	}
+
+	allSuccess := true
+	for taskID, ips := range taskIPs {
+		params := BC_v2_BanParams{
+			TaskID:  taskID,
+			BanTime: "ban_ip_forever",
+			IPList:  ips,
+		}
+		postData, _ := json.Marshal(params)
+		code, _, _ := Submit(config.ClientURL+"/api/task/peers/ban_ip", string(postData), true, true, &Tr_jsonHeader)
+		if code != 200 {
+			allSuccess = false
+		}
+	}
+	return allSuccess
+}
+
+type BC_v2_BanParams struct {
+	TaskID  string   `json:"task_id"`
+	BanTime string   `json:"ban_time"`
+	IPList  []string `json:"ip_list"`
 }
 
 func (c *BCClient) SubmitShadowBanPeer(blockPeerMap map[string]BlockPeerInfoStruct) bool {
@@ -91,6 +196,38 @@ type BC_PeerStruct struct {
 	UpSpeed    int64
 }
 
+// BitComet v2 JSON API 结构体.
+type BC_v2_CommonResponse struct {
+	Result string `json:"result"`
+}
+type BC_v2_TaskListResponse struct {
+	TaskList []BC_v2_Task `json:"movie_list"` // 该 API 实际返回的是 movie_list.
+}
+type BC_v2_Task struct {
+	TaskID    string `json:"task_id"`
+	Type      string `json:"type"`
+	Size      int64  `json:"total_size"`
+	UpSpeed   int64  `json:"upload_speed"`
+	Status    string `json:"state"`
+	InfoHash  string `json:"info_hash"`
+	Name      string `json:"name"`
+	Progress  int    `json:"progress"`
+	LeechCount int    `json:"leechers_count"`
+}
+type BC_v2_PeerListResponse struct {
+	PeerList []BC_v2_Peer `json:"peers_connected"`
+}
+type BC_v2_Peer struct {
+	IP         string  `json:"address"`
+	Port       int     `json:"remoteport"`
+	Client     string  `json:"clienttype"`
+	Progress   float64 `json:"progress"`
+	DlSpeed    int64   `json:"downrate"`
+	UpSpeed    int64   `json:"uprate"`
+	Downloaded int64   `json:"downsize"`
+	Uploaded   int64   `json:"upsize"`
+}
+
 func BC_ParseTorrentLink(torrentLinkStr string) int {
 	torrentIDSplit1 := strings.SplitN(StrTrim(torrentLinkStr), "?id=", 2)
 	if len(torrentIDSplit1) < 2 {
@@ -200,9 +337,24 @@ func BC_ParseIP(ipStr string) (string, int) {
 
 	return ipWithoutPortStr, port
 }
-func BC_DetectClient() bool {
+func (c *BCClient) Detect() bool {
+	// 优先探测 Version 2 (JSON API).
+	apiResponseStatusCode, _, _ := Fetch(config.ClientURL+"/api_v2/task_list/get", false, false, false, nil)
+	if apiResponseStatusCode == 200 || apiResponseStatusCode == 401 {
+		c.Version = 2
+		Log("DetectClient", "BitComet (Version 2 - JSON API) Detected", true)
+		return true
+	}
+
+	// 回落探测 Version 1 (HTML).
 	apiResponseStatusCode, apiResponseHeaders, _ := Fetch(config.ClientURL+"/panel/", false, false, false, nil)
-	return (apiResponseStatusCode == 401 && strings.Contains(apiResponseHeaders.Get("WWW-Authenticate"), "BitComet"))
+	if apiResponseStatusCode == 401 && strings.Contains(apiResponseHeaders.Get("WWW-Authenticate"), "BitComet") {
+		c.Version = 1
+		Log("DetectClient", "BitComet (Version 1 - HTML) Detected", true)
+		return true
+	}
+
+	return false
 }
 func BC_Login() bool {
 	apiResponseStatusCode, _, _ := Fetch(config.ClientURL+"/panel/", false, true, false, nil)

client_Transmission.go

@@ -147,7 +147,7 @@ func Tr_ProcessHTTP(w http.ResponseWriter, r *http.Request) bool {
 func Tr_SetURL() bool {
 	return false
 }
-func Tr_DetectVersion() bool {
+func (c *TRClient) Detect() bool {
 	detectJSON, err := json.Marshal(Tr_RequestStruct{Method: "session-get", Args: Tr_ArgsStruct{Field: []string{"version"}}})
 	if err != nil {
 		Log("DetectVersion", GetLangText("Error-GenJSON"), true, err.Error())

client_qBittorrent.go

@@ -207,7 +207,7 @@ func qB_SetURL() bool {
 	Log("SetURL", GetLangText("Success-SetURL"), true, qBWebUIEnabled, config.ClientURL, config.ClientUsername)
 	return true
 }
-func qB_GetAPIVersion() bool {
+func (c *QBClient) Detect() bool {
 	if !strings.HasSuffix(config.ClientURL, "/api") {
 		apiResponseStatusCodeWithSuffix, _, _ := Fetch(config.ClientURL+"/api/v2/app/webapiVersion", false, false, false, nil)
 		if apiResponseStatusCodeWithSuffix == 200 || apiResponseStatusCodeWithSuffix == 403 {

client_types.go

@@ -10,6 +10,7 @@ type Client interface {
 	FetchTorrentPeers(torrent *Torrent) ([]*Peer, error)
 	SubmitBlockPeer(blockPeerMap map[string]BlockPeerInfoStruct) bool
 	SubmitShadowBanPeer(blockPeerMap map[string]BlockPeerInfoStruct) bool
+	Detect() bool
 }
 
 // Torrent 统一表示不同客户端返回的种子信息.

util.go

@@ -4,7 +4,6 @@ import (
 	"net"
 	"os"
 	"os/exec"
-	"strconv"
 	"strings"
 	"sync"
 	"time"