feat: support proxy (#284)

internal/protocol/bt/fetcher.go

@@ -9,6 +9,7 @@ import (
 	"github.com/GopeedLab/gopeed/pkg/util"
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/metainfo"
+	"net/http"
 	"path/filepath"
 	"sync"
 	"sync/atomic"
@@ -63,6 +64,9 @@ func (f *Fetcher) initClient() (err error) {
 
 	cfg := torrent.NewDefaultClientConfig()
 	cfg.ListenPort = f.config.ListenPort
+	if f.ctl.ProxyUrl != nil {
+		cfg.HTTPProxy = http.ProxyURL(f.ctl.ProxyUrl)
+	}
 	cfg.DefaultStorage = newFileOpts(newFileClientOpts{
 		ClientBaseDir: cfg.DataDir,
 		HandleFileTorrent: func(infoHash metainfo.Hash, ft *fileTorrentImpl) {

internal/protocol/bt/fetcher_test.go

@@ -8,6 +8,8 @@ import (
 	"github.com/GopeedLab/gopeed/internal/test"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/bt"
+	"github.com/GopeedLab/gopeed/pkg/util"
+	"net/url"
 	"os"
 	"reflect"
 	"testing"
@@ -50,7 +52,15 @@ func TestFetcher_Resolve_DataUri_Torrent(t *testing.T) {
 }
 
 func TestFetcher_Config(t *testing.T) {
-	doResolve(t, buildConfigFetcher())
+	doResolve(t, buildConfigFetcher(nil))
+}
+
+func TestFetcher_ResolveWithProxy(t *testing.T) {
+	usr, pwd := "admin", "123"
+	proxyListener := test.StartSocks5Server(usr, pwd)
+	defer proxyListener.Close()
+
+	doResolve(t, buildConfigFetcher(util.BuildProxyUrl("socks5", proxyListener.Addr().String(), usr, pwd)))
 }
 
 func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
@@ -90,7 +100,7 @@ func buildFetcher() fetcher.Fetcher {
 	return fetcher
 }
 
-func buildConfigFetcher() fetcher.Fetcher {
+func buildConfigFetcher(proxyUrl *url.URL) fetcher.Fetcher {
 	fetcher := new(FetcherBuilder).Build()
 	newController := controller.NewController()
 	mockCfg := config{
@@ -104,6 +114,7 @@ func buildConfigFetcher() fetcher.Fetcher {
 		}
 		return true
 	}
+	newController.ProxyUrl = proxyUrl
 	fetcher.Setup(newController)
 	return fetcher
 }

internal/protocol/http/fetcher.go

@@ -90,7 +90,7 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 	if err != nil {
 		return err
 	}
-	client := buildClient()
+	client := f.buildClient()
 	// send Range request to check whether the server supports breakpoint continuation
 	// just test one byte, Range: bytes=0-0
 	httpReq.Header.Set(base.HttpHeaderRange, fmt.Sprintf(base.HttpHeaderRangeFormat, 0, 0))
@@ -264,7 +264,7 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
 		return err
 	}
 	var (
-		client     = buildClient()
+		client     = f.buildClient()
 		buf        = make([]byte, 8192)
 		maxRetries = 3
 	)
@@ -430,11 +430,16 @@ func (f *Fetcher) splitChunk() (chunks []*chunk) {
 	return
 }
 
-func buildClient() *http.Client {
+func (f *Fetcher) buildClient() *http.Client {
+	transport := &http.Transport{}
 	// Cookie handle
 	jar, _ := cookiejar.New(nil)
+	if f.ctl.ProxyUrl != nil {
+		transport.Proxy = http.ProxyURL(f.ctl.ProxyUrl)
+	}
 	return &http.Client{
-		Jar: jar,
+		Transport: transport,
+		Jar:       jar,
 	}
 }
 

internal/protocol/http/fetcher_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/GopeedLab/gopeed/internal/test"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/protocol/http"
+	"github.com/GopeedLab/gopeed/pkg/util"
 	"net"
 	"reflect"
 	"testing"
@@ -141,6 +142,15 @@ func TestFetcher_DownloadResume(t *testing.T) {
 	downloadResume(listener, 16, t)
 }
 
+func TestFetcher_DownloadWithProxy(t *testing.T) {
+	httpListener := test.StartTestFileServer()
+	defer httpListener.Close()
+	proxyListener := test.StartSocks5Server("", "")
+	defer proxyListener.Close()
+
+	downloadWithProxy(httpListener, proxyListener, t)
+}
+
 func TestFetcher_Config(t *testing.T) {
 	listener := test.StartTestFileServer()
 	defer listener.Close()
@@ -302,6 +312,26 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
 	}
 }
 
+func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t *testing.T) {
+	fetcher := downloadReady(httpListener, 4, t)
+	ctl := controller.NewController()
+	ctl.ProxyUrl = util.BuildProxyUrl("socks5", proxyListener.Addr().String(), "", "")
+	fetcher.Setup(ctl)
+	err := fetcher.Start()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = fetcher.Wait()
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := test.FileMd5(test.BuildFile)
+	got := test.FileMd5(test.DownloadFile)
+	if want != got {
+		t.Errorf("Download() got = %v, want %v", got, want)
+	}
+}
+
 func buildFetcher() *Fetcher {
 	fetcher := new(FetcherBuilder).Build()
 	fetcher.Setup(controller.NewController())