style: improve code of http client init

internal/controllers/login.go

@@ -104,7 +104,7 @@ func doLogin(conf LoginSingleConf) error {
 	logger := conf.Logger
 
 	// 登录配置初始化
-	httpClient := http_client.HttpPackSelect(conf.Eth).Client
+	httpClient := http_client.ClientSelect(conf.Eth)
 	srunClient := srun.New(&srun.Conf{
 		Logger: logger,
 		Https:  config.Settings.Basic.Https,

internal/pkg/http_client/http.go

@@ -9,13 +9,9 @@ import (
 	"net/http"
 )
 
-type Http struct {
+var _DefaultClient *http.Client
-	Client *http.Client
-}
 
-var HttpPack *Http
+var _EthClientMap map[string]*http.Client
-
-var httpTools map[string]*Http
 
 func init() {
 	logger := config.Logger.WithField(keys.LogComponent, "init http")
@@ -37,21 +33,21 @@ func init() {
 			}
 		}
 
-		HttpPack = genHttpPack(eth)
+		_DefaultClient = CreateClientFromEth(eth)
 	} else {
-		httpTools = make(map[string]*Http)
+		_EthClientMap = make(map[string]*http.Client)
 	}
 }
 
-func HttpPackSelect(eth *tools.Eth) *Http {
+func ClientSelect(eth *tools.Eth) *http.Client {
-	if HttpPack != nil {
+	if _DefaultClient != nil {
-		return HttpPack
+		return _DefaultClient
 	}
-	if addrHttp, ok := httpTools[eth.Name]; ok {
+	if client, ok := _EthClientMap[eth.Name]; ok {
-		return addrHttp
+		return client
 	} else {
-		addrHttp = genHttpPack(eth)
+		client = CreateClientFromEth(eth)
-		httpTools[eth.Name] = addrHttp
+		_EthClientMap[eth.Name] = client
-		return addrHttp
+		return client
 	}
 }

internal/pkg/http_client/http_default.go

@@ -6,17 +6,18 @@ import (
 	"crypto/tls"
 	"github.com/Mmx233/BitSrunLoginGo/internal/config"
 	"github.com/Mmx233/BitSrunLoginGo/tools"
-	"github.com/Mmx233/tool"
 	"net"
 	"net/http"
 )
 
-func genHttpPack(eth *tools.Eth) *Http {
+func CreateClientFromEth(eth *tools.Eth) *http.Client {
 	var addr net.Addr
 	if eth != nil {
 		addr = eth.Addr
 	}
-	tr := &http.Transport{
+
+	return &http.Client{
+		Transport: &http.Transport{
 			DialContext: (&net.Dialer{
 				Timeout:   config.Timeout,
 				LocalAddr: addr,
@@ -25,11 +26,7 @@ func genHttpPack(eth *tools.Eth) *Http {
 				InsecureSkipVerify: config.Settings.Basic.SkipCertVerify,
 			},
 			Proxy: http.ProxyFromEnvironment,
-	}
+		},
-	return &Http{
-		Client: tool.GenHttpClient(&tool.HttpClientOptions{
-			Transport: tr,
 		Timeout: config.Timeout,
-		}),
 	}
 }

internal/pkg/http_client/http_linux.go

@@ -4,13 +4,12 @@ import (
 	"crypto/tls"
 	"github.com/Mmx233/BitSrunLoginGo/internal/config"
 	"github.com/Mmx233/BitSrunLoginGo/tools"
-	"github.com/Mmx233/tool"
 	"net"
 	"net/http"
 	"syscall"
 )
 
-func genHttpPack(eth *tools.Eth) *Http {
+func CreateClientFromEth(eth *tools.Eth) *http.Client {
 	dialer := net.Dialer{
 		Timeout: config.Timeout,
 	}
@@ -18,31 +17,28 @@ func genHttpPack(eth *tools.Eth) *Http {
 		dialer.LocalAddr = eth.Addr
 		ethName := eth.Name
 		dialer.Control = func(network string, address string, c syscall.RawConn) error {
-			var operr error
+			var opErr error
 			fn := func(fd uintptr) {
-				operr = syscall.SetsockoptString(int(fd), syscall.SOL_SOCKET, syscall.SO_BINDTODEVICE, ethName)
+				opErr = syscall.SetsockoptString(int(fd), syscall.SOL_SOCKET, syscall.SO_BINDTODEVICE, ethName)
 			}
 			if err := c.Control(fn); err != nil {
 				return err
 			}
-			if operr != nil {
+			if opErr != nil {
-				return operr
+				return opErr
 			}
 			return nil
 		}
 	}
 
-	tr := &http.Transport{
+	return &http.Client{
+		Transport: &http.Transport{
 			DialContext:         dialer.DialContext,
 			TLSHandshakeTimeout: config.Timeout,
 			IdleConnTimeout:     config.Timeout,
 			TLSClientConfig:     &tls.Config{InsecureSkipVerify: config.Settings.Basic.SkipCertVerify},
-	}
+			Proxy:               http.ProxyFromEnvironment,
-	tr.Proxy = http.ProxyFromEnvironment
+		},
-	return &Http{
-		Client: tool.GenHttpClient(&tool.HttpClientOptions{
-			Transport: tr,
 		Timeout: config.Timeout,
-		}),
 	}
 }