优化服务列表返回速度

cmd/installer-dns-helper/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"flag"
-	"github.com/TeaOSLab/EdgeAPI/internal/utils"
+	"github.com/TeaOSLab/EdgeAPI/internal/installers/helpers"
 	"github.com/iwind/gosock/pkg/gosock"
 	"os"
 	"os/exec"
@@ -51,7 +51,7 @@ func main() {
 			return
 		}
 
-		unzip := utils.NewUnzip(zipPath, targetPath)
+		unzip := helpers.NewUnzip(zipPath, targetPath)
 		err := unzip.Run()
 		if err != nil {
 			stderr("ERROR: " + err.Error())

cmd/installer-helper/main.go

@@ -1,8 +1,9 @@
 package main
 
+// 注意这里的依赖文件应该最小化，从而使编译后的文件最小化
 import (
 	"flag"
-	"github.com/TeaOSLab/EdgeAPI/internal/utils"
+	"github.com/TeaOSLab/EdgeAPI/internal/installers/helpers"
 	"github.com/iwind/gosock/pkg/gosock"
 	"os"
 	"os/exec"
@@ -51,7 +52,7 @@ func main() {
 			return
 		}
 
-		unzip := utils.NewUnzip(zipPath, targetPath)
+		unzip := helpers.NewUnzip(zipPath, targetPath)
 		err := unzip.Run()
 		if err != nil {
 			stderr("ERROR: " + err.Error())

internal/const/const.go

@@ -1,7 +1,7 @@
 package teaconst
 
 const (
-	Version = "0.5.4"
+	Version = "0.5.5"
 
 	ProductName   = "Edge API"
 	ProcessName   = "edge-api"
@@ -18,8 +18,8 @@ const (
 
 	// 其他节点版本号，用来检测是否有需要升级的节点
 
-	NodeVersion          = "0.5.4"
+	NodeVersion          = "0.5.5"
-	UserNodeVersion      = "0.5.0"
+	UserNodeVersion      = "0.5.5"
 	DNSNodeVersion       = "0.2.8"
 	AuthorityNodeVersion = "0.0.2"
 	MonitorNodeVersion   = "0.0.4"

internal/db/models/accounts/order_method_model.go

@@ -14,6 +14,7 @@ type OrderMethod struct {
 	Secret      string   `field:"secret"`      // 密钥
 	Params      dbs.JSON `field:"params"`      // 参数
 	ClientType  string   `field:"clientType"`  // 客户端类型
+	QrcodeTitle string   `field:"qrcodeTitle"` // 二维码标题
 	Order       uint32   `field:"order"`       // 排序
 	State       uint8    `field:"state"`       // 状态
 }
@@ -29,6 +30,7 @@ type OrderMethodOperator struct {
 	Secret      any // 密钥
 	Params      any // 参数
 	ClientType  any // 客户端类型
+	QrcodeTitle any // 二维码标题
 	Order       any // 排序
 	State       any // 状态
 }

internal/db/models/node_dao.go

@@ -976,7 +976,7 @@ func (this *NodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64, cacheMap *utils
 	}
 
 	for _, server := range servers {
-		serverConfig, err := SharedServerDAO.ComposeServerConfig(tx, server, cacheMap, true)
+		serverConfig, err := SharedServerDAO.ComposeServerConfig(tx, server, cacheMap, true, false)
 		if err != nil {
 			return nil, err
 		}

internal/db/models/server_dao.go

@@ -1009,12 +1009,12 @@ func (this *ServerDAO) ComposeServerConfigWithServerId(tx *dbs.Tx, serverId int6
 	if server == nil {
 		return nil, ErrNotFound
 	}
-	return this.ComposeServerConfig(tx, server, nil, forNode)
+	return this.ComposeServerConfig(tx, server, nil, forNode, false)
 }
 
 // ComposeServerConfig 构造服务的Config
 // forNode 是否是节点请求
-func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap *utils.CacheMap, forNode bool) (*serverconfigs.ServerConfig, error) {
+func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap *utils.CacheMap, forNode bool, forList bool) (*serverconfigs.ServerConfig, error) {
 	if server == nil {
 		return nil, ErrNotFound
 	}
@@ -1039,7 +1039,7 @@ func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap
 
 	var groupConfig *serverconfigs.ServerGroupConfig
 	for _, groupId := range server.DecodeGroupIds() {
-		groupConfig1, err := SharedServerGroupDAO.ComposeGroupConfig(tx, groupId, cacheMap)
+		groupConfig1, err := SharedServerGroupDAO.ComposeGroupConfig(tx, groupId, forList, cacheMap)
 		if err != nil {
 			return nil, err
 		}
@@ -1062,28 +1062,30 @@ func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap
 	}
 
 	// CNAME
-	config.SupportCNAME = server.SupportCNAME == 1
+	if !forList {
-	if server.ClusterId > 0 && len(server.DnsName) > 0 {
+		config.SupportCNAME = server.SupportCNAME == 1
-		clusterDNS, err := SharedNodeClusterDAO.FindClusterDNSInfo(tx, int64(server.ClusterId), cacheMap)
+		if server.ClusterId > 0 && len(server.DnsName) > 0 {
-		if err != nil {
+			clusterDNS, err := SharedNodeClusterDAO.FindClusterDNSInfo(tx, int64(server.ClusterId), cacheMap)
-			return nil, err
-		}
-		if clusterDNS != nil && clusterDNS.DnsDomainId > 0 {
-			clusterDNSConfig, err := clusterDNS.DecodeDNSConfig()
 			if err != nil {
 				return nil, err
 			}
+			if clusterDNS != nil && clusterDNS.DnsDomainId > 0 {
+				clusterDNSConfig, err := clusterDNS.DecodeDNSConfig()
+				if err != nil {
+					return nil, err
+				}
 
-			domain, err := dns.SharedDNSDomainDAO.FindEnabledDNSDomain(tx, int64(clusterDNS.DnsDomainId), cacheMap)
+				domain, err := dns.SharedDNSDomainDAO.FindEnabledDNSDomain(tx, int64(clusterDNS.DnsDomainId), cacheMap)
-			if err != nil {
+				if err != nil {
-				return nil, err
+					return nil, err
-			}
+				}
-			if domain != nil {
+				if domain != nil {
-				var cname = server.DnsName + "." + domain.Name
+					var cname = server.DnsName + "." + domain.Name
-				config.CNameDomain = cname
+					config.CNameDomain = cname
-				if clusterDNSConfig.CNAMEAsDomain {
+					if clusterDNSConfig.CNAMEAsDomain {
-					config.CNameAsDomain = true
+						config.CNameAsDomain = true
-					config.AliasServerNames = append(config.AliasServerNames, cname)
+						config.AliasServerNames = append(config.AliasServerNames, cname)
+					}
 				}
 			}
 		}
@@ -1174,61 +1176,71 @@ func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap
 	}
 
 	// Web
-	if server.WebId > 0 {
+	if !forList {
-		webConfig, err := SharedHTTPWebDAO.ComposeWebConfig(tx, int64(server.WebId), cacheMap)
+		if server.WebId > 0 {
-		if err != nil {
+			webConfig, err := SharedHTTPWebDAO.ComposeWebConfig(tx, int64(server.WebId), cacheMap)
-			return nil, err
+			if err != nil {
-		}
+				return nil, err
-		if webConfig != nil {
+			}
-			config.Web = webConfig
+			if webConfig != nil {
+				config.Web = webConfig
+			}
 		}
 	}
 
 	// ReverseProxy
-	if IsNotNull(server.ReverseProxy) {
+	if !forList {
-		var reverseProxyRef = &serverconfigs.ReverseProxyRef{}
+		if IsNotNull(server.ReverseProxy) {
-		err := json.Unmarshal(server.ReverseProxy, reverseProxyRef)
+			var reverseProxyRef = &serverconfigs.ReverseProxyRef{}
-		if err != nil {
+			err := json.Unmarshal(server.ReverseProxy, reverseProxyRef)
-			return nil, err
+			if err != nil {
-		}
+				return nil, err
-		config.ReverseProxyRef = reverseProxyRef
+			}
+			config.ReverseProxyRef = reverseProxyRef
 
-		reverseProxyConfig, err := SharedReverseProxyDAO.ComposeReverseProxyConfig(tx, reverseProxyRef.ReverseProxyId, cacheMap)
+			reverseProxyConfig, err := SharedReverseProxyDAO.ComposeReverseProxyConfig(tx, reverseProxyRef.ReverseProxyId, cacheMap)
-		if err != nil {
+			if err != nil {
-			return nil, err
+				return nil, err
-		}
+			}
-		if reverseProxyConfig != nil {
+			if reverseProxyConfig != nil {
-			config.ReverseProxy = reverseProxyConfig
+				config.ReverseProxy = reverseProxyConfig
+			}
 		}
 	}
 
 	// WAF策略
 	var clusterId = int64(server.ClusterId)
-	httpFirewallPolicyId, err := SharedNodeClusterDAO.FindClusterHTTPFirewallPolicyId(tx, clusterId, cacheMap)
+	if !forList {
-	if err != nil {
+		httpFirewallPolicyId, err := SharedNodeClusterDAO.FindClusterHTTPFirewallPolicyId(tx, clusterId, cacheMap)
-		return nil, err
-	}
-	if httpFirewallPolicyId > 0 {
-		config.HTTPFirewallPolicyId = httpFirewallPolicyId
-	}
-
-	// 缓存策略
-	httpCachePolicyId, err := SharedNodeClusterDAO.FindClusterHTTPCachePolicyId(tx, clusterId, cacheMap)
-	if err != nil {
-		return nil, err
-	}
-	if httpCachePolicyId > 0 {
-		config.HTTPCachePolicyId = httpCachePolicyId
-	}
-
-	// traffic limit
-	if len(server.TrafficLimit) > 0 {
-		var trafficLimitConfig = &serverconfigs.TrafficLimitConfig{}
-		err = json.Unmarshal(server.TrafficLimit, trafficLimitConfig)
 		if err != nil {
 			return nil, err
 		}
-		config.TrafficLimit = trafficLimitConfig
+		if httpFirewallPolicyId > 0 {
+			config.HTTPFirewallPolicyId = httpFirewallPolicyId
+		}
+	}
+
+	// 缓存策略
+	if !forList {
+		httpCachePolicyId, err := SharedNodeClusterDAO.FindClusterHTTPCachePolicyId(tx, clusterId, cacheMap)
+		if err != nil {
+			return nil, err
+		}
+		if httpCachePolicyId > 0 {
+			config.HTTPCachePolicyId = httpCachePolicyId
+		}
+	}
+
+	// traffic limit
+	if !forList {
+		if len(server.TrafficLimit) > 0 {
+			var trafficLimitConfig = &serverconfigs.TrafficLimitConfig{}
+			err := json.Unmarshal(server.TrafficLimit, trafficLimitConfig)
+			if err != nil {
+				return nil, err
+			}
+			config.TrafficLimit = trafficLimitConfig
+		}
 	}
 
 	// 用户套餐
@@ -1271,7 +1283,7 @@ func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap
 	if config.TrafficLimit != nil && config.TrafficLimit.IsOn && !config.TrafficLimit.IsEmpty() {
 		if len(server.TrafficLimitStatus) > 0 {
 			var status = &serverconfigs.TrafficLimitStatus{}
-			err = json.Unmarshal(server.TrafficLimitStatus, status)
+			err := json.Unmarshal(server.TrafficLimitStatus, status)
 			if err != nil {
 				return nil, err
 			}
@@ -1282,14 +1294,16 @@ func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap
 	}
 
 	// UAM
-	if teaconst.IsPlus && IsNotNull(server.Uam) {
+	if !forList {
-		var uamConfig = &serverconfigs.UAMConfig{}
+		if teaconst.IsPlus && IsNotNull(server.Uam) {
-		err = json.Unmarshal(server.Uam, uamConfig)
+			var uamConfig = &serverconfigs.UAMConfig{}
-		if err != nil {
+			err := json.Unmarshal(server.Uam, uamConfig)
-			return nil, err
+			if err != nil {
-		}
+				return nil, err
-		if uamConfig.IsOn {
+			}
-			config.UAM = uamConfig
+			if uamConfig.IsOn {
+				config.UAM = uamConfig
+			}
 		}
 	}
 

internal/db/models/server_group_dao.go

@@ -279,7 +279,7 @@ func (this *ServerGroupDAO) InitGroupWeb(tx *dbs.Tx, groupId int64) (int64, erro
 }
 
 // ComposeGroupConfig 组合配置
-func (this *ServerGroupDAO) ComposeGroupConfig(tx *dbs.Tx, groupId int64, cacheMap *utils.CacheMap) (*serverconfigs.ServerGroupConfig, error) {
+func (this *ServerGroupDAO) ComposeGroupConfig(tx *dbs.Tx, groupId int64, forList bool, cacheMap *utils.CacheMap) (*serverconfigs.ServerGroupConfig, error) {
 	if cacheMap == nil {
 		cacheMap = utils.NewCacheMap()
 	}
@@ -315,65 +315,67 @@ func (this *ServerGroupDAO) ComposeGroupConfig(tx *dbs.Tx, groupId int64, cacheM
 		IsOn: group.IsOn,
 	}
 
-	if IsNotNull(group.HttpReverseProxy) {
+	if !forList {
-		reverseProxyRef := &serverconfigs.ReverseProxyRef{}
+		if IsNotNull(group.HttpReverseProxy) {
-		err := json.Unmarshal(group.HttpReverseProxy, reverseProxyRef)
+			reverseProxyRef := &serverconfigs.ReverseProxyRef{}
-		if err != nil {
+			err := json.Unmarshal(group.HttpReverseProxy, reverseProxyRef)
-			return nil, err
+			if err != nil {
-		}
+				return nil, err
-		config.HTTPReverseProxyRef = reverseProxyRef
+			}
+			config.HTTPReverseProxyRef = reverseProxyRef
 
-		reverseProxyConfig, err := SharedReverseProxyDAO.ComposeReverseProxyConfig(tx, reverseProxyRef.ReverseProxyId, cacheMap)
+			reverseProxyConfig, err := SharedReverseProxyDAO.ComposeReverseProxyConfig(tx, reverseProxyRef.ReverseProxyId, cacheMap)
-		if err != nil {
+			if err != nil {
-			return nil, err
+				return nil, err
+			}
+			if reverseProxyConfig != nil {
+				config.HTTPReverseProxy = reverseProxyConfig
+			}
 		}
-		if reverseProxyConfig != nil {
-			config.HTTPReverseProxy = reverseProxyConfig
-		}
-	}
 
-	if IsNotNull(group.TcpReverseProxy) {
+		if IsNotNull(group.TcpReverseProxy) {
-		reverseProxyRef := &serverconfigs.ReverseProxyRef{}
+			reverseProxyRef := &serverconfigs.ReverseProxyRef{}
-		err := json.Unmarshal(group.TcpReverseProxy, reverseProxyRef)
+			err := json.Unmarshal(group.TcpReverseProxy, reverseProxyRef)
-		if err != nil {
+			if err != nil {
-			return nil, err
+				return nil, err
-		}
+			}
-		config.TCPReverseProxyRef = reverseProxyRef
+			config.TCPReverseProxyRef = reverseProxyRef
 
-		reverseProxyConfig, err := SharedReverseProxyDAO.ComposeReverseProxyConfig(tx, reverseProxyRef.ReverseProxyId, cacheMap)
+			reverseProxyConfig, err := SharedReverseProxyDAO.ComposeReverseProxyConfig(tx, reverseProxyRef.ReverseProxyId, cacheMap)
-		if err != nil {
+			if err != nil {
-			return nil, err
+				return nil, err
+			}
+			if reverseProxyConfig != nil {
+				config.TCPReverseProxy = reverseProxyConfig
+			}
 		}
-		if reverseProxyConfig != nil {
-			config.TCPReverseProxy = reverseProxyConfig
-		}
-	}
 
-	if IsNotNull(group.UdpReverseProxy) {
+		if IsNotNull(group.UdpReverseProxy) {
-		reverseProxyRef := &serverconfigs.ReverseProxyRef{}
+			reverseProxyRef := &serverconfigs.ReverseProxyRef{}
-		err := json.Unmarshal(group.UdpReverseProxy, reverseProxyRef)
+			err := json.Unmarshal(group.UdpReverseProxy, reverseProxyRef)
-		if err != nil {
+			if err != nil {
-			return nil, err
+				return nil, err
-		}
+			}
-		config.UDPReverseProxyRef = reverseProxyRef
+			config.UDPReverseProxyRef = reverseProxyRef
 
-		reverseProxyConfig, err := SharedReverseProxyDAO.ComposeReverseProxyConfig(tx, reverseProxyRef.ReverseProxyId, cacheMap)
+			reverseProxyConfig, err := SharedReverseProxyDAO.ComposeReverseProxyConfig(tx, reverseProxyRef.ReverseProxyId, cacheMap)
-		if err != nil {
+			if err != nil {
-			return nil, err
+				return nil, err
+			}
+			if reverseProxyConfig != nil {
+				config.UDPReverseProxy = reverseProxyConfig
+			}
 		}
-		if reverseProxyConfig != nil {
-			config.UDPReverseProxy = reverseProxyConfig
-		}
-	}
 
-	// web
+		// web
-	if group.WebId > 0 {
+		if group.WebId > 0 {
-		webConfig, err := SharedHTTPWebDAO.ComposeWebConfig(tx, int64(group.WebId), cacheMap)
+			webConfig, err := SharedHTTPWebDAO.ComposeWebConfig(tx, int64(group.WebId), cacheMap)
-		if err != nil {
+			if err != nil {
-			return nil, err
+				return nil, err
-		}
+			}
-		if webConfig != nil {
+			if webConfig != nil {
-			config.Web = webConfig
+				config.Web = webConfig
+			}
 		}
 	}
 

internal/installers/helpers/README.md

@@ -0,0 +1 @@
+远程安装依赖文件，单独放在一个目录防止安装包过大

internal/installers/helpers/unzip.go

@@ -0,0 +1,91 @@
+package helpers
+
+import (
+	"archive/zip"
+	"errors"
+	"io"
+	"os"
+)
+
+type Unzip struct {
+	zipFile   string
+	targetDir string
+}
+
+func NewUnzip(zipFile string, targetDir string) *Unzip {
+	return &Unzip{
+		zipFile:   zipFile,
+		targetDir: targetDir,
+	}
+}
+
+func (this *Unzip) Run() error {
+	if len(this.zipFile) == 0 {
+		return errors.New("zip file should not be empty")
+	}
+	if len(this.targetDir) == 0 {
+		return errors.New("target dir should not be empty")
+	}
+
+	reader, err := zip.OpenReader(this.zipFile)
+	if err != nil {
+		return err
+	}
+
+	defer func() {
+		_ = reader.Close()
+	}()
+
+	for _, file := range reader.File {
+		info := file.FileInfo()
+		target := this.targetDir + "/" + file.Name
+
+		// 目录
+		if info.IsDir() {
+			stat, err := os.Stat(target)
+			if err != nil {
+				if !os.IsNotExist(err) {
+					return err
+				} else {
+					err = os.MkdirAll(target, info.Mode())
+					if err != nil {
+						return err
+					}
+				}
+			} else if !stat.IsDir() {
+				err = os.MkdirAll(target, info.Mode())
+				if err != nil {
+					return err
+				}
+			}
+			continue
+		}
+
+		// 文件
+		err := func(file *zip.File, target string) error {
+			fileReader, err := file.Open()
+			if err != nil {
+				return err
+			}
+			defer func() {
+				_ = fileReader.Close()
+			}()
+
+			fileWriter, err := os.OpenFile(target, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, file.FileInfo().Mode())
+			if err != nil {
+				return err
+			}
+			defer func() {
+				_ = fileWriter.Close()
+			}()
+
+			_, err = io.Copy(fileWriter, fileReader)
+			return err
+		}(file, target)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

internal/installers/helpers/unzip_test.go

@@ -0,0 +1,17 @@
+package helpers_test
+
+import (
+	"github.com/TeaOSLab/EdgeAPI/internal/installers/helpers"
+	"github.com/iwind/TeaGo/Tea"
+	_ "github.com/iwind/TeaGo/bootstrap"
+	"testing"
+)
+
+func TestUnzip_Run(t *testing.T) {
+	var unzip = helpers.NewUnzip(Tea.Root+"/deploy/edge-node-v0.0.1.zip", Tea.Root+"/deploy/")
+	err := unzip.Run()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("OK")
+}

internal/installers/installer_base.go

@@ -147,7 +147,7 @@ func (this *BaseInstaller) LookupLatestInstaller(filePrefix string) (string, err
 
 // InstallHelper 上传安装助手
 func (this *BaseInstaller) InstallHelper(targetDir string, role nodeconfigs.NodeRole) (env *Env, err error) {
-	uname, _, err := this.client.Exec("uname -a")
+	uname, _, err := this.client.Exec("/usr/bin/uname -a")
 	if err != nil {
 		return env, err
 	}

internal/installers/queue_node.go

@@ -366,7 +366,7 @@ func (this *NodeQueue) StopNode(nodeId int64) error {
 	}
 
 	// 我们先尝试Systemd停止
-	_, _, _ = installer.client.Exec("systemctl stop edge-node")
+	_, _, _ = installer.client.Exec("/usr/bin/systemctl stop edge-node")
 
 	// 执行stop
 	_, stderr, err := installer.client.Exec(exe + " stop")

internal/rpc/services/service_server.go

@@ -840,21 +840,38 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.
 		}
 
 		// 配置
-		config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, nil, false)
+		config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, nil, false, true)
 		if err != nil {
 			return nil, err
 		}
+		var countServerNames int32 = 0
+		for _, serverName := range config.ServerNames {
+			if len(serverName.SubNames) > 0 {
+				countServerNames += int32(len(serverName.SubNames))
+			} else {
+				countServerNames++
+			}
+		}
+		if req.IgnoreServerNames && len(config.ServerNames) > 0 {
+			config.ServerNames = config.ServerNames[:1]
+		}
 		configJSON, err := json.Marshal(config)
 		if err != nil {
 			return nil, err
 		}
 
+		// 忽略信息
+		if req.IgnoreServerNames {
+			server.ServerNames = nil
+		}
+
 		result = append(result, &pb.Server{
 			Id:                      int64(server.Id),
 			IsOn:                    server.IsOn,
 			Type:                    server.Type,
 			Config:                  configJSON,
 			Name:                    server.Name,
+			CountServerNames:        countServerNames,
 			Description:             server.Description,
 			HttpJSON:                server.Http,
 			HttpsJSON:               server.Https,
@@ -986,7 +1003,7 @@ func (this *ServerService) FindEnabledServer(ctx context.Context, req *pb.FindEn
 	}
 
 	// 配置
-	config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, nil, userId > 0)
+	config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, nil, userId > 0, false)
 	if err != nil {
 		return nil, err
 	}

internal/rpc/services/service_server_group.go

@@ -463,7 +463,7 @@ func (this *ServerGroupService) FindEnabledServerGroupConfigInfo(ctx context.Con
 		result.HasUDPReverseProxy = ref.IsPrior
 	}
 
-	config, err := models.SharedServerGroupDAO.ComposeGroupConfig(tx, int64(group.Id), nil)
+	config, err := models.SharedServerGroupDAO.ComposeGroupConfig(tx, int64(group.Id), false, nil)
 	if err != nil {
 		return nil, err
 	}