improve: pass logger instead of using global logger

tools/eth.go

@@ -13,7 +13,7 @@ type Eth struct {
 }
 
 // ConvertInterface 当没有 ipv4 地址时 eth 可能为 nil
-func ConvertInterface(eth net.Interface) (*Eth, error) {
+func ConvertInterface(logger *log.Logger, eth net.Interface) (*Eth, error) {
 	addresses, err := eth.Addrs()
 	if err != nil {
 		return nil, err
@@ -23,7 +23,7 @@ func ConvertInterface(eth net.Interface) (*Eth, error) {
 			var ip *net.TCPAddr
 			ip, err = net.ResolveTCPAddr("tcp", strings.Split(addr.String(), "/")[0]+":0")
 			if err != nil {
-				log.Warnln(eth.Name+" ip解析失败：", err)
+				logger.Warnln(eth.Name+" ip解析失败：", err)
 				continue
 			}
 			return &Eth{
@@ -35,7 +35,7 @@ func ConvertInterface(eth net.Interface) (*Eth, error) {
 	return nil, nil
 }
 
-func GetInterfaceAddr(regexpStr string) ([]Eth, error) {
+func GetInterfaceAddr(logger *log.Logger, regexpStr string) ([]Eth, error) {
 	var result []Eth
 
 	interfaces, err := net.Interfaces()
@@ -44,13 +44,13 @@ func GetInterfaceAddr(regexpStr string) ([]Eth, error) {
 	}
 	reg, err := regexp.Compile(regexpStr)
 	if err != nil {
-		log.Fatalln("interfaces设置异常，无法解析: ", err)
+		logger.Fatalln("interfaces设置异常，无法解析: ", err)
 	}
 	for _, eth := range interfaces {
 		if reg.Match([]byte(eth.Name)) {
-			cEth, err := ConvertInterface(eth)
+			cEth, err := ConvertInterface(logger, eth)
 			if err != nil {
-				log.Warnln(eth.Name+" 网卡地址获取失败: ", err)
+				logger.Warnln(eth.Name+" 网卡地址获取失败: ", err)
 				continue
 			}
 
@@ -58,14 +58,14 @@ func GetInterfaceAddr(regexpStr string) ([]Eth, error) {
 				result = append(result, *cEth)
 			}
 		} else {
-			log.Debugf("网卡 %s 不匹配", eth.Name)
+			logger.Debugf("网卡 %s 不匹配", eth.Name)
 		}
 	}
 
-	log.Debugln("有效匹配网卡：", result)
+	logger.Debugln("有效匹配网卡：", result)
 
 	if len(result) == 0 {
-		log.Warnln("没有扫描到有效匹配网卡")
+		logger.Warnln("没有扫描到有效匹配网卡")
 	}
 
 	return result, nil

tools/http.go

@@ -1,55 +0,0 @@
-package tools
-
-import (
-	"github.com/Mmx233/BitSrunLoginGo/internal/config"
-	"github.com/Mmx233/BitSrunLoginGo/internal/config/flags"
-	log "github.com/sirupsen/logrus"
-	"net"
-	"net/http"
-)
-
-type Http struct {
-	Client *http.Client
-}
-
-var HttpPack *Http
-
-var httpTools map[string]*Http
-
-func init() {
-	if config.Settings.Basic.Interfaces == "" {
-		var eth *Eth
-		if flags.Interface != "" {
-			netEth, err := net.InterfaceByName(flags.Interface)
-			if err != nil {
-				log.Warnf("获取指定网卡 %s 失败，使用默认网卡: %v", flags.Interface, err)
-			} else {
-				eth, err = ConvertInterface(*netEth)
-				if err != nil {
-					log.Warnf("获取指定网卡 %s ip 地址失败，使用默认网卡: %v", flags.Interface, err)
-				} else if eth == nil {
-					log.Warnf("指定网卡 %s 无可用 ip 地址，使用默认网卡", flags.Interface)
-				} else {
-					log.Debugf("使用指定网卡 %s ip: %s", eth.Name, eth.Addr.String())
-				}
-			}
-		}
-
-		HttpPack = genHttpPack(eth)
-	} else {
-		httpTools = make(map[string]*Http)
-	}
-}
-
-func HttpPackSelect(eth *Eth) *Http {
-	if HttpPack != nil {
-		return HttpPack
-	}
-	if addrHttp, ok := httpTools[eth.Name]; ok {
-		return addrHttp
-	} else {
-		addrHttp = genHttpPack(eth)
-		httpTools[eth.Name] = addrHttp
-		return addrHttp
-	}
-}

tools/http_default.go

@@ -1,34 +0,0 @@
-//go:build !linux
-
-package tools
-
-import (
-	"crypto/tls"
-	"github.com/Mmx233/BitSrunLoginGo/internal/config"
-	"github.com/Mmx233/tool"
-	"net"
-	"net/http"
-)
-
-func genHttpPack(eth *Eth) *Http {
-	var addr net.Addr
-	if eth != nil {
-		addr = eth.Addr
-	}
-	tr := &http.Transport{
-		DialContext: (&net.Dialer{
-			Timeout:   config.Timeout,
-			LocalAddr: addr,
-		}).DialContext,
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: config.Settings.Basic.SkipCertVerify,
-		},
-		Proxy: http.ProxyFromEnvironment,
-	}
-	return &Http{
-		Client: tool.GenHttpClient(&tool.HttpClientOptions{
-			Transport: tr,
-			Timeout:   config.Timeout,
-		}),
-	}
-}

tools/http_linux.go

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