将版本修改为0.3.5.2

build/build.sh

@@ -58,6 +58,10 @@ function build() {
 	rm -f $(basename $EDGE_API_ZIP_FILE)
 	cd -
 
+    # generate files
+    echo "generating files ..."
+	go run  -tags $TAG $ROOT/../cmd/edge-admin/main.go generate
+
 	# build
 	echo "building "${NAME}" ..."
 	env GOOS=$OS GOARCH=$ARCH go build -tags $TAG -ldflags="-s -w" -o $DIST/bin/${NAME} $ROOT/../cmd/edge-admin/main.go

cmd/edge-admin/main.go

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/apps"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/gen"
 	"github.com/TeaOSLab/EdgeAdmin/internal/nodes"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web"
 	_ "github.com/iwind/TeaGo/bootstrap"
@@ -70,6 +71,13 @@ func main() {
 		}
 		fmt.Println("change demo mode successfully")
 	})
+	app.On("generate", func() {
+		err := gen.Generate()
+		if err != nil {
+			fmt.Println("generate failed: " + err.Error())
+			return
+		}
+	})
 	app.Run(func() {
 		adminNode := nodes.NewAdminNode()
 		adminNode.Run()

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/go-yaml/yaml v2.1.0+incompatible
 	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24
-	github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3
+	github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/miekg/dns v1.1.35
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

go.sum

@@ -68,6 +68,8 @@ github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24 h1:1cGulkD2SNJJRok5OKw
 github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
 github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3 h1:aBSonas7vFcgTj9u96/bWGILGv1ZbUSTLiOzcI1ZT6c=
 github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA=
+github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4 h1:VWGsCqTzObdlbf7UUE3oceIpcEKi4C/YBUszQXk118A=
+github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA=
 github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=

internal/const/const.go

@@ -1,9 +1,9 @@
 package teaconst
 
 const (
-	Version = "0.3.5"
+	Version = "0.3.5.2"
 
-	APINodeVersion = "0.3.5"
+	APINodeVersion = "0.3.5.2"
 
 	ProductName   = "Edge Admin"
 	ProcessName   = "edge-admin"

internal/gen/generate.go

@@ -0,0 +1,129 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package gen
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/conds/condutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/files"
+	"github.com/iwind/TeaGo/logs"
+	"io"
+	"os"
+	"path/filepath"
+)
+
+func Generate() error {
+	err := generateComponentsJSFile()
+	if err != nil {
+		return errors.New("generate 'components.js' failed: " + err.Error())
+	}
+
+	return nil
+}
+
+// 生成Javascript文件
+func generateComponentsJSFile() error {
+	var buffer = bytes.NewBuffer([]byte{})
+
+	var webRoot string
+	if Tea.IsTesting() {
+		webRoot = Tea.Root + "/../web/public/js/components/"
+	} else {
+		webRoot = Tea.Root + "/web/public/js/components/"
+	}
+	f := files.NewFile(webRoot)
+
+	f.Range(func(file *files.File) {
+		if !file.IsFile() {
+			return
+		}
+		if file.Ext() != ".js" {
+			return
+		}
+		data, err := file.ReadAll()
+		if err != nil {
+			logs.Error(err)
+			return
+		}
+		buffer.Write(data)
+		buffer.Write([]byte{'\n', '\n'})
+	})
+
+	// 条件组件
+	typesJSON, err := json.Marshal(condutils.ReadAllAvailableCondTypes())
+	if err != nil {
+		logs.Println("ComponentsAction marshal request cond types failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.REQUEST_COND_COMPONENTS = ")
+		buffer.Write(typesJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// 条件操作符
+	requestOperatorsJSON, err := json.Marshal(shared.AllRequestOperators())
+	if err != nil {
+		logs.Println("ComponentsAction marshal request operators failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.REQUEST_COND_OPERATORS = ")
+		buffer.Write(requestOperatorsJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// 请求变量
+	requestVariablesJSON, err := json.Marshal(shared.DefaultRequestVariables())
+	if err != nil {
+		logs.Println("ComponentsAction marshal request variables failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.REQUEST_VARIABLES = ")
+		buffer.Write(requestVariablesJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// 指标
+	metricHTTPKeysJSON, err := json.Marshal(serverconfigs.FindAllMetricKeyDefinitions(serverconfigs.MetricItemCategoryHTTP))
+	if err != nil {
+		logs.Println("ComponentsAction marshal metric http keys failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.METRIC_HTTP_KEYS = ")
+		buffer.Write(metricHTTPKeysJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// IP地址阈值项目
+	ipAddrThresholdItemsJSON, err := json.Marshal(nodeconfigs.FindAllIPAddressThresholdItems())
+	if err != nil {
+		logs.Println("ComponentsAction marshal ip addr threshold items failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.IP_ADDR_THRESHOLD_ITEMS = ")
+		buffer.Write(ipAddrThresholdItemsJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// IP地址阈值动作
+	ipAddrThresholdActionsJSON, err := json.Marshal(nodeconfigs.FindAllIPAddressThresholdActions())
+	if err != nil {
+		logs.Println("ComponentsAction marshal ip addr threshold actions failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.IP_ADDR_THRESHOLD_ACTIONS = ")
+		buffer.Write(ipAddrThresholdActionsJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	fp, err := os.OpenFile(filepath.Clean(Tea.PublicFile("/js/components.js")), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0777)
+	if err != nil {
+		return err
+	}
+
+	_, err = io.Copy(fp, buffer)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/gen/generate_test.go

@@ -0,0 +1,13 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package gen
+
+import "testing"
+
+func TestGenerate(t *testing.T) {
+	err := Generate()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}

internal/web/actions/default/servers/create.go

@@ -57,6 +57,14 @@ func (this *CreateAction) RunGet(params struct{}) {
 	// 服务类型
 	this.Data["serverTypes"] = serverconfigs.AllServerTypes()
 
+	// 检查是否有用户
+	countUsersResp, err := this.RPC().UserRPC().CountAllEnabledUsers(this.AdminContext(), &pb.CountAllEnabledUsersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["hasUsers"] = countUsersResp.Count > 0
+
 	this.Show()
 }
 
@@ -94,14 +102,16 @@ func (this *CreateAction) RunPost(params struct {
 
 	// 用户
 	var userId = params.UserId
-	clusterIdResp, err := this.RPC().UserRPC().FindUserNodeClusterId(this.AdminContext(), &pb.FindUserNodeClusterIdRequest{UserId: userId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	clusterId = clusterIdResp.NodeClusterId
-	if clusterId <= 0 {
-		this.Fail("请选择部署的集群")
+	if userId > 0 {
+		clusterIdResp, err := this.RPC().UserRPC().FindUserNodeClusterId(this.AdminContext(), &pb.FindUserNodeClusterIdRequest{UserId: userId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		clusterId = clusterIdResp.NodeClusterId
+		if clusterId <= 0 {
+			this.Fail("请选择部署的集群")
+		}
 	}
 
 	// 套餐

internal/web/actions/default/setup/confirm/index.go

@@ -26,11 +26,15 @@ func (this *IndexAction) RunGet(params struct{}) {
 	config, err := configs.LoadAPIConfig()
 	if err == nil {
 		endpoints = config.RPC.Endpoints
+		this.Data["nodeId"] = config.NodeId
+		this.Data["secret"] = config.Secret
+		this.Data["canInstall"] = false
+	} else {
+		this.Data["nodeId"] = ""
+		this.Data["secret"] = ""
+		this.Data["canInstall"] = true
 	}
 
-	this.Data["nodeId"] = config.NodeId
-	this.Data["secret"] = config.Secret
-
 	if len(endpoints) == 0 {
 		endpoints = []string{""} // 初始化一个空的
 	}

internal/web/actions/default/setup/install.go

@@ -16,6 +16,7 @@ import (
 	"github.com/iwind/TeaGo/dbs"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/gosock/pkg/gosock"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -167,6 +168,9 @@ func (this *InstallAction) RunPost(params struct {
 			if !resultMap.GetBool("isOk") {
 				this.Fail("节点安装错误：" + resultMap.GetString("error"))
 			}
+
+			// 等数据完全写入
+			time.Sleep(1 * time.Second)
 		}
 
 		// 关闭正在运行的API节点，防止冲突
@@ -190,7 +194,30 @@ func (this *InstallAction) RunPost(params struct {
 			nodes.SharedAdminNode.AddSubPID(cmd.Process.Pid)
 
 			// 等待API节点初始化完成
-			time.Sleep(5 * time.Second)
+			currentStatusText = "正在等待API节点启动完毕"
+			var apiNodeSock = gosock.NewTmpSock("edge-api")
+			var maxRetries = 5
+			for {
+				reply, err := apiNodeSock.SendTimeout(&gosock.Command{
+					Code: "starting",
+				}, 3*time.Second)
+				if err != nil {
+					if maxRetries < 0 {
+						this.Fail("API节点启动失败，请查看运行日志检查是否正常")
+					} else {
+						time.Sleep(3 * time.Second)
+						maxRetries--
+					}
+				} else {
+					if !maps.NewMap(reply.Params).GetBool("isStarting") {
+						currentStatusText = "API节点启动完毕"
+						break
+					}
+
+					// 继续等待完成
+					time.Sleep(3 * time.Second)
+				}
+			}
 		}
 
 		// 写入API节点配置，完成安装

internal/web/actions/default/ui/init.go

@@ -1,11 +1,10 @@
 package ui
 
 import (
-	"compress/gzip"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
-	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/Tea"
 )
 
 func init() {
@@ -16,11 +15,6 @@ func init() {
 			// 公共可以访问的链接
 			Get("/image/:fileId", new(ImageAction)).
 
-			// 以下的需要压缩
-			Helper(&actions.Gzip{Level: gzip.BestCompression}).
-			Get("/components.js", new(ComponentsAction)).
-			EndHelpers().
-
 			// 以下需要登录
 			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeCommon)).
 			Get("/download", new(DownloadAction)).
@@ -31,7 +25,13 @@ func init() {
 			Post("/hideTip", new(HideTipAction)).
 			Post("/theme", new(ThemeAction)).
 			Post("/validateIPs", new(ValidateIPsAction)).
-
 			EndAll()
+
+		// 开发环境下总是动态加载，以便于调试
+		if Tea.IsTesting() {
+			server.
+				Get("/js/components.js", new(ComponentsAction)).
+				EndAll()
+		}
 	})
 }

web/views/@default/@layout.html

@@ -15,7 +15,7 @@
     {$TEA.VUE}
     {$echo "header"}
     <script type="text/javascript" src="/_/@default/@layout.js"></script>
-	<script type="text/javascript" src="/ui/components.js?v=v{$.teaVersion}"></script>
+	<script type="text/javascript" src="/js/components.js"></script>
 	<script type="text/javascript" src="/js/utils.js"></script>
 	<script type="text/javascript" src="/js/sweetalert2/dist/sweetalert2.all.min.js"></script>
 	<script type="text/javascript" src="/js/date.tea.js"></script>

web/views/@default/@layout_popup.html

@@ -12,7 +12,7 @@
 	<link rel="stylesheet" type="text/css" href="/_/@default/@layout_override.css" media="all"/>
 	{$echo "header"}
 	<script type="text/javascript" src="/_/@default/@layout.js"></script>
-	<script type="text/javascript" src="/ui/components.js?v=v{$.teaVersion}"></script>
+	<script type="text/javascript" src="/js/components.js"></script>
 	<script type="text/javascript" src="/js/utils.js"></script>
 	<script type="text/javascript" src="/js/sweetalert2/dist/sweetalert2.all.min.js"></script>
 	<script type="text/javascript" src="/js/date.tea.js"></script>

web/views/@default/index/index.html

@@ -14,7 +14,7 @@
 	<script type="text/javascript" src="/js/md5.min.js"></script>
 	<script type="text/javascript" src="/js/utils.js"></script>
 	<script type="text/javascript" src="/js/sweetalert2/dist/sweetalert2.all.min.js"></script>
-	<script type="text/javascript" src="/ui/components.js?v=1.0.0"></script>
+	<script type="text/javascript" src="/js/components.js"></script>
 </head>
 <body>
 <div>

web/views/@default/recover/index.html

@@ -10,7 +10,7 @@
 	<script type="text/javascript" src="/js/md5.min.js"></script>
 	<script type="text/javascript" src="/js/utils.js"></script>
 	<script type="text/javascript" src="/js/sweetalert2/dist/sweetalert2.all.min.js"></script>
-	<script type="text/javascript" src="/ui/components.js"></script>
+	<script type="text/javascript" src="/js/components.js"></script>
 	<link rel="stylesheet" href="/_/@default/@layout.css"/>
 </head>
 <body>

web/views/@default/servers/create.html

@@ -11,7 +11,7 @@
 				<input type="text" name="name" maxlength="60" ref="focus"/>
 			</td>
 		</tr>
-        <tr>
+        <tr v-show="hasUsers">
             <td>选择用户</td>
             <td>
                 <user-selector @change="changeUserId"></user-selector>

web/views/@default/servers/server/settings/origins/addPopup.html

@@ -35,17 +35,17 @@
                     源站服务器地址，通常是一个IP（或域名）加端口<span v-if="serverType == 'httpProxy'">，不需要加 http:// 或 https://</span>。</p>
 			</td>
 		</tr>
-        <tr v-if="isHTTP">
-            <td>专属域名</td>
-            <td>
-                <domains-box></domains-box>
-                <p class="comment">不为空时，指定的这些域名访问时当前源站才生效。</p>
-            </td>
-        </tr>
 		<tr>
 			<td colspan="2"><more-options-indicator></more-options-indicator></td>
 		</tr>
 		<tbody v-show="moreOptionsVisible">
+            <tr v-if="isHTTP">
+                <td>专属域名</td>
+                <td>
+                    <domains-box></domains-box>
+                    <p class="comment">默认不需要填写，表示支持所有域名。如果填写了专属域名，表示这些源站只会在这些域名被访问时才生效。</p>
+                </td>
+            </tr>
             <tr>
                 <td>权重</td>
                 <td>

web/views/@default/servers/server/settings/origins/updatePopup.html

@@ -36,17 +36,17 @@
 				<p class="comment"><span class="red" v-if="addrError.length > 0">{{addrError}}</span>源站服务器地址，通常是一个IP（或域名）加端口<span v-if="serverType == 'httpProxy'">，不需要加 http:// 或 https://</span>。</p>
 			</td>
 		</tr>
-        <tr v-if="isHTTP">
-            <td>专属域名</td>
-            <td>
-                <domains-box :v-domains="origin.domains"></domains-box>
-                <p class="comment">不为空时，指定的这些域名访问时当前源站才生效。</p>
-            </td>
-        </tr>
 		<tr>
 			<td colspan="2"><more-options-indicator></more-options-indicator></td>
 		</tr>
 		<tbody v-show="moreOptionsVisible">
+            <tr v-if="isHTTP">
+                <td>专属域名</td>
+                <td>
+                    <domains-box :v-domains="origin.domains"></domains-box>
+                    <p class="comment">默认不需要填写，表示支持所有域名。如果填写了专属域名，表示这些源站只会在这些域名被访问时才生效。</p>
+                </td>
+            </tr>
             <tr>
                 <td>权重</td>
                 <td>

web/views/@default/setup/confirm/index.html

@@ -10,7 +10,7 @@
     <script type="text/javascript" src="/js/md5.min.js"></script>
     <script type="text/javascript" src="/js/utils.js"></script>
     <script type="text/javascript" src="/js/sweetalert2/dist/sweetalert2.all.min.js"></script>
-    <script type="text/javascript" src="/ui/components.js"></script>
+    <script type="text/javascript" src="/js/components.js"></script>
     <link rel="stylesheet" href="/_/@default/@layout.css"/>
 </head>
 <body>
@@ -47,6 +47,7 @@
         </table>
 
         <div class="margin" style="margin-top: 2em"></div>
+        <a href="/setup" class="ui button" type="button" v-if="canInstall">重新安装</a>
         <button class="ui button primary" type="submit" v-if="!isRequesting">确认</button>
         <button class="ui button disabled" type="button" v-if="isRequesting">检查中...</button>
     </form>

web/views/@default/setup/index.html

@@ -10,7 +10,7 @@
 	<script type="text/javascript" src="/js/md5.min.js"></script>
 	<script type="text/javascript" src="/js/utils.js"></script>
 	<script type="text/javascript" src="/js/sweetalert2/dist/sweetalert2.all.min.js"></script>
-	<script type="text/javascript" src="/ui/components.js"></script>
+	<script type="text/javascript" src="/js/components.js"></script>
 	<link rel="stylesheet" href="/_/@default/@layout.css"/>
 </head>
 <body>