feat(config): enhance NodeConfig with TrafficReportThreshold, IPStrategy, DNS, Block, and Outbound fields

internal/logic/admin/system/getNodeConfigLogic.go

@@ -2,7 +2,8 @@ package system
 
 import (
 	"context"
-
+	"encoding/json"
+	"github.com/perfect-panel/server/internal/config"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/logger"
@@ -26,15 +27,45 @@ func NewGetNodeConfigLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Get
 }
 
 func (l *GetNodeConfigLogic) GetNodeConfig() (*types.NodeConfig, error) {
-	resp := &types.NodeConfig{}
-
 	// get server config from db
 	configs, err := l.svcCtx.SystemModel.GetNodeConfig(l.ctx)
 	if err != nil {
 		l.Errorw("[GetNodeConfigLogic] GetNodeConfig get server config error: ", logger.Field("error", err.Error()))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "GetNodeConfig get server config error: %v", err.Error())
 	}
-	// reflect to response
-	tool.SystemConfigSliceReflectToStruct(configs, resp)
-	return resp, nil
+	var dbConfig config.NodeDBConfig
+	tool.SystemConfigSliceReflectToStruct(configs, &dbConfig)
+	c := &types.NodeConfig{
+		NodeSecret:             dbConfig.NodeSecret,
+		NodePullInterval:       dbConfig.NodePullInterval,
+		NodePushInterval:       dbConfig.NodePushInterval,
+		IPStrategy:             dbConfig.IPStrategy,
+		TrafficReportThreshold: dbConfig.TrafficReportThreshold,
+	}
+
+	if dbConfig.DNS != "" {
+		var dns []types.NodeDNS
+		err = json.Unmarshal([]byte(dbConfig.DNS), &dns)
+		if err != nil {
+			logger.Errorf("[Node] Unmarshal DNS config error: %s", err.Error())
+			panic(err)
+		}
+		c.DNS = dns
+	}
+	if dbConfig.Block != "" {
+		var block []string
+		_ = json.Unmarshal([]byte(dbConfig.Block), &block)
+		c.Block = tool.RemoveDuplicateElements(block...)
+	}
+	if dbConfig.Outbound != "" {
+		var outbound []types.NodeOutbound
+		err = json.Unmarshal([]byte(dbConfig.Outbound), &outbound)
+		if err != nil {
+			logger.Errorf("[Node] Unmarshal Outbound config error: %s", err.Error())
+			panic(err)
+		}
+		c.Outbound = outbound
+	}
+
+	return c, nil
 }

internal/logic/admin/system/updateNodeConfigLogic.go

@@ -41,7 +41,9 @@ func (l *UpdateNodeConfigLogic) UpdateNodeConfig(req *types.NodeConfig) error {
 			// Get the field name
 			fieldName := t.Field(i).Name
 			// Get the field value to string
-			fieldValue := tool.ConvertValueToString(v.Field(i))
+			var fieldValue string
+
+			fieldValue = tool.ConvertValueToString(v.Field(i))
 			// Update the server config
 			err = db.Model(&system.System{}).Where("`category` = 'server' and `key` = ?", fieldName).Update("value", fieldValue).Error
 			if err != nil {

internal/logic/server/queryServerProtocolConfigLogic.go

@@ -41,7 +41,53 @@ func (l *QueryServerProtocolConfigLogic) QueryServerProtocolConfig(req *types.Qu
 	}
 	tool.DeepCopy(&protocols, dst)
 
+	// filter by req.Protocols
+
+	if len(req.Protocols) > 0 {
+		var filtered []types.Protocol
+		protocolSet := make(map[string]struct{})
+		for _, p := range req.Protocols {
+			protocolSet[p] = struct{}{}
+		}
+		for _, p := range protocols {
+			if _, exists := protocolSet[p.Type]; exists {
+				filtered = append(filtered, p)
+			}
+		}
+		protocols = filtered
+	}
+
+	var dns []types.NodeDNS
+	if len(l.svcCtx.Config.Node.DNS) > 0 {
+		for _, d := range l.svcCtx.Config.Node.DNS {
+			dns = append(dns, types.NodeDNS{
+				Proto:   d.Proto,
+				Address: d.Address,
+				Domains: d.Domains,
+			})
+		}
+	}
+	var outbound []types.NodeOutbound
+	if len(l.svcCtx.Config.Node.Outbound) > 0 {
+		for _, o := range l.svcCtx.Config.Node.Outbound {
+			outbound = append(outbound, types.NodeOutbound{
+				Name:     o.Name,
+				Protocol: o.Protocol,
+				Address:  o.Address,
+				Port:     o.Port,
+				Password: o.Password,
+				Rules:    o.Rules,
+			})
+		}
+	}
+
 	return &types.QueryServerConfigResponse{
-		Protocols: protocols,
+		TrafficReportThreshold: l.svcCtx.Config.Node.TrafficReportThreshold,
+		IPStrategy:             l.svcCtx.Config.Node.IPStrategy,
+		DNS:                    dns,
+		Block:                  l.svcCtx.Config.Node.Block,
+		Outbound:               outbound,
+		Protocols:              protocols,
+		Total:                  int64(len(protocols)),
 	}, nil
 }