feat: use httpclient

go.sum

@@ -398,7 +398,6 @@ github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU=
 github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=

internal/bot/bot.go

@@ -1,12 +1,13 @@
 package bot
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/indes/flowerss-bot/internal/bot/handler"
 	"github.com/indes/flowerss-bot/internal/bot/middleware"
 	"github.com/indes/flowerss-bot/internal/config"
-	"github.com/indes/flowerss-bot/internal/util"
+	"github.com/indes/flowerss-bot/pkg/client"
 
 	"go.uber.org/zap"
 	tb "gopkg.in/telebot.v3"
@@ -26,14 +27,22 @@ func init() {
 		"token", config.BotToken,
 		"endpoint", config.TelegramEndpoint,
 	)
-	// create bot
+
+	clientOpts := []client.HttpClientOption{
+		client.WithTimeout(10 * time.Second),
+	}
+	if config.Socks5 != "" {
+		clientOpts = append(clientOpts, client.WithProxyURL(fmt.Sprintf("socks5://%s", config.Socks5)))
+	}
+	httpClient := client.NewHttpClient(clientOpts...)
+
 	var err error
 	B, err = tb.NewBot(
 		tb.Settings{
 			URL:     config.TelegramEndpoint,
 			Token:   config.BotToken,
 			Poller:  &tb.LongPoller{Timeout: 10 * time.Second},
-			Client:  util.HttpClient,
+			Client:  httpClient.Client(),
 			Verbose: true,
 		},
 	)
@@ -48,7 +57,7 @@ func init() {
 	}
 }
 
-//Start bot
+// Start bot
 func Start() {
 	if config.RunMode == config.TestMode {
 		return

internal/model/model.go

@@ -1,23 +1,41 @@
 package model
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/indes/flowerss-bot/internal/config"
 	"github.com/indes/flowerss-bot/internal/log"
+	"github.com/indes/flowerss-bot/pkg/client"
 
 	"github.com/jinzhu/gorm"
 	"go.uber.org/zap"
 	"moul.io/zapgorm"
 )
 
 var db *gorm.DB
+var httpClient *client.HttpClient // TODO: 将网络拉取逻辑从 model 包移除
 
 // InitDB init db object
 func InitDB() {
 	connectDB()
 	configDB()
 	updateTable()
+	initHttpClient()
+}
+
+func initHttpClient() {
+	clientOpts := []client.HttpClientOption{
+		client.WithTimeout(10 * time.Second),
+	}
+	if config.Socks5 != "" {
+		clientOpts = append(clientOpts, client.WithProxyURL(fmt.Sprintf("socks5://%s", config.Socks5)))
+	}
+
+	if config.UserAgent != "" {
+		clientOpts = append(clientOpts, client.WithUserAgent(config.UserAgent))
+	}
+	httpClient = client.NewHttpClient(clientOpts...)
 }
 
 func configDB() {
@@ -66,7 +84,7 @@ func createOrUpdateTable(model interface{}) {
 	}
 }
 
-//EditTime timestamp
+// EditTime timestamp
 type EditTime struct {
 	CreatedAt time.Time
 	UpdatedAt time.Time

internal/model/source.go

@@ -10,7 +10,6 @@ import (
 	"unicode"
 
 	"github.com/indes/flowerss-bot/internal/config"
-	"github.com/indes/flowerss-bot/internal/util"
 
 	"github.com/SlyMarbo/rss"
 	"github.com/jinzhu/gorm"
@@ -46,27 +45,14 @@ func GetSourceByUrl(url string) (*Source, error) {
 }
 
 func fetchFunc(url string) (resp *http.Response, err error) {
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		zap.S().Fatal(err)
-	}
-
-	if config.UserAgent != "" {
-		req.Header.Set("User-Agent", config.UserAgent)
-	} else {
-		req.Header.Set("User-Agent", "flowerss/2.0")
-	}
-
-	resp, err = util.HttpClient.Do(req)
-
+	resp, err = httpClient.Get(url)
 	if err != nil {
 		return nil, err
 	}
 	defer resp.Body.Close()
 
 	var data []byte
 	if data, err = ioutil.ReadAll(resp.Body); err != nil {
-
 		return nil, err
 	}
 

pkg/client/http.go

@@ -37,9 +37,6 @@ func WithProxyURL(url string) HttpClientOption {
 	}
 }
 
-type Http interface {
-}
-
 type HttpClient struct {
 	client    *http.Client
 	userAgent string