尝试优化代码

api/panel/node.go

@@ -134,8 +134,18 @@ func (c *Client) GetNodeInfo() (node *NodeInfo, err error) {
 	if err = c.checkResponse(r, path, err); err != nil {
 		return nil, err
 	}
-	if r.StatusCode() == 304 {
-		return nil, nil
+
+	if r != nil {
+		defer func() {
+			if r.RawBody() != nil {
+				r.RawBody().Close()
+			}
+		}()
+		if r.StatusCode() == 304 {
+			return nil, nil
+		}
+	} else {
+		return nil, fmt.Errorf("received nil response")
 	}
 	node = &NodeInfo{
 		Id:   c.NodeId,

api/panel/user.go

@@ -30,13 +30,21 @@ func (c *Client) GetUserList() (UserList []UserInfo, err error) {
 	r, err := c.client.R().
 		SetHeader("If-None-Match", c.userEtag).
 		Get(path)
-	err = c.checkResponse(r, path, err)
-	if err != nil {
+	if err = c.checkResponse(r, path, err); err != nil {
 		return nil, err
 	}
 
-	if r.StatusCode() == 304 {
-		return nil, nil
+	if r != nil {
+		defer func() {
+			if r.RawBody() != nil {
+				r.RawBody().Close()
+			}
+		}()
+		if r.StatusCode() == 304 {
+			return nil, nil
+		}
+	} else {
+		return nil, fmt.Errorf("received nil response")
 	}
 	var userList *UserListBody
 	err = json.Unmarshal(r.Body(), &userList)

conf/conf.go

@@ -2,9 +2,11 @@ package conf
 
 import (
 	"fmt"
-	"github.com/InazumaV/V2bX/common/json5"
+	"io"
 	"os"
 
+	"github.com/InazumaV/V2bX/common/json5"
+
 	"github.com/goccy/go-json"
 )
 
@@ -29,5 +31,17 @@ func (p *Conf) LoadFromPath(filePath string) error {
 		return fmt.Errorf("open config file error: %s", err)
 	}
 	defer f.Close()
-	return json.NewDecoder(json5.NewTrimNodeReader(f)).Decode(p)
+
+	reader := json5.NewTrimNodeReader(f)
+	data, err := io.ReadAll(reader)
+	if err != nil {
+		return fmt.Errorf("read config file error: %s", err)
+	}
+
+	err = json.Unmarshal(data, p)
+	if err != nil {
+		return fmt.Errorf("unmarshal config error: %s", err)
+	}
+
+	return nil
 }

conf/watch.go

@@ -2,12 +2,12 @@ package conf
 
 import (
 	"fmt"
-	"github.com/fsnotify/fsnotify"
 	"log"
-	"path"
 	"path/filepath"
 	"strings"
 	"time"
+
+	"github.com/fsnotify/fsnotify"
 )
 
 func (p *Conf) Watch(filePath, xDnsPath string, sDnsPath string, reload func()) error {
@@ -34,7 +34,7 @@ func (p *Conf) Watch(filePath, xDnsPath string, sDnsPath string, reload func())
 					case filepath.Base(xDnsPath), filepath.Base(sDnsPath):
 						log.Println("DNS file changed, reloading...")
 					default:
-						log.Println("config dir changed, reloading...")
+						log.Println("config file changed, reloading...")
 					}
 					*p = *New()
 					err := p.LoadFromPath(filePath)
@@ -51,18 +51,18 @@ func (p *Conf) Watch(filePath, xDnsPath string, sDnsPath string, reload func())
 			}
 		}
 	}()
-	err = watcher.Add(path.Dir(filePath))
+	err = watcher.Add(filePath)
 	if err != nil {
 		return fmt.Errorf("watch file error: %s", err)
 	}
 	if xDnsPath != "" {
-		err = watcher.Add(path.Dir(xDnsPath))
+		err = watcher.Add(xDnsPath)
 		if err != nil {
 			return fmt.Errorf("watch dns file error: %s", err)
 		}
 	}
 	if sDnsPath != "" {
-		err = watcher.Add(path.Dir(sDnsPath))
+		err = watcher.Add(sDnsPath)
 		if err != nil {
 			return fmt.Errorf("watch dns file error: %s", err)
 		}

core/sing/sing.go

@@ -3,6 +3,7 @@ package sing
 import (
 	"context"
 	"fmt"
+	"io"
 	"os"
 
 	"github.com/sagernet/sing-box/log"
@@ -38,14 +39,13 @@ func init() {
 func New(c *conf.CoreConfig) (vCore.Core, error) {
 	options := option.Options{}
 	if len(c.SingConfig.OriginalPath) != 0 {
-		f, err := os.Open(c.SingConfig.OriginalPath)
+		data, err := os.ReadFile(c.SingConfig.OriginalPath)
 		if err != nil {
-			return nil, fmt.Errorf("open original config error: %s", err)
+			return nil, fmt.Errorf("read original config error: %s", err)
 		}
-		defer f.Close()
-		err = json.NewDecoder(f).Decode(&options)
+		err = json.Unmarshal(data, &options)
 		if err != nil {
-			return nil, fmt.Errorf("decode original config error: %s", err)
+			return nil, fmt.Errorf("unmarshal original config error: %s", err)
 		}
 	}
 	options.Log = &option.LogOptions{
@@ -68,11 +68,19 @@ func New(c *conf.CoreConfig) (vCore.Core, error) {
 			return nil, fmt.Errorf("failed to open or create sing dns config file: %s", err)
 		}
 		defer f.Close()
-		if err := json.NewDecoder(f).Decode(options.DNS); err != nil {
+		data, err := io.ReadAll(f)
+		if err != nil {
 			log.Warn(fmt.Sprintf(
-				"Failed to unmarshal sing dns config from file '%v': %v. Using default DNS options",
+				"Failed to read sing dns config from file '%v': %v. Using default DNS options",
 				f.Name(), err))
 			options.DNS = &option.DNSOptions{}
+		} else {
+			if err := json.Unmarshal(data, options.DNS); err != nil {
+				log.Warn(fmt.Sprintf(
+					"Failed to unmarshal sing dns config from file '%v': %v. Using default DNS options",
+					f.Name(), err))
+				options.DNS = &option.DNSOptions{}
+			}
 		}
 		os.Setenv("SING_DNS_PATH", c.SingConfig.DnsConfigPath)
 	}

core/xray/dns.go

@@ -2,14 +2,15 @@ package xray
 
 import (
 	"bytes"
-	"github.com/InazumaV/V2bX/api/panel"
-	"github.com/goccy/go-json"
-	log "github.com/sirupsen/logrus"
-	coreConf "github.com/xtls/xray-core/infra/conf"
 	"net"
 	"os"
 	"strconv"
 	"strings"
+
+	"github.com/InazumaV/V2bX/api/panel"
+	"github.com/goccy/go-json"
+	log "github.com/sirupsen/logrus"
+	coreConf "github.com/xtls/xray-core/infra/conf"
 )
 
 func updateDNSConfig(node *panel.NodeInfo) (err error) {
@@ -62,7 +63,7 @@ func saveDnsConfig(dns []byte, dnsPath string) (err error) {
 	}
 	if !bytes.Equal(currentData, dns) {
 		coreDnsConfig := &coreConf.DNSConfig{}
-		if err = json.NewDecoder(bytes.NewReader(dns)).Decode(coreDnsConfig); err != nil {
+		if err = json.Unmarshal(dns, coreDnsConfig); err != nil {
 			log.WithField("err", err).Error("Failed to unmarshal DNS config")
 		}
 		_, err := coreDnsConfig.Build()

core/xray/xray.go

@@ -58,22 +58,24 @@ func parseConnectionConfig(c *conf.XrayConnectionConfig) (policy *coreConf.Polic
 func getCore(c *conf.XrayConfig) *core.Instance {
 	os.Setenv("XRAY_LOCATION_ASSET", c.AssetPath)
 	// Log Config
-	coreLogConfig := &coreConf.LogConfig{}
-	coreLogConfig.LogLevel = c.LogConfig.Level
-	coreLogConfig.AccessLog = c.LogConfig.AccessPath
-	coreLogConfig.ErrorLog = c.LogConfig.ErrorPath
+	coreLogConfig := &coreConf.LogConfig{
+		LogLevel:  c.LogConfig.Level,
+		AccessLog: c.LogConfig.AccessPath,
+		ErrorLog:  c.LogConfig.ErrorPath,
+	}
 	// DNS config
 	coreDnsConfig := &coreConf.DNSConfig{}
 	os.Setenv("XRAY_DNS_PATH", "")
 	if c.DnsConfigPath != "" {
-		f, err := os.OpenFile(c.DnsConfigPath, os.O_RDWR|os.O_CREATE, 0755)
+		data, err := os.ReadFile(c.DnsConfigPath)
 		if err != nil {
-			log.Error("Failed to open or create xray dns config file: %v", err)
-		}
-		defer f.Close()
-		if err := json.NewDecoder(f).Decode(coreDnsConfig); err != nil {
-			log.Error(fmt.Sprintf("Failed to unmarshal xray dns config from file '%v': %v. Using default DNS options.", f.Name(), err))
+			log.Error(fmt.Sprintf("Failed to read xray dns config file: %v", err))
 			coreDnsConfig = &coreConf.DNSConfig{}
+		} else {
+			if err := json.Unmarshal(data, coreDnsConfig); err != nil {
+				log.Error(fmt.Sprintf("Failed to unmarshal xray dns config: %v. Using default DNS options.", err))
+				coreDnsConfig = &coreConf.DNSConfig{}
+			}
 		}
 		os.Setenv("XRAY_DNS_PATH", c.DnsConfigPath)
 	}
@@ -84,25 +86,27 @@ func getCore(c *conf.XrayConfig) *core.Instance {
 	// Routing config
 	coreRouterConfig := &coreConf.RouterConfig{}
 	if c.RouteConfigPath != "" {
-		if f, err := os.Open(c.RouteConfigPath); err != nil {
+		data, err := os.ReadFile(c.RouteConfigPath)
+		if err != nil {
 			log.WithField("err", err).Panic("Failed to read Routing config file")
 		} else {
-			if err = json.NewDecoder(f).Decode(coreRouterConfig); err != nil {
+			if err = json.Unmarshal(data, coreRouterConfig); err != nil {
 				log.WithField("err", err).Panic("Failed to unmarshal Routing config")
 			}
 		}
 	}
 	routeConfig, err := coreRouterConfig.Build()
 	if err != nil {
-		log.WithField("err", err).Panic("Failed to understand Routing config  Please check: https://xtls.github.io/config/routing.html")
+		log.WithField("err", err).Panic("Failed to understand Routing config. Please check: https://xtls.github.io/config/routing.html for help")
 	}
 	// Custom Inbound config
 	var coreCustomInboundConfig []coreConf.InboundDetourConfig
 	if c.InboundConfigPath != "" {
-		if f, err := os.Open(c.InboundConfigPath); err != nil {
+		data, err := os.ReadFile(c.InboundConfigPath)
+		if err != nil {
 			log.WithField("err", err).Panic("Failed to read Custom Inbound config file")
 		} else {
-			if err = json.NewDecoder(f).Decode(&coreCustomInboundConfig); err != nil {
+			if err = json.Unmarshal(data, &coreCustomInboundConfig); err != nil {
 				log.WithField("err", err).Panic("Failed to unmarshal Custom Inbound config")
 			}
 		}
@@ -111,17 +115,18 @@ func getCore(c *conf.XrayConfig) *core.Instance {
 	for _, config := range coreCustomInboundConfig {
 		oc, err := config.Build()
 		if err != nil {
-			log.WithField("err", err).Panic("Failed to understand Inbound config, Please check: https://xtls.github.io/config/inbound.html for help")
+			log.WithField("err", err).Panic("Failed to understand Inbound config. Please check: https://xtls.github.io/config/inbound.html for help")
 		}
 		inBoundConfig = append(inBoundConfig, oc)
 	}
 	// Custom Outbound config
 	var coreCustomOutboundConfig []coreConf.OutboundDetourConfig
 	if c.OutboundConfigPath != "" {
-		if f, err := os.Open(c.OutboundConfigPath); err != nil {
+		data, err := os.ReadFile(c.OutboundConfigPath)
+		if err != nil {
 			log.WithField("err", err).Panic("Failed to read Custom Outbound config file")
 		} else {
-			if err = json.NewDecoder(f).Decode(&coreCustomOutboundConfig); err != nil {
+			if err = json.Unmarshal(data, &coreCustomOutboundConfig); err != nil {
 				log.WithField("err", err).Panic("Failed to unmarshal Custom Outbound config")
 			}
 		}

main.go

@@ -1,16 +1,9 @@
 package main
 
 import (
-	_ "net/http"
-	_ "net/http/pprof"
-
 	"github.com/InazumaV/V2bX/cmd"
 )
 
 func main() {
-	//内存泄漏排查
-	//	go func() {
-	//		http.ListenAndServe("0.0.0.0:6060", nil)
-	//	}()
 	cmd.Run()
 }

node/lego.go

@@ -262,12 +262,14 @@ func (u *User) DecodePrivate(pemEncodedPriv string) (*ecdsa.PrivateKey, error) {
 	privateKey, err := x509.ParseECPrivateKey(x509EncodedPriv)
 	return privateKey, err
 }
+
 func (u *User) Load(path string) error {
-	f, err := os.Open(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		return fmt.Errorf("open file error: %s", err)
 	}
-	err = json.NewDecoder(f).Decode(u)
+
+	err = json.Unmarshal(data, u)
 	if err != nil {
 		return fmt.Errorf("unmarshal json error: %s", err)
 	}

node/user.go

@@ -82,29 +82,24 @@ func (c *Controller) reportUserTrafficTask() (err error) {
 }
 
 func compareUserList(old, new []panel.UserInfo) (deleted, added []panel.UserInfo) {
-	tmp := map[string]struct{}{}
-	tmp2 := map[string]struct{}{}
-	for i := range old {
-		tmp[old[i].Uuid+strconv.Itoa(old[i].SpeedLimit)] = struct{}{}
+	oldMap := make(map[string]int)
+	for i, user := range old {
+		key := user.Uuid + strconv.Itoa(user.SpeedLimit)
+		oldMap[key] = i
 	}
-	l := len(tmp)
-	for i := range new {
-		e := new[i].Uuid + strconv.Itoa(new[i].SpeedLimit)
-		tmp[e] = struct{}{}
-		tmp2[e] = struct{}{}
-		if l != len(tmp) {
-			added = append(added, new[i])
-			l++
+
+	for _, user := range new {
+		key := user.Uuid + strconv.Itoa(user.SpeedLimit)
+		if _, exists := oldMap[key]; !exists {
+			added = append(added, user)
+		} else {
+			delete(oldMap, key)
 		}
 	}
-	tmp = nil
-	l = len(tmp2)
-	for i := range old {
-		tmp2[old[i].Uuid+strconv.Itoa(old[i].SpeedLimit)] = struct{}{}
-		if l != len(tmp2) {
-			deleted = append(deleted, old[i])
-			l++
-		}
+
+	for _, index := range oldMap {
+		deleted = append(deleted, old[index])
 	}
+
 	return deleted, added
 }