实现请求连接数等限制/容量组件增加EB支持

internal/rpc/rpc_client_test.go

@@ -18,7 +18,7 @@ func TestRPCClient_NodeRPC(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	rpc, err := NewRPCClient(config)
+	rpc, err := NewRPCClient(config, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -41,7 +41,7 @@ func TestRPC_Dial_HTTP(t *testing.T) {
 		},
 		NodeId: "a7e55782dab39bce0901058a1e14a0e6",
 		Secret: "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
-	})
+	}, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -62,7 +62,7 @@ func TestRPC_Dial_HTTP_2(t *testing.T) {
 		},
 		NodeId: "a7e55782dab39bce0901058a1e14a0e6",
 		Secret: "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
-	})
+	}, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -83,7 +83,7 @@ func TestRPC_Dial_HTTPS(t *testing.T) {
 		},
 		NodeId: "a7e55782dab39bce0901058a1e14a0e6",
 		Secret: "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
-	})
+	}, true)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/utils/numberutils/utils.go

@@ -13,6 +13,16 @@ func FormatInt(value int) string {
 	return strconv.Itoa(value)
 }
 
+func Pow1024(n int) int64 {
+	if n <= 0 {
+		return 1
+	}
+	if n == 1 {
+		return 1024
+	}
+	return Pow1024(n-1) * 1024
+}
+
 func FormatBytes(bytes int64) string {
 	if bytes < 1024 {
 		return FormatInt64(bytes) + "B"

internal/web/actions/default/servers/server/settings/requestLimit/index.go

@@ -0,0 +1,57 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package requestlimit
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "index")
+	this.SecondMenu("requestLimit")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ServerId int64
+}) {
+	this.Data["serverId"] = params.ServerId
+
+	webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["webId"] = webConfig.Id
+	this.Data["requestLimitConfig"] = webConfig.RequestLimit
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	WebId            int64
+	RequestLimitJSON []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改Web %d 请求限制", params.WebId)
+
+	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebRequestLimit(this.AdminContext(), &pb.UpdateHTTPWebRequestLimitRequest{
+		HttpWebId:        params.WebId,
+		RequestLimitJSON: params.RequestLimitJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/server/settings/requestLimit/init.go

@@ -0,0 +1,19 @@
+package requestlimit
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)).
+			Helper(serverutils.NewServerHelper()).
+			Prefix("/servers/server/settings/requestLimit").
+			GetPost("", new(IndexAction)).
+			EndAll()
+	})
+}

internal/web/actions/default/servers/serverutils/server_helper.go

@@ -125,7 +125,17 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) {
 	case "stat":
 		action.Data["leftMenuItems"] = this.createStatMenu(types.String(secondMenuItem), serverIdString, serverConfig)
 	case "setting":
-		action.Data["leftMenuItems"] = this.createSettingsMenu(types.String(secondMenuItem), serverIdString, serverConfig)
+		var menuItems = this.createSettingsMenu(types.String(secondMenuItem), serverIdString, serverConfig)
+		action.Data["leftMenuItems"] = menuItems
+
+		// 当前菜单
+		action.Data["leftMenuActiveItem"] = nil
+		for _, item := range menuItems {
+			if item.GetBool("isActive") {
+				action.Data["leftMenuActiveItem"] = item
+				break
+			}
+		}
 	case "delete":
 		action.Data["leftMenuItems"] = this.createDeleteMenu(types.String(secondMenuItem), serverIdString, serverConfig)
 	}
@@ -354,6 +364,13 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri
 			"isOn":     serverConfig.Web != nil && serverConfig.Web.RemoteAddr != nil && serverConfig.Web.RemoteAddr.IsOn,
 		})
 
+		menuItems = append(menuItems, maps.Map{
+			"name":     "请求限制",
+			"url":      "/servers/server/settings/requestLimit?serverId=" + serverIdString,
+			"isActive": secondMenuItem == "requestLimit",
+			"isOn":     serverConfig.Web != nil && serverConfig.Web.RequestLimit != nil && serverConfig.Web.RequestLimit.IsOn,
+		})
+
 		if teaconst.IsPlus {
 			menuItems = append(menuItems, maps.Map{
 				"name":     "流量限制",

internal/web/import.go

@@ -88,6 +88,7 @@ import (
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/pages"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/redirects"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/remoteAddr"
+	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/requestLimit"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/reverseProxy"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/rewrite"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/serverNames"