improve: pass logger instead of using global logger

This commit is contained in:
Mmx
2024-09-24 23:36:09 +08:00
parent e1ff68cfc2
commit 78a1b2662d
15 changed files with 163 additions and 126 deletions

View File

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

View File

@@ -0,0 +1,35 @@
//go:build !linux
package http_client
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 {
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,
}),
}
}

View File

@@ -0,0 +1,48 @@
package http_client
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 {
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,
}),
}
}