diff --git a/.gitattributes b/.gitattributes index 2e58a92..2e81367 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,3 @@ *.sh text eol=lf *.bash text eol=lf -*.yaml text eol=lf -*.yml text eol=lf -Dockerfile text eol=lf +*.zsh text eol=lf diff --git a/.gitignore b/.gitignore index eb9f4ce..fa84c93 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,9 @@ deploy/fluent-bit/logs.db deploy/fluent-bit/logs.db-shm deploy/fluent-bit/logs.db-wal deploy/fluent-bit/storage/ +/pkg/ +/.claude/ + +# Local large build artifacts +EdgeAdmin/edge-admin.exe +EdgeAPI/deploy/edge-node-linux-amd64-v*.zip \ No newline at end of file diff --git a/EdgeAPI/build/build.sh b/EdgeAPI/build/build.sh index dade19e..9c58075 100644 --- a/EdgeAPI/build/build.sh +++ b/EdgeAPI/build/build.sh @@ -94,6 +94,32 @@ function build() { fi fi + # build edge-httpdns + HTTPDNS_ROOT=$ROOT"/../../EdgeHttpDNS" + if [ -d "$HTTPDNS_ROOT" ]; then + HTTPDNSNodeVersion=$(lookup-version "$ROOT""/../../EdgeHttpDNS/internal/const/const.go") + echo "building edge-httpdns v${HTTPDNSNodeVersion} ..." + EDGE_HTTPDNS_NODE_BUILD_SCRIPT=$ROOT"/../../EdgeHttpDNS/build/build.sh" + if [ ! -f "$EDGE_HTTPDNS_NODE_BUILD_SCRIPT" ]; then + echo "unable to find edge-httpdns build script 'EdgeHttpDNS/build/build.sh'" + exit + fi + cd "$ROOT""/../../EdgeHttpDNS/build" || exit + echo "==============================" + architects=("amd64") + #architects=("amd64" "arm64") + for arch in "${architects[@]}"; do + # always rebuild to avoid reusing stale zip when version number is unchanged + ./build.sh linux "$arch" + done + echo "==============================" + cd - || exit + + for arch in "${architects[@]}"; do + cp "$ROOT""/../../EdgeHttpDNS/dist/edge-httpdns-linux-${arch}-v${HTTPDNSNodeVersion}.zip" "$ROOT"/deploy/edge-httpdns-linux-"${arch}"-v"${HTTPDNSNodeVersion}".zip + done + fi + # build sql if [ $TAG = "plus" ]; then echo "building sql ..." diff --git a/EdgeAPI/build/sql.sh b/EdgeAPI/build/sql.sh index 347659a..76fd238 100644 --- a/EdgeAPI/build/sql.sh +++ b/EdgeAPI/build/sql.sh @@ -3,5 +3,10 @@ # generate 'internal/setup/sql.json' file CWD="$(dirname "$0")" +SQL_JSON="${CWD}/../internal/setup/sql.json" -go run "${CWD}"/../cmd/sql-dump/main.go -dir="${CWD}" \ No newline at end of file +if [ -f "$SQL_JSON" ]; then + echo "sql.json already exists, skipping sql-dump (delete it manually to regenerate)" +else + go run "${CWD}"/../cmd/sql-dump/main.go -dir="${CWD}" +fi \ No newline at end of file diff --git a/EdgeAPI/cmd/sql-dump/main.go b/EdgeAPI/cmd/sql-dump/main.go index d201b43..0b819d0 100644 --- a/EdgeAPI/cmd/sql-dump/main.go +++ b/EdgeAPI/cmd/sql-dump/main.go @@ -12,6 +12,8 @@ import ( ) func main() { + Tea.Env = "prod" + db, err := dbs.Default() if err != nil { fmt.Println("[ERROR]" + err.Error()) diff --git a/EdgeAPI/internal/clickhouse/client.go b/EdgeAPI/internal/clickhouse/client.go index 96fe903..dba0895 100644 --- a/EdgeAPI/internal/clickhouse/client.go +++ b/EdgeAPI/internal/clickhouse/client.go @@ -1,6 +1,7 @@ package clickhouse import ( + "bytes" "context" "crypto/tls" "encoding/json" @@ -12,13 +13,11 @@ import ( "time" ) -// Client 通过 HTTP 接口执行只读查询（SELECT），返回 JSONEachRow 解析为 map 或结构体 type Client struct { cfg *Config httpCli *http.Client } -// NewClient 使用共享配置创建客户端 func NewClient() *Client { cfg := SharedConfig() transport := &http.Transport{} @@ -28,6 +27,7 @@ func NewClient() *Client { ServerName: cfg.TLSServerName, } } + return &Client{ cfg: cfg, httpCli: &http.Client{ @@ -37,21 +37,20 @@ func NewClient() *Client { } } -// IsConfigured 是否已配置 func (c *Client) IsConfigured() bool { return c.cfg != nil && c.cfg.IsConfigured() } -// Query 执行 SELECT，将每行 JSON 解析到 dest 切片；dest 元素类型需为 *struct 或 map func (c *Client) Query(ctx context.Context, query string, dest interface{}) error { if !c.IsConfigured() { return fmt.Errorf("clickhouse: not configured") } - // 强制 JSONEachRow 便于解析 + q := strings.TrimSpace(query) if !strings.HasSuffix(strings.ToUpper(q), "FORMAT JSONEACHROW") { query = q + " FORMAT JSONEachRow" } + u := c.buildURL(query) req, err := http.NewRequestWithContext(ctx, http.MethodGet, u, nil) if err != nil { @@ -60,28 +59,32 @@ func (c *Client) Query(ctx context.Context, query string, dest interface{}) erro if c.cfg.User != "" || c.cfg.Password != "" { req.SetBasicAuth(c.cfg.User, c.cfg.Password) } + resp, err := c.httpCli.Do(req) if err != nil { return err } defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) return fmt.Errorf("clickhouse HTTP %d: %s", resp.StatusCode, string(body)) } + dec := json.NewDecoder(resp.Body) return decodeRows(dec, dest) } -// QueryRow 执行仅返回一行的查询，将结果解析到 dest（*struct 或 *map） func (c *Client) QueryRow(ctx context.Context, query string, dest interface{}) error { if !c.IsConfigured() { return fmt.Errorf("clickhouse: not configured") } + q := strings.TrimSpace(query) if !strings.HasSuffix(strings.ToUpper(q), "FORMAT JSONEACHROW") { query = q + " FORMAT JSONEachRow" } + u := c.buildURL(query) req, err := http.NewRequestWithContext(ctx, http.MethodGet, u, nil) if err != nil { @@ -90,32 +93,109 @@ func (c *Client) QueryRow(ctx context.Context, query string, dest interface{}) e if c.cfg.User != "" || c.cfg.Password != "" { req.SetBasicAuth(c.cfg.User, c.cfg.Password) } + resp, err := c.httpCli.Do(req) if err != nil { return err } defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) return fmt.Errorf("clickhouse HTTP %d: %s", resp.StatusCode, string(body)) } + dec := json.NewDecoder(resp.Body) return decodeOneRow(dec, dest) } +func (c *Client) Execute(ctx context.Context, query string) error { + if !c.IsConfigured() { + return fmt.Errorf("clickhouse: not configured") + } + + u := c.buildURL(strings.TrimSpace(query)) + req, err := http.NewRequestWithContext(ctx, http.MethodPost, u, nil) + if err != nil { + return err + } + if c.cfg.User != "" || c.cfg.Password != "" { + req.SetBasicAuth(c.cfg.User, c.cfg.Password) + } + + resp, err := c.httpCli.Do(req) + if err != nil { + return err + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + body, _ := io.ReadAll(resp.Body) + return fmt.Errorf("clickhouse HTTP %d: %s", resp.StatusCode, string(body)) + } + return nil +} + +func (c *Client) InsertJSONEachRow(ctx context.Context, insertSQL string, rows []map[string]interface{}) error { + if len(rows) == 0 { + return nil + } + if !c.IsConfigured() { + return fmt.Errorf("clickhouse: not configured") + } + + query := strings.TrimSpace(insertSQL) + if !strings.HasSuffix(strings.ToUpper(query), "FORMAT JSONEACHROW") { + query += " FORMAT JSONEachRow" + } + + var payload bytes.Buffer + for _, row := range rows { + if row == nil { + continue + } + data, err := json.Marshal(row) + if err != nil { + return err + } + payload.Write(data) + payload.WriteByte('\n') + } + + u := c.buildURL(query) + req, err := http.NewRequestWithContext(ctx, http.MethodPost, u, &payload) + if err != nil { + return err + } + req.Header.Set("Content-Type", "application/json") + if c.cfg.User != "" || c.cfg.Password != "" { + req.SetBasicAuth(c.cfg.User, c.cfg.Password) + } + + resp, err := c.httpCli.Do(req) + if err != nil { + return err + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + body, _ := io.ReadAll(resp.Body) + return fmt.Errorf("clickhouse HTTP %d: %s", resp.StatusCode, string(body)) + } + + return nil +} + func (c *Client) buildURL(query string) string { scheme := "http" if c.cfg != nil && strings.EqualFold(c.cfg.Scheme, "https") { scheme = "https" } - rawURL := fmt.Sprintf("%s://%s:%d/?query=%s&database=%s", + return fmt.Sprintf("%s://%s:%d/?query=%s&database=%s", scheme, c.cfg.Host, c.cfg.Port, url.QueryEscape(query), url.QueryEscape(c.cfg.Database)) - return rawURL } -// decodeRows 将 JSONEachRow 流解析到 slice；元素类型须为 *struct 或 *[]map[string]interface{} func decodeRows(dec *json.Decoder, dest interface{}) error { - // dest 应为 *[]*SomeStruct 或 *[]map[string]interface{} switch d := dest.(type) { case *[]map[string]interface{}: *d = (*d)[:0] @@ -130,7 +210,7 @@ func decodeRows(dec *json.Decoder, dest interface{}) error { *d = append(*d, row) } default: - return fmt.Errorf("clickhouse: unsupported dest type for Query (use *[]map[string]interface{} or implement decoder)") + return fmt.Errorf("clickhouse: unsupported dest type for Query (use *[]map[string]interface{})") } } diff --git a/EdgeAPI/internal/clickhouse/config.go b/EdgeAPI/internal/clickhouse/config.go index c2fe014..31add08 100644 --- a/EdgeAPI/internal/clickhouse/config.go +++ b/EdgeAPI/internal/clickhouse/config.go @@ -12,15 +12,15 @@ import ( ) const ( - envHost = "CLICKHOUSE_HOST" - envPort = "CLICKHOUSE_PORT" - envUser = "CLICKHOUSE_USER" - envPassword = "CLICKHOUSE_PASSWORD" - envDatabase = "CLICKHOUSE_DATABASE" - envScheme = "CLICKHOUSE_SCHEME" - defaultPort = 8443 - defaultDB = "default" - defaultScheme = "https" + envHost = "CLICKHOUSE_HOST" + envPort = "CLICKHOUSE_PORT" + envUser = "CLICKHOUSE_USER" + envPassword = "CLICKHOUSE_PASSWORD" + envDatabase = "CLICKHOUSE_DATABASE" + envScheme = "CLICKHOUSE_SCHEME" + defaultPort = 8443 + defaultDB = "default" + defaultScheme = "https" ) var ( diff --git a/EdgeAPI/internal/clickhouse/httpdns_access_logs_store.go b/EdgeAPI/internal/clickhouse/httpdns_access_logs_store.go new file mode 100644 index 0000000..a794c5c --- /dev/null +++ b/EdgeAPI/internal/clickhouse/httpdns_access_logs_store.go @@ -0,0 +1,294 @@ +package clickhouse + +import ( + "context" + "encoding/json" + "fmt" + "strconv" + "strings" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" +) + +const httpDNSAccessLogsTable = "httpdns_access_logs_ingest" + +type HTTPDNSAccessLogRow struct { + RequestId string + ClusterId int64 + NodeId int64 + AppId string + AppName string + Domain string + QType string + ClientIP string + ClientRegion string + Carrier string + SDKVersion string + OS string + ResultIPs string + Status string + ErrorCode string + CostMs int32 + CreatedAt int64 + Day string + Summary string +} + +type HTTPDNSAccessLogListFilter struct { + Day string + ClusterId int64 + NodeId int64 + AppId string + AppIds []string + Domain string + Status string + Keyword string + Offset int64 + Size int64 +} + +type HTTPDNSAccessLogsStore struct { + client *Client +} + +func NewHTTPDNSAccessLogsStore() *HTTPDNSAccessLogsStore { + return &HTTPDNSAccessLogsStore{client: NewClient()} +} + +func (s *HTTPDNSAccessLogsStore) Client() *Client { + return s.client +} + +func (s *HTTPDNSAccessLogsStore) Insert(ctx context.Context, logs []*pb.HTTPDNSAccessLog) error { + if len(logs) == 0 { + return nil + } + if !s.client.IsConfigured() { + return fmt.Errorf("clickhouse: not configured") + } + + rows := make([]map[string]interface{}, 0, len(logs)) + for _, item := range logs { + if item == nil { + continue + } + rows = append(rows, map[string]interface{}{ + "request_id": item.GetRequestId(), + "cluster_id": item.GetClusterId(), + "node_id": item.GetNodeId(), + "app_id": item.GetAppId(), + "app_name": item.GetAppName(), + "domain": item.GetDomain(), + "qtype": item.GetQtype(), + "client_ip": item.GetClientIP(), + "client_region": item.GetClientRegion(), + "carrier": item.GetCarrier(), + "sdk_version": item.GetSdkVersion(), + "os": item.GetOs(), + "result_ips": item.GetResultIPs(), + "status": item.GetStatus(), + "error_code": item.GetErrorCode(), + "cost_ms": item.GetCostMs(), + "created_at": item.GetCreatedAt(), + "day": item.GetDay(), + "summary": item.GetSummary(), + }) + } + + query := fmt.Sprintf("INSERT INTO %s (request_id, cluster_id, node_id, app_id, app_name, domain, qtype, client_ip, client_region, carrier, sdk_version, os, result_ips, status, error_code, cost_ms, created_at, day, summary)", + s.tableName()) + return s.client.InsertJSONEachRow(ctx, query, rows) +} + +func (s *HTTPDNSAccessLogsStore) Count(ctx context.Context, f HTTPDNSAccessLogListFilter) (int64, error) { + if !s.client.IsConfigured() { + return 0, fmt.Errorf("clickhouse: not configured") + } + + conditions := s.buildConditions(f) + query := fmt.Sprintf("SELECT count() AS count FROM %s", s.tableName()) + if len(conditions) > 0 { + query += " WHERE " + strings.Join(conditions, " AND ") + } + + row := map[string]interface{}{} + if err := s.client.QueryRow(ctx, query, &row); err != nil { + return 0, err + } + return toInt64(row["count"]), nil +} + +func (s *HTTPDNSAccessLogsStore) List(ctx context.Context, f HTTPDNSAccessLogListFilter) ([]*HTTPDNSAccessLogRow, error) { + if !s.client.IsConfigured() { + return nil, fmt.Errorf("clickhouse: not configured") + } + + size := f.Size + if size <= 0 { + size = 20 + } + if size > 1000 { + size = 1000 + } + offset := f.Offset + if offset < 0 { + offset = 0 + } + + conditions := s.buildConditions(f) + query := fmt.Sprintf("SELECT request_id, cluster_id, node_id, app_id, app_name, domain, qtype, client_ip, client_region, carrier, sdk_version, os, result_ips, status, error_code, cost_ms, created_at, day, summary FROM %s", + s.tableName()) + if len(conditions) > 0 { + query += " WHERE " + strings.Join(conditions, " AND ") + } + query += " ORDER BY created_at DESC, request_id DESC" + query += fmt.Sprintf(" LIMIT %d OFFSET %d", size, offset) + + rawRows := []map[string]interface{}{} + if err := s.client.Query(ctx, query, &rawRows); err != nil { + return nil, err + } + + result := make([]*HTTPDNSAccessLogRow, 0, len(rawRows)) + for _, row := range rawRows { + result = append(result, &HTTPDNSAccessLogRow{ + RequestId: toString(row["request_id"]), + ClusterId: toInt64(row["cluster_id"]), + NodeId: toInt64(row["node_id"]), + AppId: toString(row["app_id"]), + AppName: toString(row["app_name"]), + Domain: toString(row["domain"]), + QType: toString(row["qtype"]), + ClientIP: toString(row["client_ip"]), + ClientRegion: toString(row["client_region"]), + Carrier: toString(row["carrier"]), + SDKVersion: toString(row["sdk_version"]), + OS: toString(row["os"]), + ResultIPs: toString(row["result_ips"]), + Status: toString(row["status"]), + ErrorCode: toString(row["error_code"]), + CostMs: int32(toInt64(row["cost_ms"])), + CreatedAt: toInt64(row["created_at"]), + Day: toString(row["day"]), + Summary: toString(row["summary"]), + }) + } + return result, nil +} + +func HTTPDNSRowToPB(row *HTTPDNSAccessLogRow) *pb.HTTPDNSAccessLog { + if row == nil { + return nil + } + return &pb.HTTPDNSAccessLog{ + RequestId: row.RequestId, + ClusterId: row.ClusterId, + NodeId: row.NodeId, + AppId: row.AppId, + AppName: row.AppName, + Domain: row.Domain, + Qtype: row.QType, + ClientIP: row.ClientIP, + ClientRegion: row.ClientRegion, + Carrier: row.Carrier, + SdkVersion: row.SDKVersion, + Os: row.OS, + ResultIPs: row.ResultIPs, + Status: row.Status, + ErrorCode: row.ErrorCode, + CostMs: row.CostMs, + CreatedAt: row.CreatedAt, + Day: row.Day, + Summary: row.Summary, + } +} + +func (s *HTTPDNSAccessLogsStore) buildConditions(f HTTPDNSAccessLogListFilter) []string { + conditions := []string{} + if day := strings.TrimSpace(f.Day); day != "" { + conditions = append(conditions, "day = '"+escapeString(day)+"'") + } + if f.ClusterId > 0 { + conditions = append(conditions, "cluster_id = "+strconv.FormatInt(f.ClusterId, 10)) + } + if f.NodeId > 0 { + conditions = append(conditions, "node_id = "+strconv.FormatInt(f.NodeId, 10)) + } + if appID := strings.TrimSpace(f.AppId); appID != "" { + conditions = append(conditions, "app_id = '"+escapeString(appID)+"'") + } else if len(f.AppIds) > 0 { + validAppIds := make([]string, 0, len(f.AppIds)) + for _, appID := range f.AppIds { + appID = strings.TrimSpace(appID) + if len(appID) == 0 { + continue + } + validAppIds = append(validAppIds, "'"+escapeString(appID)+"'") + } + if len(validAppIds) == 0 { + conditions = append(conditions, "1 = 0") + } else { + conditions = append(conditions, "app_id IN ("+strings.Join(validAppIds, ",")+")") + } + } + if domain := strings.TrimSpace(f.Domain); domain != "" { + conditions = append(conditions, "domain = '"+escapeString(domain)+"'") + } + if status := strings.TrimSpace(f.Status); status != "" { + conditions = append(conditions, "status = '"+escapeString(status)+"'") + } + if keyword := strings.TrimSpace(f.Keyword); keyword != "" { + kw := escapeString(keyword) + conditions = append(conditions, "(summary LIKE '%"+kw+"%' OR app_name LIKE '%"+kw+"%' OR client_ip LIKE '%"+kw+"%' OR result_ips LIKE '%"+kw+"%')") + } + return conditions +} + +func (s *HTTPDNSAccessLogsStore) tableName() string { + if s.client != nil && s.client.cfg != nil && s.client.cfg.Database != "" && s.client.cfg.Database != "default" { + return quoteIdent(s.client.cfg.Database) + "." + quoteIdent(httpDNSAccessLogsTable) + } + return quoteIdent(httpDNSAccessLogsTable) +} + +func toString(value interface{}) string { + if value == nil { + return "" + } + switch v := value.(type) { + case string: + return v + case json.Number: + return v.String() + default: + return fmt.Sprintf("%v", v) + } +} + +func toInt64(value interface{}) int64 { + if value == nil { + return 0 + } + switch v := value.(type) { + case int: + return int64(v) + case int32: + return int64(v) + case int64: + return v + case uint32: + return int64(v) + case uint64: + return int64(v) + case float64: + return int64(v) + case json.Number: + n, _ := v.Int64() + return n + case string: + n, _ := strconv.ParseInt(v, 10, 64) + return n + default: + return 0 + } +} diff --git a/EdgeAPI/internal/clickhouse/logs_ingest_store.go b/EdgeAPI/internal/clickhouse/logs_ingest_store.go index 4cbc965..84f7a56 100644 --- a/EdgeAPI/internal/clickhouse/logs_ingest_store.go +++ b/EdgeAPI/internal/clickhouse/logs_ingest_store.go @@ -351,8 +351,8 @@ func RowToPB(r *LogsIngestRow) *pb.HTTPAccessLog { RemoteAddr: r.IP, RequestMethod: r.Method, RequestPath: r.Path, - RequestURI: r.Path, // 前端使用 requestURI 显示完整路径 - Scheme: "http", // 默认 http，日志中未存储实际值 + RequestURI: r.Path, // 前端使用 requestURI 显示完整路径 + Scheme: "http", // 默认 http，日志中未存储实际值 Proto: "HTTP/1.1", // 默认值，日志中未存储实际值 Status: int32(r.Status), RequestLength: int64(r.BytesIn), diff --git a/EdgeAPI/internal/const/const.go b/EdgeAPI/internal/const/const.go index 89f1e42..c3b3d66 100644 --- a/EdgeAPI/internal/const/const.go +++ b/EdgeAPI/internal/const/const.go @@ -1,7 +1,7 @@ package teaconst const ( - Version = "1.4.7" //1.3.9 + Version = "1.4.9" //1.3.9 ProductName = "Edge API" ProcessName = "edge-api" @@ -17,6 +17,6 @@ const ( // 其他节点版本号，用来检测是否有需要升级的节点 - NodeVersion = "1.4.7" //1.3.8.2 + NodeVersion = "1.4.9" //1.3.8.2 ) diff --git a/EdgeAPI/internal/const/const_plus.go b/EdgeAPI/internal/const/const_plus.go index 44ea4f5..5b679bd 100644 --- a/EdgeAPI/internal/const/const_plus.go +++ b/EdgeAPI/internal/const/const_plus.go @@ -4,8 +4,8 @@ package teaconst const ( - DNSNodeVersion = "1.4.7" //1.3.8.2 - UserNodeVersion = "1.4.7" //1.3.8.2 + DNSNodeVersion = "1.4.9" //1.3.8.2 + UserNodeVersion = "1.4.9" //1.3.8.2 ReportNodeVersion = "0.1.5" DefaultMaxNodes int32 = 50 diff --git a/EdgeAPI/internal/db/models/httpdns_access_log_dao.go b/EdgeAPI/internal/db/models/httpdns_access_log_dao.go new file mode 100644 index 0000000..8dc4b01 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_access_log_dao.go @@ -0,0 +1,134 @@ +package models + +import ( + _ "github.com/go-sql-driver/mysql" + "github.com/iwind/TeaGo/Tea" + "github.com/iwind/TeaGo/dbs" + "strings" +) + +type HTTPDNSAccessLogDAO dbs.DAO + +func NewHTTPDNSAccessLogDAO() *HTTPDNSAccessLogDAO { + return dbs.NewDAO(&HTTPDNSAccessLogDAO{ + DAOObject: dbs.DAOObject{ + DB: Tea.Env, + Table: "edgeHTTPDNSAccessLogs", + Model: new(HTTPDNSAccessLog), + PkName: "id", + }, + }).(*HTTPDNSAccessLogDAO) +} + +var SharedHTTPDNSAccessLogDAO *HTTPDNSAccessLogDAO + +func init() { + dbs.OnReady(func() { + SharedHTTPDNSAccessLogDAO = NewHTTPDNSAccessLogDAO() + }) +} + +func (this *HTTPDNSAccessLogDAO) CreateLog(tx *dbs.Tx, log *HTTPDNSAccessLog) error { + var op = NewHTTPDNSAccessLogOperator() + op.RequestId = log.RequestId + op.ClusterId = log.ClusterId + op.NodeId = log.NodeId + op.AppId = log.AppId + op.AppName = log.AppName + op.Domain = log.Domain + op.QType = log.QType + op.ClientIP = log.ClientIP + op.ClientRegion = log.ClientRegion + op.Carrier = log.Carrier + op.SDKVersion = log.SDKVersion + op.OS = log.OS + op.ResultIPs = log.ResultIPs + op.Status = log.Status + op.ErrorCode = log.ErrorCode + op.CostMs = log.CostMs + op.CreatedAt = log.CreatedAt + op.Day = log.Day + op.Summary = log.Summary + return this.Save(tx, op) +} + +func (this *HTTPDNSAccessLogDAO) BuildListQuery(tx *dbs.Tx, day string, clusterId int64, nodeId int64, appId string, domain string, status string, keyword string) *dbs.Query { + return this.BuildListQueryWithAppIds(tx, day, clusterId, nodeId, appId, nil, domain, status, keyword) +} + +func (this *HTTPDNSAccessLogDAO) BuildListQueryWithAppIds(tx *dbs.Tx, day string, clusterId int64, nodeId int64, appId string, appIds []string, domain string, status string, keyword string) *dbs.Query { + query := this.Query(tx).DescPk() + if len(day) > 0 { + query = query.Attr("day", day) + } + if clusterId > 0 { + query = query.Attr("clusterId", clusterId) + } + if nodeId > 0 { + query = query.Attr("nodeId", nodeId) + } + if len(appIds) > 0 { + validAppIds := make([]string, 0, len(appIds)) + for _, value := range appIds { + value = strings.TrimSpace(value) + if len(value) == 0 { + continue + } + validAppIds = append(validAppIds, value) + } + if len(validAppIds) == 0 { + query = query.Where("1 = 0") + } else { + query = query.Attr("appId", validAppIds) + } + } + if len(appId) > 0 { + query = query.Attr("appId", appId) + } + if len(domain) > 0 { + query = query.Attr("domain", domain) + } + if len(status) > 0 { + query = query.Attr("status", status) + } + if len(keyword) > 0 { + query = query.Where("(summary LIKE :kw OR appName LIKE :kw OR clientIP LIKE :kw OR resultIPs LIKE :kw)").Param("kw", "%"+keyword+"%") + } + return query +} + +func (this *HTTPDNSAccessLogDAO) CountLogs(tx *dbs.Tx, day string, clusterId int64, nodeId int64, appId string, domain string, status string, keyword string) (int64, error) { + return this.BuildListQueryWithAppIds(tx, day, clusterId, nodeId, appId, nil, domain, status, keyword).Count() +} + +func (this *HTTPDNSAccessLogDAO) ListLogs(tx *dbs.Tx, day string, clusterId int64, nodeId int64, appId string, domain string, status string, keyword string, offset int64, size int64) (result []*HTTPDNSAccessLog, err error) { + _, err = this.BuildListQueryWithAppIds(tx, day, clusterId, nodeId, appId, nil, domain, status, keyword). + Offset(offset). + Limit(size). + Slice(&result). + FindAll() + return +} + +func (this *HTTPDNSAccessLogDAO) CountLogsWithAppIds(tx *dbs.Tx, day string, clusterId int64, nodeId int64, appId string, appIds []string, domain string, status string, keyword string) (int64, error) { + return this.BuildListQueryWithAppIds(tx, day, clusterId, nodeId, appId, appIds, domain, status, keyword).Count() +} + +func (this *HTTPDNSAccessLogDAO) ListLogsWithAppIds(tx *dbs.Tx, day string, clusterId int64, nodeId int64, appId string, appIds []string, domain string, status string, keyword string, offset int64, size int64) (result []*HTTPDNSAccessLog, err error) { + _, err = this.BuildListQueryWithAppIds(tx, day, clusterId, nodeId, appId, appIds, domain, status, keyword). + Offset(offset). + Limit(size). + Slice(&result). + FindAll() + return +} + +func (this *HTTPDNSAccessLogDAO) DeleteLogsWithAppId(tx *dbs.Tx, appId string) error { + if len(appId) == 0 { + return nil + } + _, err := this.Query(tx). + Attr("appId", appId). + Delete() + return err +} diff --git a/EdgeAPI/internal/db/models/httpdns_access_log_model.go b/EdgeAPI/internal/db/models/httpdns_access_log_model.go new file mode 100644 index 0000000..0c8da61 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_access_log_model.go @@ -0,0 +1,52 @@ +package models + +// HTTPDNSAccessLog 访问日志 +type HTTPDNSAccessLog struct { + Id uint64 `field:"id"` // ID + RequestId string `field:"requestId"` // 请求ID + ClusterId uint32 `field:"clusterId"` // 集群ID + NodeId uint32 `field:"nodeId"` // 节点ID + AppId string `field:"appId"` // AppID + AppName string `field:"appName"` // 应用名 + Domain string `field:"domain"` // 域名 + QType string `field:"qtype"` // 查询类型 + ClientIP string `field:"clientIP"` // 客户端IP + ClientRegion string `field:"clientRegion"` // 客户端区域 + Carrier string `field:"carrier"` // 运营商 + SDKVersion string `field:"sdkVersion"` // SDK版本 + OS string `field:"os"` // 系统 + ResultIPs string `field:"resultIPs"` // 结果IP + Status string `field:"status"` // 状态 + ErrorCode string `field:"errorCode"` // 错误码 + CostMs int32 `field:"costMs"` // 耗时 + CreatedAt uint64 `field:"createdAt"` // 创建时间 + Day string `field:"day"` // YYYYMMDD + Summary string `field:"summary"` // 概要 +} + +type HTTPDNSAccessLogOperator struct { + Id any // ID + RequestId any // 请求ID + ClusterId any // 集群ID + NodeId any // 节点ID + AppId any // AppID + AppName any // 应用名 + Domain any // 域名 + QType any // 查询类型 + ClientIP any // 客户端IP + ClientRegion any // 客户端区域 + Carrier any // 运营商 + SDKVersion any // SDK版本 + OS any // 系统 + ResultIPs any // 结果IP + Status any // 状态 + ErrorCode any // 错误码 + CostMs any // 耗时 + CreatedAt any // 创建时间 + Day any // YYYYMMDD + Summary any // 概要 +} + +func NewHTTPDNSAccessLogOperator() *HTTPDNSAccessLogOperator { + return &HTTPDNSAccessLogOperator{} +} diff --git a/EdgeAPI/internal/db/models/httpdns_app_dao.go b/EdgeAPI/internal/db/models/httpdns_app_dao.go new file mode 100644 index 0000000..bbcd9e0 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_app_dao.go @@ -0,0 +1,239 @@ +package models + +import ( + "encoding/json" + + _ "github.com/go-sql-driver/mysql" + "github.com/iwind/TeaGo/Tea" + "github.com/iwind/TeaGo/dbs" + "github.com/iwind/TeaGo/types" + "time" +) + +const ( + HTTPDNSAppStateEnabled = 1 + HTTPDNSAppStateDisabled = 0 + HTTPDNSSNIModeFixedHide = "fixed_hide" +) + +type HTTPDNSAppDAO dbs.DAO + +func NewHTTPDNSAppDAO() *HTTPDNSAppDAO { + return dbs.NewDAO(&HTTPDNSAppDAO{ + DAOObject: dbs.DAOObject{ + DB: Tea.Env, + Table: "edgeHTTPDNSApps", + Model: new(HTTPDNSApp), + PkName: "id", + }, + }).(*HTTPDNSAppDAO) +} + +var SharedHTTPDNSAppDAO *HTTPDNSAppDAO + +func init() { + dbs.OnReady(func() { + SharedHTTPDNSAppDAO = NewHTTPDNSAppDAO() + }) +} + +func (this *HTTPDNSAppDAO) CreateApp(tx *dbs.Tx, name string, appId string, clusterIdsJSON []byte, isOn bool, userId int64) (int64, error) { + var op = NewHTTPDNSAppOperator() + op.Name = name + op.AppId = appId + + if len(clusterIdsJSON) > 0 { + op.ClusterIdsJSON = string(clusterIdsJSON) + } else { + op.ClusterIdsJSON = "[]" + } + + op.IsOn = isOn + op.UserId = userId + op.SNIMode = HTTPDNSSNIModeFixedHide + op.CreatedAt = time.Now().Unix() + op.UpdatedAt = time.Now().Unix() + op.State = HTTPDNSAppStateEnabled + err := this.Save(tx, op) + if err != nil { + return 0, err + } + return types.Int64(op.Id), nil +} + +func (this *HTTPDNSAppDAO) UpdateApp(tx *dbs.Tx, appDbId int64, name string, clusterIdsJSON []byte, isOn bool, userId int64) error { + var op = NewHTTPDNSAppOperator() + op.Id = appDbId + op.Name = name + + if len(clusterIdsJSON) > 0 { + op.ClusterIdsJSON = string(clusterIdsJSON) + } else { + op.ClusterIdsJSON = "[]" + } + + op.IsOn = isOn + op.UserId = userId + op.UpdatedAt = time.Now().Unix() + return this.Save(tx, op) +} + +// ReadAppClusterIds reads cluster IDs from ClusterIdsJSON. +func (this *HTTPDNSAppDAO) ReadAppClusterIds(app *HTTPDNSApp) []int64 { + if app == nil { + return nil + } + if len(app.ClusterIdsJSON) > 0 { + var ids []int64 + if err := json.Unmarshal([]byte(app.ClusterIdsJSON), &ids); err == nil && len(ids) > 0 { + return ids + } + } + return nil +} + +func (this *HTTPDNSAppDAO) DisableApp(tx *dbs.Tx, appDbId int64) error { + _, err := this.Query(tx). + Pk(appDbId). + Set("state", HTTPDNSAppStateDisabled). + Update() + return err +} + +func (this *HTTPDNSAppDAO) FindEnabledApp(tx *dbs.Tx, appDbId int64) (*HTTPDNSApp, error) { + one, err := this.Query(tx). + Pk(appDbId). + State(HTTPDNSAppStateEnabled). + Find() + if one == nil { + return nil, err + } + return one.(*HTTPDNSApp), nil +} + +func (this *HTTPDNSAppDAO) FindEnabledAppWithUser(tx *dbs.Tx, appDbId int64, userId int64) (*HTTPDNSApp, error) { + one, err := this.Query(tx). + Pk(appDbId). + State(HTTPDNSAppStateEnabled). + Attr("userId", userId). + Find() + if one == nil { + return nil, err + } + return one.(*HTTPDNSApp), nil +} + +func (this *HTTPDNSAppDAO) FindEnabledAppWithAppId(tx *dbs.Tx, appId string) (*HTTPDNSApp, error) { + one, err := this.Query(tx). + State(HTTPDNSAppStateEnabled). + Attr("appId", appId). + Find() + if one == nil { + return nil, err + } + return one.(*HTTPDNSApp), nil +} + +func (this *HTTPDNSAppDAO) FindEnabledAppWithAppIdAndUser(tx *dbs.Tx, appId string, userId int64) (*HTTPDNSApp, error) { + one, err := this.Query(tx). + State(HTTPDNSAppStateEnabled). + Attr("appId", appId). + Attr("userId", userId). + Find() + if one == nil { + return nil, err + } + return one.(*HTTPDNSApp), nil +} + +func (this *HTTPDNSAppDAO) FindLatestEnabledAppWithNameAndUser(tx *dbs.Tx, name string, userId int64) (*HTTPDNSApp, error) { + one, err := this.Query(tx). + State(HTTPDNSAppStateEnabled). + Attr("name", name). + Attr("userId", userId). + DescPk(). + Find() + if one == nil { + return nil, err + } + return one.(*HTTPDNSApp), nil +} + +func (this *HTTPDNSAppDAO) ListEnabledApps(tx *dbs.Tx, offset int64, size int64, keyword string) (result []*HTTPDNSApp, err error) { + query := this.Query(tx). + State(HTTPDNSAppStateEnabled). + AscPk() + if len(keyword) > 0 { + query = query.Where("(name LIKE :kw OR appId LIKE :kw)").Param("kw", "%"+keyword+"%") + } + if size > 0 { + query = query.Offset(offset).Limit(size) + } + _, err = query.Slice(&result).FindAll() + return +} + +func (this *HTTPDNSAppDAO) ListEnabledAppsWithUser(tx *dbs.Tx, userId int64, offset int64, size int64, keyword string) (result []*HTTPDNSApp, err error) { + query := this.Query(tx). + State(HTTPDNSAppStateEnabled). + Attr("userId", userId). + AscPk() + if len(keyword) > 0 { + query = query.Where("(name LIKE :kw OR appId LIKE :kw)").Param("kw", "%"+keyword+"%") + } + if size > 0 { + query = query.Offset(offset).Limit(size) + } + _, err = query.Slice(&result).FindAll() + return +} + +func (this *HTTPDNSAppDAO) CountEnabledApps(tx *dbs.Tx, keyword string) (int64, error) { + query := this.Query(tx).State(HTTPDNSAppStateEnabled) + if len(keyword) > 0 { + query = query.Where("(name LIKE :kw OR appId LIKE :kw)").Param("kw", "%"+keyword+"%") + } + return query.Count() +} + +func (this *HTTPDNSAppDAO) CountEnabledAppsWithUser(tx *dbs.Tx, userId int64, keyword string) (int64, error) { + query := this.Query(tx).State(HTTPDNSAppStateEnabled).Attr("userId", userId) + if len(keyword) > 0 { + query = query.Where("(name LIKE :kw OR appId LIKE :kw)").Param("kw", "%"+keyword+"%") + } + return query.Count() +} + +func (this *HTTPDNSAppDAO) FindAllEnabledApps(tx *dbs.Tx) (result []*HTTPDNSApp, err error) { + _, err = this.Query(tx). + State(HTTPDNSAppStateEnabled). + AscPk(). + Slice(&result). + FindAll() + return +} + +func (this *HTTPDNSAppDAO) FindAllEnabledAppsWithUser(tx *dbs.Tx, userId int64) (result []*HTTPDNSApp, err error) { + _, err = this.Query(tx). + State(HTTPDNSAppStateEnabled). + Attr("userId", userId). + AscPk(). + Slice(&result). + FindAll() + return +} + +func (this *HTTPDNSAppDAO) ListEnabledAppIdsWithUser(tx *dbs.Tx, userId int64) (result []string, err error) { + apps, err := this.FindAllEnabledAppsWithUser(tx, userId) + if err != nil { + return nil, err + } + result = make([]string, 0, len(apps)) + for _, app := range apps { + if app == nil || len(app.AppId) == 0 { + continue + } + result = append(result, app.AppId) + } + return +} diff --git a/EdgeAPI/internal/db/models/httpdns_app_model.go b/EdgeAPI/internal/db/models/httpdns_app_model.go new file mode 100644 index 0000000..58d5b29 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_app_model.go @@ -0,0 +1,34 @@ +package models + +// HTTPDNSApp maps to edgeHTTPDNSApps. +type HTTPDNSApp struct { + Id uint32 `field:"id"` // id + Name string `field:"name"` // app name + AppId string `field:"appId"` // external app id + IsOn bool `field:"isOn"` // enabled + ClusterIdsJSON string `field:"clusterIdsJSON"` // cluster ids json + SNIMode string `field:"sniMode"` // sni mode + UserId int64 `field:"userId"` // owner user id + CreatedAt uint64 `field:"createdAt"` // created unix ts + UpdatedAt uint64 `field:"updatedAt"` // updated unix ts + State uint8 `field:"state"` // state +} + +// HTTPDNSAppOperator is used by DAO save/update. +type HTTPDNSAppOperator struct { + Id any // id + Name any // app name + AppId any // external app id + IsOn any // enabled + ClusterIdsJSON any // cluster ids json + SNIMode any // sni mode + UserId any // owner user id + CreatedAt any // created unix ts + UpdatedAt any // updated unix ts + State any // state +} + +func NewHTTPDNSAppOperator() *HTTPDNSAppOperator { + return &HTTPDNSAppOperator{} +} + diff --git a/EdgeAPI/internal/db/models/httpdns_app_secret_dao.go b/EdgeAPI/internal/db/models/httpdns_app_secret_dao.go new file mode 100644 index 0000000..37ca9f0 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_app_secret_dao.go @@ -0,0 +1,146 @@ +package models + +import ( + _ "github.com/go-sql-driver/mysql" + "github.com/iwind/TeaGo/Tea" + "github.com/iwind/TeaGo/dbs" + "github.com/iwind/TeaGo/rands" + "github.com/iwind/TeaGo/types" + "time" +) + +const ( + HTTPDNSAppSecretStateEnabled = 1 + HTTPDNSAppSecretStateDisabled = 0 +) + +type HTTPDNSAppSecretDAO dbs.DAO + +func NewHTTPDNSAppSecretDAO() *HTTPDNSAppSecretDAO { + return dbs.NewDAO(&HTTPDNSAppSecretDAO{ + DAOObject: dbs.DAOObject{ + DB: Tea.Env, + Table: "edgeHTTPDNSAppSecrets", + Model: new(HTTPDNSAppSecret), + PkName: "id", + }, + }).(*HTTPDNSAppSecretDAO) +} + +var SharedHTTPDNSAppSecretDAO *HTTPDNSAppSecretDAO + +func init() { + dbs.OnReady(func() { + SharedHTTPDNSAppSecretDAO = NewHTTPDNSAppSecretDAO() + }) +} + +func (this *HTTPDNSAppSecretDAO) InitAppSecret(tx *dbs.Tx, appDbId int64, signEnabled bool) (string, uint64, error) { + signSecret := "ss_" + rands.HexString(12) + now := uint64(time.Now().Unix()) + + // 兼容历史数据：如果已存在（可能是停用状态）则直接恢复并更新，避免 UNIQUE(appId) 冲突 + old, err := this.Query(tx). + Attr("appId", appDbId). + Find() + if err != nil { + return "", 0, err + } + if old != nil { + oldSecret := old.(*HTTPDNSAppSecret) + _, err = this.Query(tx). + Pk(oldSecret.Id). + Set("signEnabled", signEnabled). + Set("signSecret", signSecret). + Set("signUpdatedAt", now). + Set("updatedAt", now). + Set("state", HTTPDNSAppSecretStateEnabled). + Update() + return signSecret, now, err + } + + var op = NewHTTPDNSAppSecretOperator() + op.AppId = appDbId + op.SignEnabled = signEnabled + op.SignSecret = signSecret + op.SignUpdatedAt = now + op.UpdatedAt = now + op.State = HTTPDNSAppSecretStateEnabled + err = this.Save(tx, op) + return signSecret, now, err +} + +func (this *HTTPDNSAppSecretDAO) FindEnabledAppSecret(tx *dbs.Tx, appDbId int64) (*HTTPDNSAppSecret, error) { + one, err := this.Query(tx). + Attr("appId", appDbId). + State(HTTPDNSAppSecretStateEnabled). + Find() + if one == nil { + return nil, err + } + return one.(*HTTPDNSAppSecret), nil +} + +func (this *HTTPDNSAppSecretDAO) UpdateSignEnabled(tx *dbs.Tx, appDbId int64, signEnabled bool) error { + _, err := this.Query(tx). + Attr("appId", appDbId). + State(HTTPDNSAppSecretStateEnabled). + Set("signEnabled", signEnabled). + Set("updatedAt", time.Now().Unix()). + Update() + return err +} + +func (this *HTTPDNSAppSecretDAO) ResetSignSecret(tx *dbs.Tx, appDbId int64) (string, int64, error) { + signSecret := "ss_" + rands.HexString(12) + now := time.Now().Unix() + _, err := this.Query(tx). + Attr("appId", appDbId). + State(HTTPDNSAppSecretStateEnabled). + Set("signSecret", signSecret). + Set("signUpdatedAt", now). + Set("updatedAt", now). + Update() + if err != nil { + return "", 0, err + } + return signSecret, now, nil +} + +func (this *HTTPDNSAppSecretDAO) FindSignEnabled(tx *dbs.Tx, appDbId int64) (bool, error) { + one, err := this.FindEnabledAppSecret(tx, appDbId) + if err != nil || one == nil { + return false, err + } + return one.SignEnabled, nil +} + +func (this *HTTPDNSAppSecretDAO) FindSignSecretWithAppDbId(tx *dbs.Tx, appDbId int64) (string, error) { + return this.Query(tx). + Attr("appId", appDbId). + State(HTTPDNSAppSecretStateEnabled). + Result("signSecret"). + FindStringCol("") +} + +func (this *HTTPDNSAppSecretDAO) FindSignUpdatedAt(tx *dbs.Tx, appDbId int64) (int64, error) { + col, err := this.Query(tx). + Attr("appId", appDbId). + State(HTTPDNSAppSecretStateEnabled). + Result("signUpdatedAt"). + FindCol(nil) + if err != nil { + return 0, err + } + return types.Int64(col), nil +} + +func (this *HTTPDNSAppSecretDAO) DisableAppSecret(tx *dbs.Tx, appDbId int64) error { + _, err := this.Query(tx). + Attr("appId", appDbId). + State(HTTPDNSAppSecretStateEnabled). + Set("state", HTTPDNSAppSecretStateDisabled). + Set("updatedAt", time.Now().Unix()). + Update() + return err +} diff --git a/EdgeAPI/internal/db/models/httpdns_app_secret_model.go b/EdgeAPI/internal/db/models/httpdns_app_secret_model.go new file mode 100644 index 0000000..92563a7 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_app_secret_model.go @@ -0,0 +1,26 @@ +package models + +// HTTPDNSAppSecret 应用验签密钥配置 +type HTTPDNSAppSecret struct { + Id uint32 `field:"id"` // ID + AppId uint32 `field:"appId"` // 应用DB ID + SignEnabled bool `field:"signEnabled"` // 是否启用验签 + SignSecret string `field:"signSecret"` // 验签密钥(当前先明文存储) + SignUpdatedAt uint64 `field:"signUpdatedAt"` // 验签密钥更新时间 + UpdatedAt uint64 `field:"updatedAt"` // 修改时间 + State uint8 `field:"state"` // 记录状态 +} + +type HTTPDNSAppSecretOperator struct { + Id any // ID + AppId any // 应用DB ID + SignEnabled any // 是否启用验签 + SignSecret any // 验签密钥 + SignUpdatedAt any // 验签密钥更新时间 + UpdatedAt any // 修改时间 + State any // 记录状态 +} + +func NewHTTPDNSAppSecretOperator() *HTTPDNSAppSecretOperator { + return &HTTPDNSAppSecretOperator{} +} diff --git a/EdgeAPI/internal/db/models/httpdns_cluster_dao.go b/EdgeAPI/internal/db/models/httpdns_cluster_dao.go new file mode 100644 index 0000000..9a5af68 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_cluster_dao.go @@ -0,0 +1,191 @@ +package models + +import ( + _ "github.com/go-sql-driver/mysql" + "github.com/iwind/TeaGo/Tea" + "github.com/iwind/TeaGo/dbs" + "github.com/iwind/TeaGo/types" + "time" +) + +const ( + HTTPDNSClusterStateEnabled = 1 + HTTPDNSClusterStateDisabled = 0 +) + +type HTTPDNSClusterDAO dbs.DAO + +func NewHTTPDNSClusterDAO() *HTTPDNSClusterDAO { + return dbs.NewDAO(&HTTPDNSClusterDAO{ + DAOObject: dbs.DAOObject{ + DB: Tea.Env, + Table: "edgeHTTPDNSClusters", + Model: new(HTTPDNSCluster), + PkName: "id", + }, + }).(*HTTPDNSClusterDAO) +} + +var SharedHTTPDNSClusterDAO *HTTPDNSClusterDAO + +func init() { + dbs.OnReady(func() { + SharedHTTPDNSClusterDAO = NewHTTPDNSClusterDAO() + }) +} + +func (this *HTTPDNSClusterDAO) CreateCluster(tx *dbs.Tx, name string, serviceDomain string, defaultTTL int32, fallbackTimeoutMs int32, installDir string, tlsPolicyJSON []byte, isOn bool, isDefault bool, autoRemoteStart bool, accessLogIsOn bool, timeZone string) (int64, error) { + if isDefault { + err := this.Query(tx). + State(HTTPDNSClusterStateEnabled). + Set("isDefault", false). + UpdateQuickly() + if err != nil { + return 0, err + } + } + + var op = NewHTTPDNSClusterOperator() + op.Name = name + op.ServiceDomain = serviceDomain + op.DefaultTTL = defaultTTL + op.FallbackTimeoutMs = fallbackTimeoutMs + op.InstallDir = installDir + op.IsOn = isOn + op.IsDefault = isDefault + op.AutoRemoteStart = autoRemoteStart + op.AccessLogIsOn = accessLogIsOn + op.TimeZone = timeZone + op.CreatedAt = time.Now().Unix() + op.UpdatedAt = time.Now().Unix() + op.State = HTTPDNSClusterStateEnabled + if len(tlsPolicyJSON) > 0 { + op.TLSPolicy = tlsPolicyJSON + } + err := this.Save(tx, op) + if err != nil { + return 0, err + } + return types.Int64(op.Id), nil +} + +func (this *HTTPDNSClusterDAO) UpdateCluster(tx *dbs.Tx, clusterId int64, name string, serviceDomain string, defaultTTL int32, fallbackTimeoutMs int32, installDir string, tlsPolicyJSON []byte, isOn bool, isDefault bool, autoRemoteStart bool, accessLogIsOn bool, timeZone string) error { + if isDefault { + err := this.Query(tx). + State(HTTPDNSClusterStateEnabled). + Neq("id", clusterId). + Set("isDefault", false). + UpdateQuickly() + if err != nil { + return err + } + } + + var op = NewHTTPDNSClusterOperator() + op.Id = clusterId + op.Name = name + op.ServiceDomain = serviceDomain + op.DefaultTTL = defaultTTL + op.FallbackTimeoutMs = fallbackTimeoutMs + op.InstallDir = installDir + op.IsOn = isOn + op.IsDefault = isDefault + op.AutoRemoteStart = autoRemoteStart + op.AccessLogIsOn = accessLogIsOn + op.TimeZone = timeZone + op.UpdatedAt = time.Now().Unix() + if len(tlsPolicyJSON) > 0 { + op.TLSPolicy = tlsPolicyJSON + } + return this.Save(tx, op) +} + +func (this *HTTPDNSClusterDAO) DisableCluster(tx *dbs.Tx, clusterId int64) error { + _, err := this.Query(tx). + Pk(clusterId). + Set("state", HTTPDNSClusterStateDisabled). + Update() + return err +} + +func (this *HTTPDNSClusterDAO) FindEnabledCluster(tx *dbs.Tx, clusterId int64) (*HTTPDNSCluster, error) { + one, err := this.Query(tx). + Pk(clusterId). + State(HTTPDNSClusterStateEnabled). + Find() + if one == nil { + return nil, err + } + return one.(*HTTPDNSCluster), nil +} + +func (this *HTTPDNSClusterDAO) FindEnabledClusterName(tx *dbs.Tx, clusterId int64) (string, error) { + return this.Query(tx). + Pk(clusterId). + State(HTTPDNSClusterStateEnabled). + Result("name"). + FindStringCol("") +} + +func (this *HTTPDNSClusterDAO) ListEnabledClusters(tx *dbs.Tx, offset int64, size int64, keyword string) (result []*HTTPDNSCluster, err error) { + query := this.Query(tx). + State(HTTPDNSClusterStateEnabled). + AscPk() + if len(keyword) > 0 { + query = query.Where("(name LIKE :kw OR serviceDomain LIKE :kw)").Param("kw", "%"+keyword+"%") + } + if size > 0 { + query = query.Offset(offset).Limit(size) + } + _, err = query.Slice(&result).FindAll() + return +} + +func (this *HTTPDNSClusterDAO) CountEnabledClusters(tx *dbs.Tx, keyword string) (int64, error) { + query := this.Query(tx).State(HTTPDNSClusterStateEnabled) + if len(keyword) > 0 { + query = query.Where("(name LIKE :kw OR serviceDomain LIKE :kw)").Param("kw", "%"+keyword+"%") + } + return query.Count() +} + +func (this *HTTPDNSClusterDAO) FindAllEnabledClusters(tx *dbs.Tx) (result []*HTTPDNSCluster, err error) { + _, err = this.Query(tx). + State(HTTPDNSClusterStateEnabled). + AscPk(). + Slice(&result). + FindAll() + return +} + +func (this *HTTPDNSClusterDAO) FindDefaultPrimaryClusterId(tx *dbs.Tx) (int64, error) { + col, err := this.Query(tx). + State(HTTPDNSClusterStateEnabled). + Attr("isDefault", true). + Result("id"). + AscPk(). + FindCol(nil) + if err != nil { + return 0, err + } + if col == nil { + return 0, nil + } + return types.Int64(col), nil +} + +func (this *HTTPDNSClusterDAO) UpdateDefaultCluster(tx *dbs.Tx, clusterId int64) error { + err := this.Query(tx). + State(HTTPDNSClusterStateEnabled). + Set("isDefault", false). + UpdateQuickly() + if err != nil { + return err + } + _, err = this.Query(tx). + Pk(clusterId). + State(HTTPDNSClusterStateEnabled). + Set("isDefault", true). + Update() + return err +} diff --git a/EdgeAPI/internal/db/models/httpdns_cluster_model.go b/EdgeAPI/internal/db/models/httpdns_cluster_model.go new file mode 100644 index 0000000..917c562 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_cluster_model.go @@ -0,0 +1,44 @@ +package models + +import "github.com/iwind/TeaGo/dbs" + +// HTTPDNSCluster HTTPDNS集群 +type HTTPDNSCluster struct { + Id uint32 `field:"id"` // ID + Name string `field:"name"` // 集群名称 + IsOn bool `field:"isOn"` // 是否启用 + IsDefault bool `field:"isDefault"` // 默认集群 + ServiceDomain string `field:"serviceDomain"` // 服务域名 + DefaultTTL int32 `field:"defaultTTL"` // 默认TTL + FallbackTimeoutMs int32 `field:"fallbackTimeoutMs"` // 降级超时 + InstallDir string `field:"installDir"` // 安装目录 + TLSPolicy dbs.JSON `field:"tlsPolicy"` // TLS策略 + AutoRemoteStart bool `field:"autoRemoteStart"` // 自动远程启动 + AccessLogIsOn bool `field:"accessLogIsOn"` // 访问日志是否开启 + TimeZone string `field:"timeZone"` // 时区 + CreatedAt uint64 `field:"createdAt"` // 创建时间 + UpdatedAt uint64 `field:"updatedAt"` // 修改时间 + State uint8 `field:"state"` // 记录状态 +} + +type HTTPDNSClusterOperator struct { + Id any // ID + Name any // 集群名称 + IsOn any // 是否启用 + IsDefault any // 默认集群 + ServiceDomain any // 服务域名 + DefaultTTL any // 默认TTL + FallbackTimeoutMs any // 降级超时 + InstallDir any // 安装目录 + TLSPolicy any // TLS策略 + AutoRemoteStart any // 自动远程启动 + AccessLogIsOn any // 访问日志是否开启 + TimeZone any // 时区 + CreatedAt any // 创建时间 + UpdatedAt any // 修改时间 + State any // 记录状态 +} + +func NewHTTPDNSClusterOperator() *HTTPDNSClusterOperator { + return &HTTPDNSClusterOperator{} +} diff --git a/EdgeAPI/internal/db/models/httpdns_custom_rule_dao.go b/EdgeAPI/internal/db/models/httpdns_custom_rule_dao.go new file mode 100644 index 0000000..0df5629 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_custom_rule_dao.go @@ -0,0 +1,143 @@ +package models + +import ( + _ "github.com/go-sql-driver/mysql" + "github.com/iwind/TeaGo/Tea" + "github.com/iwind/TeaGo/dbs" + "github.com/iwind/TeaGo/types" + "time" +) + +const ( + HTTPDNSCustomRuleStateEnabled = 1 + HTTPDNSCustomRuleStateDisabled = 0 +) + +type HTTPDNSCustomRuleDAO dbs.DAO + +func NewHTTPDNSCustomRuleDAO() *HTTPDNSCustomRuleDAO { + return dbs.NewDAO(&HTTPDNSCustomRuleDAO{ + DAOObject: dbs.DAOObject{ + DB: Tea.Env, + Table: "edgeHTTPDNSCustomRules", + Model: new(HTTPDNSCustomRule), + PkName: "id", + }, + }).(*HTTPDNSCustomRuleDAO) +} + +var SharedHTTPDNSCustomRuleDAO *HTTPDNSCustomRuleDAO + +func init() { + dbs.OnReady(func() { + SharedHTTPDNSCustomRuleDAO = NewHTTPDNSCustomRuleDAO() + }) +} + +func (this *HTTPDNSCustomRuleDAO) CreateRule(tx *dbs.Tx, rule *HTTPDNSCustomRule) (int64, error) { + var op = NewHTTPDNSCustomRuleOperator() + op.AppId = rule.AppId + op.DomainId = rule.DomainId + op.RuleName = rule.RuleName + op.LineScope = rule.LineScope + op.LineCarrier = rule.LineCarrier + op.LineRegion = rule.LineRegion + op.LineProvince = rule.LineProvince + op.LineContinent = rule.LineContinent + op.LineCountry = rule.LineCountry + op.TTL = rule.TTL + op.IsOn = rule.IsOn + op.Priority = rule.Priority + op.UpdatedAt = time.Now().Unix() + op.State = HTTPDNSCustomRuleStateEnabled + err := this.Save(tx, op) + if err != nil { + return 0, err + } + return types.Int64(op.Id), nil +} + +func (this *HTTPDNSCustomRuleDAO) UpdateRule(tx *dbs.Tx, rule *HTTPDNSCustomRule) error { + var op = NewHTTPDNSCustomRuleOperator() + op.Id = rule.Id + op.RuleName = rule.RuleName + op.LineScope = rule.LineScope + op.LineCarrier = rule.LineCarrier + op.LineRegion = rule.LineRegion + op.LineProvince = rule.LineProvince + op.LineContinent = rule.LineContinent + op.LineCountry = rule.LineCountry + op.TTL = rule.TTL + op.IsOn = rule.IsOn + op.Priority = rule.Priority + op.UpdatedAt = time.Now().Unix() + return this.Save(tx, op) +} + +func (this *HTTPDNSCustomRuleDAO) DisableRule(tx *dbs.Tx, ruleId int64) error { + _, err := this.Query(tx). + Pk(ruleId). + Set("state", HTTPDNSCustomRuleStateDisabled). + Update() + return err +} + +func (this *HTTPDNSCustomRuleDAO) DisableRulesWithAppId(tx *dbs.Tx, appDbId int64) error { + _, err := this.Query(tx). + Attr("appId", appDbId). + State(HTTPDNSCustomRuleStateEnabled). + Set("state", HTTPDNSCustomRuleStateDisabled). + Set("updatedAt", time.Now().Unix()). + Update() + return err +} + +func (this *HTTPDNSCustomRuleDAO) UpdateRuleStatus(tx *dbs.Tx, ruleId int64, isOn bool) error { + _, err := this.Query(tx). + Pk(ruleId). + State(HTTPDNSCustomRuleStateEnabled). + Set("isOn", isOn). + Set("updatedAt", time.Now().Unix()). + Update() + return err +} + +func (this *HTTPDNSCustomRuleDAO) FindEnabledRule(tx *dbs.Tx, ruleId int64) (*HTTPDNSCustomRule, error) { + one, err := this.Query(tx). + Pk(ruleId). + State(HTTPDNSCustomRuleStateEnabled). + Find() + if one == nil { + return nil, err + } + return one.(*HTTPDNSCustomRule), nil +} + +func (this *HTTPDNSCustomRuleDAO) ListEnabledRulesWithDomainId(tx *dbs.Tx, domainId int64) (result []*HTTPDNSCustomRule, err error) { + _, err = this.Query(tx). + State(HTTPDNSCustomRuleStateEnabled). + Attr("domainId", domainId). + Asc("priority"). + AscPk(). + Slice(&result). + FindAll() + return +} + +func (this *HTTPDNSCustomRuleDAO) ListEnabledRulesWithAppId(tx *dbs.Tx, appDbId int64) (result []*HTTPDNSCustomRule, err error) { + _, err = this.Query(tx). + State(HTTPDNSCustomRuleStateEnabled). + Attr("appId", appDbId). + Asc("priority"). + AscPk(). + Slice(&result). + FindAll() + return +} + +func (this *HTTPDNSCustomRuleDAO) CountEnabledRulesWithDomainId(tx *dbs.Tx, domainId int64) (int64, error) { + return this.Query(tx). + State(HTTPDNSCustomRuleStateEnabled). + Attr("domainId", domainId). + Count() +} diff --git a/EdgeAPI/internal/db/models/httpdns_custom_rule_model.go b/EdgeAPI/internal/db/models/httpdns_custom_rule_model.go new file mode 100644 index 0000000..8120152 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_custom_rule_model.go @@ -0,0 +1,42 @@ +package models + +// HTTPDNSCustomRule 自定义解析规则 +type HTTPDNSCustomRule struct { + Id uint32 `field:"id"` // ID + AppId uint32 `field:"appId"` // 应用DB ID + DomainId uint32 `field:"domainId"` // 域名ID + RuleName string `field:"ruleName"` // 规则名称 + LineScope string `field:"lineScope"` // 线路范围 + LineCarrier string `field:"lineCarrier"` // 运营商 + LineRegion string `field:"lineRegion"` // 区域 + LineProvince string `field:"lineProvince"` // 省份 + LineContinent string `field:"lineContinent"` // 大洲 + LineCountry string `field:"lineCountry"` // 国家 + TTL int32 `field:"ttl"` // TTL + IsOn bool `field:"isOn"` // 启用状态 + Priority int32 `field:"priority"` // 优先级 + UpdatedAt uint64 `field:"updatedAt"` // 修改时间 + State uint8 `field:"state"` // 记录状态 +} + +type HTTPDNSCustomRuleOperator struct { + Id any // ID + AppId any // 应用DB ID + DomainId any // 域名ID + RuleName any // 规则名称 + LineScope any // 线路范围 + LineCarrier any // 运营商 + LineRegion any // 区域 + LineProvince any // 省份 + LineContinent any // 大洲 + LineCountry any // 国家 + TTL any // TTL + IsOn any // 启用状态 + Priority any // 优先级 + UpdatedAt any // 修改时间 + State any // 记录状态 +} + +func NewHTTPDNSCustomRuleOperator() *HTTPDNSCustomRuleOperator { + return &HTTPDNSCustomRuleOperator{} +} diff --git a/EdgeAPI/internal/db/models/httpdns_custom_rule_record_dao.go b/EdgeAPI/internal/db/models/httpdns_custom_rule_record_dao.go new file mode 100644 index 0000000..58aad00 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_custom_rule_record_dao.go @@ -0,0 +1,69 @@ +package models + +import ( + _ "github.com/go-sql-driver/mysql" + "github.com/iwind/TeaGo/Tea" + "github.com/iwind/TeaGo/dbs" + "github.com/iwind/TeaGo/types" +) + +const ( + HTTPDNSCustomRuleRecordStateEnabled = 1 + HTTPDNSCustomRuleRecordStateDisabled = 0 +) + +type HTTPDNSCustomRuleRecordDAO dbs.DAO + +func NewHTTPDNSCustomRuleRecordDAO() *HTTPDNSCustomRuleRecordDAO { + return dbs.NewDAO(&HTTPDNSCustomRuleRecordDAO{ + DAOObject: dbs.DAOObject{ + DB: Tea.Env, + Table: "edgeHTTPDNSCustomRuleRecords", + Model: new(HTTPDNSCustomRuleRecord), + PkName: "id", + }, + }).(*HTTPDNSCustomRuleRecordDAO) +} + +var SharedHTTPDNSCustomRuleRecordDAO *HTTPDNSCustomRuleRecordDAO + +func init() { + dbs.OnReady(func() { + SharedHTTPDNSCustomRuleRecordDAO = NewHTTPDNSCustomRuleRecordDAO() + }) +} + +func (this *HTTPDNSCustomRuleRecordDAO) CreateRecord(tx *dbs.Tx, ruleId int64, recordType string, recordValue string, weight int32, sort int32) (int64, error) { + var op = NewHTTPDNSCustomRuleRecordOperator() + op.RuleId = ruleId + op.RecordType = recordType + op.RecordValue = recordValue + op.Weight = weight + op.Sort = sort + op.State = HTTPDNSCustomRuleRecordStateEnabled + err := this.Save(tx, op) + if err != nil { + return 0, err + } + return types.Int64(op.Id), nil +} + +func (this *HTTPDNSCustomRuleRecordDAO) DisableRecordsWithRuleId(tx *dbs.Tx, ruleId int64) error { + _, err := this.Query(tx). + Attr("ruleId", ruleId). + State(HTTPDNSCustomRuleRecordStateEnabled). + Set("state", HTTPDNSCustomRuleRecordStateDisabled). + Update() + return err +} + +func (this *HTTPDNSCustomRuleRecordDAO) ListEnabledRecordsWithRuleId(tx *dbs.Tx, ruleId int64) (result []*HTTPDNSCustomRuleRecord, err error) { + _, err = this.Query(tx). + State(HTTPDNSCustomRuleRecordStateEnabled). + Attr("ruleId", ruleId). + Asc("sort"). + AscPk(). + Slice(&result). + FindAll() + return +} diff --git a/EdgeAPI/internal/db/models/httpdns_custom_rule_record_model.go b/EdgeAPI/internal/db/models/httpdns_custom_rule_record_model.go new file mode 100644 index 0000000..c5128d0 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_custom_rule_record_model.go @@ -0,0 +1,26 @@ +package models + +// HTTPDNSCustomRuleRecord 自定义规则记录值 +type HTTPDNSCustomRuleRecord struct { + Id uint32 `field:"id"` // ID + RuleId uint32 `field:"ruleId"` // 规则ID + RecordType string `field:"recordType"` // 记录类型 + RecordValue string `field:"recordValue"` // 记录值 + Weight int32 `field:"weight"` // 权重 + Sort int32 `field:"sort"` // 顺序 + State uint8 `field:"state"` // 记录状态 +} + +type HTTPDNSCustomRuleRecordOperator struct { + Id any // ID + RuleId any // 规则ID + RecordType any // 记录类型 + RecordValue any // 记录值 + Weight any // 权重 + Sort any // 顺序 + State any // 记录状态 +} + +func NewHTTPDNSCustomRuleRecordOperator() *HTTPDNSCustomRuleRecordOperator { + return &HTTPDNSCustomRuleRecordOperator{} +} diff --git a/EdgeAPI/internal/db/models/httpdns_domain_dao.go b/EdgeAPI/internal/db/models/httpdns_domain_dao.go new file mode 100644 index 0000000..2330869 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_domain_dao.go @@ -0,0 +1,115 @@ +package models + +import ( + _ "github.com/go-sql-driver/mysql" + "github.com/iwind/TeaGo/Tea" + "github.com/iwind/TeaGo/dbs" + "github.com/iwind/TeaGo/types" + "strings" + "time" +) + +const ( + HTTPDNSDomainStateEnabled = 1 + HTTPDNSDomainStateDisabled = 0 +) + +type HTTPDNSDomainDAO dbs.DAO + +func NewHTTPDNSDomainDAO() *HTTPDNSDomainDAO { + return dbs.NewDAO(&HTTPDNSDomainDAO{ + DAOObject: dbs.DAOObject{ + DB: Tea.Env, + Table: "edgeHTTPDNSDomains", + Model: new(HTTPDNSDomain), + PkName: "id", + }, + }).(*HTTPDNSDomainDAO) +} + +var SharedHTTPDNSDomainDAO *HTTPDNSDomainDAO + +func init() { + dbs.OnReady(func() { + SharedHTTPDNSDomainDAO = NewHTTPDNSDomainDAO() + }) +} + +func (this *HTTPDNSDomainDAO) CreateDomain(tx *dbs.Tx, appDbId int64, domain string, isOn bool) (int64, error) { + domain = strings.ToLower(strings.TrimSpace(domain)) + var op = NewHTTPDNSDomainOperator() + op.AppId = appDbId + op.Domain = domain + op.IsOn = isOn + op.CreatedAt = time.Now().Unix() + op.UpdatedAt = time.Now().Unix() + op.State = HTTPDNSDomainStateEnabled + err := this.Save(tx, op) + if err != nil { + return 0, err + } + return types.Int64(op.Id), nil +} + +func (this *HTTPDNSDomainDAO) DisableDomain(tx *dbs.Tx, domainId int64) error { + _, err := this.Query(tx). + Pk(domainId). + Set("state", HTTPDNSDomainStateDisabled). + Update() + return err +} + +func (this *HTTPDNSDomainDAO) DisableDomainsWithAppId(tx *dbs.Tx, appDbId int64) error { + _, err := this.Query(tx). + Attr("appId", appDbId). + State(HTTPDNSDomainStateEnabled). + Set("state", HTTPDNSDomainStateDisabled). + Set("updatedAt", time.Now().Unix()). + Update() + return err +} + +func (this *HTTPDNSDomainDAO) UpdateDomainStatus(tx *dbs.Tx, domainId int64, isOn bool) error { + _, err := this.Query(tx). + Pk(domainId). + State(HTTPDNSDomainStateEnabled). + Set("isOn", isOn). + Set("updatedAt", time.Now().Unix()). + Update() + return err +} + +func (this *HTTPDNSDomainDAO) FindEnabledDomain(tx *dbs.Tx, domainId int64) (*HTTPDNSDomain, error) { + one, err := this.Query(tx). + Pk(domainId). + State(HTTPDNSDomainStateEnabled). + Find() + if one == nil { + return nil, err + } + return one.(*HTTPDNSDomain), nil +} + +func (this *HTTPDNSDomainDAO) FindEnabledDomainWithAppAndName(tx *dbs.Tx, appDbId int64, domain string) (*HTTPDNSDomain, error) { + one, err := this.Query(tx). + State(HTTPDNSDomainStateEnabled). + Attr("appId", appDbId). + Attr("domain", strings.ToLower(strings.TrimSpace(domain))). + Find() + if one == nil { + return nil, err + } + return one.(*HTTPDNSDomain), nil +} + +func (this *HTTPDNSDomainDAO) ListEnabledDomainsWithAppId(tx *dbs.Tx, appDbId int64, keyword string) (result []*HTTPDNSDomain, err error) { + query := this.Query(tx). + State(HTTPDNSDomainStateEnabled). + Attr("appId", appDbId). + AscPk() + if len(keyword) > 0 { + query = query.Where("domain LIKE :kw").Param("kw", "%"+keyword+"%") + } + _, err = query.Slice(&result).FindAll() + return +} diff --git a/EdgeAPI/internal/db/models/httpdns_domain_model.go b/EdgeAPI/internal/db/models/httpdns_domain_model.go new file mode 100644 index 0000000..1b96478 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_domain_model.go @@ -0,0 +1,26 @@ +package models + +// HTTPDNSDomain 应用绑定域名 +type HTTPDNSDomain struct { + Id uint32 `field:"id"` // ID + AppId uint32 `field:"appId"` // 应用DB ID + Domain string `field:"domain"` // 业务域名 + IsOn bool `field:"isOn"` // 是否启用 + CreatedAt uint64 `field:"createdAt"` // 创建时间 + UpdatedAt uint64 `field:"updatedAt"` // 修改时间 + State uint8 `field:"state"` // 记录状态 +} + +type HTTPDNSDomainOperator struct { + Id any // ID + AppId any // 应用DB ID + Domain any // 业务域名 + IsOn any // 是否启用 + CreatedAt any // 创建时间 + UpdatedAt any // 修改时间 + State any // 记录状态 +} + +func NewHTTPDNSDomainOperator() *HTTPDNSDomainOperator { + return &HTTPDNSDomainOperator{} +} diff --git a/EdgeAPI/internal/db/models/httpdns_node_dao.go b/EdgeAPI/internal/db/models/httpdns_node_dao.go new file mode 100644 index 0000000..140cc03 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_node_dao.go @@ -0,0 +1,327 @@ +package models + +import ( + "encoding/json" + "github.com/TeaOSLab/EdgeAPI/internal/utils" + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + _ "github.com/go-sql-driver/mysql" + "github.com/iwind/TeaGo/Tea" + "github.com/iwind/TeaGo/dbs" + "github.com/iwind/TeaGo/rands" + "github.com/iwind/TeaGo/types" + "time" +) + +const ( + HTTPDNSNodeStateEnabled = 1 + HTTPDNSNodeStateDisabled = 0 +) + +type HTTPDNSNodeDAO dbs.DAO + +func NewHTTPDNSNodeDAO() *HTTPDNSNodeDAO { + return dbs.NewDAO(&HTTPDNSNodeDAO{ + DAOObject: dbs.DAOObject{ + DB: Tea.Env, + Table: "edgeHTTPDNSNodes", + Model: new(HTTPDNSNode), + PkName: "id", + }, + }).(*HTTPDNSNodeDAO) +} + +var SharedHTTPDNSNodeDAO *HTTPDNSNodeDAO + +func init() { + dbs.OnReady(func() { + SharedHTTPDNSNodeDAO = NewHTTPDNSNodeDAO() + }) +} + +// FindEnabledNodeIdWithUniqueId 鏍规嵁鍞竴ID鑾峰彇鍚敤涓殑HTTPDNS鑺傜偣ID +func (this *HTTPDNSNodeDAO) FindEnabledNodeIdWithUniqueId(tx *dbs.Tx, uniqueId string) (int64, error) { + return this.Query(tx). + Attr("uniqueId", uniqueId). + Attr("state", HTTPDNSNodeStateEnabled). + ResultPk(). + FindInt64Col(0) +} + +// CreateNode 鍒涘缓鑺傜偣 +func (this *HTTPDNSNodeDAO) CreateNode(tx *dbs.Tx, clusterId int64, name string, installDir string, isOn bool) (int64, error) { + uniqueId := rands.HexString(32) + secret := rands.String(32) + err := SharedApiTokenDAO.CreateAPIToken(tx, uniqueId, secret, nodeconfigs.NodeRoleHTTPDNS) + if err != nil { + return 0, err + } + + var op = NewHTTPDNSNodeOperator() + op.ClusterId = clusterId + op.Name = name + op.IsOn = isOn + op.IsUp = false + op.IsInstalled = false + op.IsActive = false + op.UniqueId = uniqueId + op.Secret = secret + op.InstallDir = installDir + op.CreatedAt = time.Now().Unix() + op.UpdatedAt = time.Now().Unix() + op.State = HTTPDNSNodeStateEnabled + err = this.Save(tx, op) + if err != nil { + return 0, err + } + return types.Int64(op.Id), nil +} + +// UpdateNode 鏇存柊鑺傜偣 +func (this *HTTPDNSNodeDAO) UpdateNode(tx *dbs.Tx, nodeId int64, name string, installDir string, isOn bool) error { + var op = NewHTTPDNSNodeOperator() + op.Id = nodeId + op.Name = name + op.InstallDir = installDir + op.IsOn = isOn + op.UpdatedAt = time.Now().Unix() + return this.Save(tx, op) +} + +// DisableNode 绂佺敤鑺傜偣 +func (this *HTTPDNSNodeDAO) DisableNode(tx *dbs.Tx, nodeId int64) error { + node, err := this.FindEnabledNode(tx, nodeId) + if err != nil { + return err + } + if node == nil { + return nil + } + + _, err = this.Query(tx). + Pk(nodeId). + Set("state", HTTPDNSNodeStateDisabled). + Update() + if err != nil { + return err + } + + _, err = SharedApiTokenDAO.Query(tx). + Attr("nodeId", node.UniqueId). + Attr("role", nodeconfigs.NodeRoleHTTPDNS). + Set("state", ApiTokenStateDisabled). + Update() + return err +} + +// FindEnabledNode 鏌ユ壘鍚敤鑺傜偣 +func (this *HTTPDNSNodeDAO) FindEnabledNode(tx *dbs.Tx, nodeId int64) (*HTTPDNSNode, error) { + one, err := this.Query(tx). + Pk(nodeId). + Attr("state", HTTPDNSNodeStateEnabled). + Find() + if one == nil { + return nil, err + } + return one.(*HTTPDNSNode), nil +} + +// FindNodeClusterId 鏌ヨ鑺傜偣鎵€灞為泦缇D +func (this *HTTPDNSNodeDAO) FindNodeClusterId(tx *dbs.Tx, nodeId int64) (int64, error) { + return this.Query(tx). + Pk(nodeId). + Attr("state", HTTPDNSNodeStateEnabled). + Result("clusterId"). + FindInt64Col(0) +} + +// ListEnabledNodes 鍒楀嚭鑺傜偣 +func (this *HTTPDNSNodeDAO) ListEnabledNodes(tx *dbs.Tx, clusterId int64) (result []*HTTPDNSNode, err error) { + query := this.Query(tx). + State(HTTPDNSNodeStateEnabled). + AscPk() + if clusterId > 0 { + query = query.Attr("clusterId", clusterId) + } + _, err = query.Slice(&result).FindAll() + return +} + +// FindAllInactiveNodesWithClusterId 取得一个集群离线的HTTPDNS节点 +func (this *HTTPDNSNodeDAO) FindAllInactiveNodesWithClusterId(tx *dbs.Tx, clusterId int64) (result []*HTTPDNSNode, err error) { + _, err = this.Query(tx). + State(HTTPDNSNodeStateEnabled). + Attr("clusterId", clusterId). + Attr("isOn", true). // 只监控启用的节点 + Attr("isInstalled", true). // 只监控已经安装的节点 + Attr("isActive", false). // 当前处于离线状态 + Result("id", "name"). + Slice(&result). + FindAll() + return +} + +// UpdateNodeStatus 更新节点状态 +func (this *HTTPDNSNodeDAO) UpdateNodeStatus(tx *dbs.Tx, nodeId int64, isUp bool, isInstalled bool, isActive bool, statusJSON []byte, installStatusJSON []byte) error { + var op = NewHTTPDNSNodeOperator() + op.Id = nodeId + op.IsUp = isUp + op.IsInstalled = isInstalled + op.IsActive = isActive + op.UpdatedAt = time.Now().Unix() + if len(statusJSON) > 0 { + op.Status = statusJSON + } + if len(installStatusJSON) > 0 { + mergedStatusJSON, mergeErr := this.mergeInstallStatusJSON(tx, nodeId, installStatusJSON) + if mergeErr != nil { + return mergeErr + } + op.InstallStatus = mergedStatusJSON + } + return this.Save(tx, op) +} + +// UpdateNodeInstallStatus 更新节点安装状态 +func (this *HTTPDNSNodeDAO) UpdateNodeInstallStatus(tx *dbs.Tx, nodeId int64, installStatus *NodeInstallStatus) error { + if installStatus == nil { + return nil + } + + // Read existing installStatus to preserve custom fields like 'ssh' and 'ipAddr' + raw, err := this.Query(tx).Pk(nodeId).Result("installStatus").FindBytesCol() + if err != nil { + return err + } + + var m = map[string]interface{}{} + if len(raw) > 0 { + _ = json.Unmarshal(raw, &m) + } + + // Overlay standard install status fields + statusData, err := json.Marshal(installStatus) + if err != nil { + return err + } + var newStatusMap = map[string]interface{}{} + _ = json.Unmarshal(statusData, &newStatusMap) + + for k, v := range newStatusMap { + m[k] = v + } + + // Re-marshal the merged map + mergedData, err := json.Marshal(m) + if err != nil { + return err + } + + _, err = this.Query(tx). + Pk(nodeId). + Set("installStatus", mergedData). + Set("updatedAt", time.Now().Unix()). + Update() + return err +} + +func (this *HTTPDNSNodeDAO) mergeInstallStatusJSON(tx *dbs.Tx, nodeId int64, patch []byte) ([]byte, error) { + if len(patch) == 0 { + return patch, nil + } + + raw, err := this.Query(tx).Pk(nodeId).Result("installStatus").FindBytesCol() + if err != nil { + return nil, err + } + + merged := map[string]interface{}{} + if len(raw) > 0 { + _ = json.Unmarshal(raw, &merged) + } + patchMap := map[string]interface{}{} + if len(patch) > 0 { + _ = json.Unmarshal(patch, &patchMap) + } + + for k, v := range patchMap { + merged[k] = v + } + + data, err := json.Marshal(merged) + if err != nil { + return nil, err + } + return data, nil +} + +// FindNodeInstallStatus 读取节点安装状态 +func (this *HTTPDNSNodeDAO) FindNodeInstallStatus(tx *dbs.Tx, nodeId int64) (*NodeInstallStatus, error) { + raw, err := this.Query(tx). + Pk(nodeId). + State(HTTPDNSNodeStateEnabled). + Result("installStatus"). + FindBytesCol() + if err != nil { + return nil, err + } + if len(raw) == 0 { + return nil, nil + } + + installStatus := &NodeInstallStatus{} + err = json.Unmarshal(raw, installStatus) + if err != nil { + return nil, err + } + return installStatus, nil +} + +// CountAllLowerVersionNodesWithClusterId 璁＄畻鍗曚釜闆嗙兢涓墍鏈変綆浜庢煇涓増鏈殑鑺傜偣鏁伴噺 +func (this *HTTPDNSNodeDAO) CountAllLowerVersionNodesWithClusterId(tx *dbs.Tx, clusterId int64, os string, arch string, version string) (int64, error) { + return this.Query(tx). + State(HTTPDNSNodeStateEnabled). + Attr("clusterId", clusterId). + Attr("isOn", true). + Attr("isUp", true). + Attr("isActive", true). + Where("status IS NOT NULL"). + Where("JSON_EXTRACT(status, '$.os')=:os"). + Where("JSON_EXTRACT(status, '$.arch')=:arch"). + Where("(JSON_EXTRACT(status, '$.buildVersionCode') IS NULL OR JSON_EXTRACT(status, '$.buildVersionCode')<:version)"). + Param("os", os). + Param("arch", arch). + Param("version", utils.VersionToLong(version)). + Count() +} + +// FindAllLowerVersionNodesWithClusterId 鏌ユ壘鍗曚釜闆嗙兢涓墍鏈変綆浜庢煇涓増鏈殑鑺傜偣 +func (this *HTTPDNSNodeDAO) FindAllLowerVersionNodesWithClusterId(tx *dbs.Tx, clusterId int64, os string, arch string, version string) (result []*HTTPDNSNode, err error) { + _, err = this.Query(tx). + State(HTTPDNSNodeStateEnabled). + Attr("clusterId", clusterId). + Attr("isOn", true). + Attr("isUp", true). + Attr("isActive", true). + Where("status IS NOT NULL"). + Where("JSON_EXTRACT(status, '$.os')=:os"). + Where("JSON_EXTRACT(status, '$.arch')=:arch"). + Where("(JSON_EXTRACT(status, '$.buildVersionCode') IS NULL OR JSON_EXTRACT(status, '$.buildVersionCode')<:version)"). + Param("os", os). + Param("arch", arch). + Param("version", utils.VersionToLong(version)). + DescPk(). + Slice(&result). + FindAll() + return +} + +// UpdateNodeIsInstalled 鏇存柊鑺傜偣瀹夎鐘舵€佷綅 +func (this *HTTPDNSNodeDAO) UpdateNodeIsInstalled(tx *dbs.Tx, nodeId int64, isInstalled bool) error { + _, err := this.Query(tx). + Pk(nodeId). + State(HTTPDNSNodeStateEnabled). + Set("isInstalled", isInstalled). + Set("updatedAt", time.Now().Unix()). + Update() + return err +} diff --git a/EdgeAPI/internal/db/models/httpdns_node_model.go b/EdgeAPI/internal/db/models/httpdns_node_model.go new file mode 100644 index 0000000..80a15de --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_node_model.go @@ -0,0 +1,44 @@ +package models + +import "github.com/iwind/TeaGo/dbs" + +// HTTPDNSNode HTTPDNS节点 +type HTTPDNSNode struct { + Id uint32 `field:"id"` // ID + ClusterId uint32 `field:"clusterId"` // 集群ID + Name string `field:"name"` // 节点名称 + IsOn bool `field:"isOn"` // 是否启用 + IsUp bool `field:"isUp"` // 是否在线 + IsInstalled bool `field:"isInstalled"` // 是否已安装 + IsActive bool `field:"isActive"` // 是否活跃 + UniqueId string `field:"uniqueId"` // 节点唯一ID + Secret string `field:"secret"` // 节点密钥 + InstallDir string `field:"installDir"` // 安装目录 + Status dbs.JSON `field:"status"` // 运行状态快照 + InstallStatus dbs.JSON `field:"installStatus"` // 安装状态 + CreatedAt uint64 `field:"createdAt"` // 创建时间 + UpdatedAt uint64 `field:"updatedAt"` // 修改时间 + State uint8 `field:"state"` // 记录状态 +} + +type HTTPDNSNodeOperator struct { + Id any // ID + ClusterId any // 集群ID + Name any // 节点名称 + IsOn any // 是否启用 + IsUp any // 是否在线 + IsInstalled any // 是否已安装 + IsActive any // 是否活跃 + UniqueId any // 节点唯一ID + Secret any // 节点密钥 + InstallDir any // 安装目录 + Status any // 运行状态快照 + InstallStatus any // 安装状态 + CreatedAt any // 创建时间 + UpdatedAt any // 修改时间 + State any // 记录状态 +} + +func NewHTTPDNSNodeOperator() *HTTPDNSNodeOperator { + return &HTTPDNSNodeOperator{} +} diff --git a/EdgeAPI/internal/db/models/httpdns_runtime_log_dao.go b/EdgeAPI/internal/db/models/httpdns_runtime_log_dao.go new file mode 100644 index 0000000..4d53581 --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_runtime_log_dao.go @@ -0,0 +1,108 @@ +package models + +import ( + "strconv" + "time" + + _ "github.com/go-sql-driver/mysql" + "github.com/iwind/TeaGo/Tea" + "github.com/iwind/TeaGo/dbs" +) + +type HTTPDNSRuntimeLogDAO dbs.DAO + +func NewHTTPDNSRuntimeLogDAO() *HTTPDNSRuntimeLogDAO { + return dbs.NewDAO(&HTTPDNSRuntimeLogDAO{ + DAOObject: dbs.DAOObject{ + DB: Tea.Env, + Table: "edgeHTTPDNSRuntimeLogs", + Model: new(HTTPDNSRuntimeLog), + PkName: "id", + }, + }).(*HTTPDNSRuntimeLogDAO) +} + +var SharedHTTPDNSRuntimeLogDAO *HTTPDNSRuntimeLogDAO + +func init() { + dbs.OnReady(func() { + SharedHTTPDNSRuntimeLogDAO = NewHTTPDNSRuntimeLogDAO() + }) +} + +func (this *HTTPDNSRuntimeLogDAO) CreateLog(tx *dbs.Tx, log *HTTPDNSRuntimeLog) error { + lastLog, err := this.Query(tx). + Result("id", "clusterId", "nodeId", "level", "type", "module", "description", "createdAt"). + DescPk(). + Find() + if err != nil { + return err + } + if lastLog != nil { + nodeLog := lastLog.(*HTTPDNSRuntimeLog) + if nodeLog.ClusterId == log.ClusterId && + nodeLog.NodeId == log.NodeId && + nodeLog.Level == log.Level && + nodeLog.Type == log.Type && + nodeLog.Module == log.Module && + nodeLog.Description == log.Description && + time.Now().Unix()-int64(nodeLog.CreatedAt) < 1800 { + + count := log.Count + if count <= 0 { + count = 1 + } + + return this.Query(tx). + Pk(nodeLog.Id). + Set("count", dbs.SQL("count+"+strconv.FormatInt(count, 10))). + UpdateQuickly() + } + } + + var op = NewHTTPDNSRuntimeLogOperator() + op.ClusterId = log.ClusterId + op.NodeId = log.NodeId + op.Level = log.Level + op.Type = log.Type + op.Module = log.Module + op.Description = log.Description + op.Count = log.Count + op.RequestId = log.RequestId + op.CreatedAt = log.CreatedAt + op.Day = log.Day + return this.Save(tx, op) +} + +func (this *HTTPDNSRuntimeLogDAO) BuildListQuery(tx *dbs.Tx, day string, clusterId int64, nodeId int64, level string, keyword string) *dbs.Query { + query := this.Query(tx).DescPk() + if len(day) > 0 { + query = query.Attr("day", day) + } + if clusterId > 0 { + query = query.Attr("clusterId", clusterId) + } + if nodeId > 0 { + query = query.Attr("nodeId", nodeId) + } + if len(level) > 0 { + query = query.Attr("level", level) + } + if len(keyword) > 0 { + query = query.Where("(type LIKE :kw OR module LIKE :kw OR description LIKE :kw OR requestId LIKE :kw)").Param("kw", "%"+keyword+"%") + } + return query +} + +func (this *HTTPDNSRuntimeLogDAO) CountLogs(tx *dbs.Tx, day string, clusterId int64, nodeId int64, level string, keyword string) (int64, error) { + return this.BuildListQuery(tx, day, clusterId, nodeId, level, keyword).Count() +} + +func (this *HTTPDNSRuntimeLogDAO) ListLogs(tx *dbs.Tx, day string, clusterId int64, nodeId int64, level string, keyword string, offset int64, size int64) (result []*HTTPDNSRuntimeLog, err error) { + _, err = this.BuildListQuery(tx, day, clusterId, nodeId, level, keyword). + Offset(offset). + Limit(size). + Slice(&result). + FindAll() + return +} diff --git a/EdgeAPI/internal/db/models/httpdns_runtime_log_model.go b/EdgeAPI/internal/db/models/httpdns_runtime_log_model.go new file mode 100644 index 0000000..fe26dda --- /dev/null +++ b/EdgeAPI/internal/db/models/httpdns_runtime_log_model.go @@ -0,0 +1,34 @@ +package models + +// HTTPDNSRuntimeLog 运行日志 +type HTTPDNSRuntimeLog struct { + Id uint64 `field:"id"` // ID + ClusterId uint32 `field:"clusterId"` // 集群ID + NodeId uint32 `field:"nodeId"` // 节点ID + Level string `field:"level"` // 级别 + Type string `field:"type"` // 类型 + Module string `field:"module"` // 模块 + Description string `field:"description"` // 详情 + Count int64 `field:"count"` // 次数 + RequestId string `field:"requestId"` // 请求ID + CreatedAt uint64 `field:"createdAt"` // 创建时间 + Day string `field:"day"` // YYYYMMDD +} + +type HTTPDNSRuntimeLogOperator struct { + Id any // ID + ClusterId any // 集群ID + NodeId any // 节点ID + Level any // 级别 + Type any // 类型 + Module any // 模块 + Description any // 详情 + Count any // 次数 + RequestId any // 请求ID + CreatedAt any // 创建时间 + Day any // YYYYMMDD +} + +func NewHTTPDNSRuntimeLogOperator() *HTTPDNSRuntimeLogOperator { + return &HTTPDNSRuntimeLogOperator{} +} diff --git a/EdgeAPI/internal/db/models/node_dao.go b/EdgeAPI/internal/db/models/node_dao.go index e032c6b..8f58027 100644 --- a/EdgeAPI/internal/db/models/node_dao.go +++ b/EdgeAPI/internal/db/models/node_dao.go @@ -1521,6 +1521,8 @@ func (this *NodeDAO) CountAllLowerVersionNodesWithClusterId(tx *dbs.Tx, clusterI return this.Query(tx). State(NodeStateEnabled). Attr("isOn", true). + Attr("isUp", true). + Attr("isActive", true). Attr("clusterId", clusterId). Where("status IS NOT NULL"). Where("JSON_EXTRACT(status, '$.os')=:os"). @@ -1536,6 +1538,9 @@ func (this *NodeDAO) CountAllLowerVersionNodesWithClusterId(tx *dbs.Tx, clusterI func (this *NodeDAO) FindAllLowerVersionNodesWithClusterId(tx *dbs.Tx, clusterId int64, os string, arch string, version string) (result []*Node, err error) { _, err = this.Query(tx). State(NodeStateEnabled). + Attr("isOn", true). + Attr("isUp", true). + Attr("isActive", true). Attr("clusterId", clusterId). Where("status IS NOT NULL"). Where("JSON_EXTRACT(status, '$.os')=:os"). diff --git a/EdgeAPI/internal/db/models/node_task_dao.go b/EdgeAPI/internal/db/models/node_task_dao.go index df317dd..1a3d90a 100644 --- a/EdgeAPI/internal/db/models/node_task_dao.go +++ b/EdgeAPI/internal/db/models/node_task_dao.go @@ -15,35 +15,41 @@ import ( type NodeTaskType = string const ( - // CDN相关 + // CDN鐩稿叧 - NodeTaskTypeConfigChanged NodeTaskType = "configChanged" // 节点整体配置变化 - NodeTaskTypeDDosProtectionChanged NodeTaskType = "ddosProtectionChanged" // 节点DDoS配置变更 - NodeTaskTypeGlobalServerConfigChanged NodeTaskType = "globalServerConfigChanged" // 全局服务设置变化 - NodeTaskTypeIPListDeleted NodeTaskType = "ipListDeleted" // IPList被删除 - NodeTaskTypeIPItemChanged NodeTaskType = "ipItemChanged" // IP条目变更 - NodeTaskTypeNodeVersionChanged NodeTaskType = "nodeVersionChanged" // 节点版本变化 - NodeTaskTypeScriptsChanged NodeTaskType = "scriptsChanged" // 脚本配置变化 - NodeTaskTypeNodeLevelChanged NodeTaskType = "nodeLevelChanged" // 节点级别变化 - NodeTaskTypeUserServersStateChanged NodeTaskType = "userServersStateChanged" // 用户服务状态变化 - NodeTaskTypeUAMPolicyChanged NodeTaskType = "uamPolicyChanged" // UAM策略变化 - NodeTaskTypeHTTPPagesPolicyChanged NodeTaskType = "httpPagesPolicyChanged" // 自定义页面变化 - NodeTaskTypeHTTPCCPolicyChanged NodeTaskType = "httpCCPolicyChanged" // CC策略变化 - NodeTaskTypeHTTP3PolicyChanged NodeTaskType = "http3PolicyChanged" // HTTP3策略变化 - NodeTaskTypeNetworkSecurityPolicyChanged NodeTaskType = "networkSecurityPolicyChanged" // 网络安全策略变化 - NodeTaskTypeWebPPolicyChanged NodeTaskType = "webPPolicyChanged" // WebP策略变化 - NodeTaskTypeUpdatingServers NodeTaskType = "updatingServers" // 更新一组服务 - NodeTaskTypeTOAChanged NodeTaskType = "toaChanged" // TOA配置变化 - NodeTaskTypePlanChanged NodeTaskType = "planChanged" // 套餐变化 + NodeTaskTypeConfigChanged NodeTaskType = "configChanged" // 鑺傜偣鏁翠綋閰嶇疆鍙樺寲 + NodeTaskTypeDDosProtectionChanged NodeTaskType = "ddosProtectionChanged" // 鑺傜偣DDoS閰嶇疆鍙樻洿 + NodeTaskTypeGlobalServerConfigChanged NodeTaskType = "globalServerConfigChanged" // 鍏ㄥ眬鏈嶅姟璁剧疆鍙樺寲 + NodeTaskTypeIPListDeleted NodeTaskType = "ipListDeleted" // IPList琚垹闄? + NodeTaskTypeIPItemChanged NodeTaskType = "ipItemChanged" // IP鏉＄洰鍙樻洿 + NodeTaskTypeNodeVersionChanged NodeTaskType = "nodeVersionChanged" // 鑺傜偣鐗堟湰鍙樺寲 + NodeTaskTypeScriptsChanged NodeTaskType = "scriptsChanged" // 鑴氭湰閰嶇疆鍙樺寲 + NodeTaskTypeNodeLevelChanged NodeTaskType = "nodeLevelChanged" // 鑺傜偣绾у埆鍙樺寲 + NodeTaskTypeUserServersStateChanged NodeTaskType = "userServersStateChanged" // 鐢ㄦ埛鏈嶅姟鐘舵€佸彉鍖? + NodeTaskTypeUAMPolicyChanged NodeTaskType = "uamPolicyChanged" // UAM绛栫暐鍙樺寲 + NodeTaskTypeHTTPPagesPolicyChanged NodeTaskType = "httpPagesPolicyChanged" // 鑷畾涔夐〉闈㈠彉鍖? + NodeTaskTypeHTTPCCPolicyChanged NodeTaskType = "httpCCPolicyChanged" // CC绛栫暐鍙樺寲 + NodeTaskTypeHTTP3PolicyChanged NodeTaskType = "http3PolicyChanged" // HTTP3绛栫暐鍙樺寲 + NodeTaskTypeNetworkSecurityPolicyChanged NodeTaskType = "networkSecurityPolicyChanged" // 缃戠粶瀹夊叏绛栫暐鍙樺寲 + NodeTaskTypeWebPPolicyChanged NodeTaskType = "webPPolicyChanged" // WebP绛栫暐鍙樺寲 + NodeTaskTypeUpdatingServers NodeTaskType = "updatingServers" // 鏇存柊涓€缁勬湇鍔? + NodeTaskTypeTOAChanged NodeTaskType = "toaChanged" // TOA閰嶇疆鍙樺寲 + NodeTaskTypePlanChanged NodeTaskType = "planChanged" // 濂楅鍙樺寲 - // NS相关 + // NS鐩稿叧 NSNodeTaskTypeConfigChanged NodeTaskType = "nsConfigChanged" NSNodeTaskTypeDomainChanged NodeTaskType = "nsDomainChanged" NSNodeTaskTypeRecordChanged NodeTaskType = "nsRecordChanged" NSNodeTaskTypeRouteChanged NodeTaskType = "nsRouteChanged" NSNodeTaskTypeKeyChanged NodeTaskType = "nsKeyChanged" - NSNodeTaskTypeDDosProtectionChanged NodeTaskType = "nsDDoSProtectionChanged" // 节点DDoS配置变更 + NSNodeTaskTypeDDosProtectionChanged NodeTaskType = "nsDDoSProtectionChanged" // 鑺傜偣DDoS閰嶇疆鍙樻洿 + // HTTPDNS相关 + HTTPDNSNodeTaskTypeConfigChanged NodeTaskType = "httpdnsConfigChanged" + HTTPDNSNodeTaskTypeAppChanged NodeTaskType = "httpdnsAppChanged" + HTTPDNSNodeTaskTypeDomainChanged NodeTaskType = "httpdnsDomainChanged" + HTTPDNSNodeTaskTypeRuleChanged NodeTaskType = "httpdnsRuleChanged" + HTTPDNSNodeTaskTypeTLSChanged NodeTaskType = "httpdnsTLSChanged" ) type NodeTaskDAO dbs.DAO @@ -67,15 +73,15 @@ func init() { }) } -// CreateNodeTask 创建单个节点任务 +// CreateNodeTask 鍒涘缓鍗曚釜鑺傜偣浠诲姟 func (this *NodeTaskDAO) CreateNodeTask(tx *dbs.Tx, role string, clusterId int64, nodeId int64, userId int64, serverId int64, taskType NodeTaskType) error { if clusterId <= 0 || nodeId <= 0 { return nil } var uniqueId = role + "@" + types.String(nodeId) + "@node@" + types.String(serverId) + "@" + taskType - // 用户信息 - // 没有直接加入到 uniqueId 中，是为了兼容以前的字段值 + // 鐢ㄦ埛淇℃伅 + // 娌℃湁鐩存帴鍔犲叆鍒?uniqueId 涓紝鏄负浜嗗吋瀹逛互鍓嶇殑瀛楁鍊? if userId > 0 { uniqueId += "@" + types.String(userId) } @@ -113,7 +119,7 @@ func (this *NodeTaskDAO) CreateNodeTask(tx *dbs.Tx, role string, clusterId int64 return err } -// CreateClusterTask 创建集群任务 +// CreateClusterTask 鍒涘缓闆嗙兢浠诲姟 func (this *NodeTaskDAO) CreateClusterTask(tx *dbs.Tx, role string, clusterId int64, userId int64, serverId int64, taskType NodeTaskType) error { if clusterId <= 0 { return nil @@ -121,8 +127,8 @@ func (this *NodeTaskDAO) CreateClusterTask(tx *dbs.Tx, role string, clusterId in var uniqueId = role + "@" + types.String(clusterId) + "@" + types.String(serverId) + "@cluster@" + taskType - // 用户信息 - // 没有直接加入到 uniqueId 中，是为了兼容以前的字段值 + // 鐢ㄦ埛淇℃伅 + // 娌℃湁鐩存帴鍔犲叆鍒?uniqueId 涓紝鏄负浜嗗吋瀹逛互鍓嶇殑瀛楁鍊? if userId > 0 { uniqueId += "@" + types.String(userId) } @@ -155,7 +161,7 @@ func (this *NodeTaskDAO) CreateClusterTask(tx *dbs.Tx, role string, clusterId in return err } -// ExtractNodeClusterTask 分解边缘节点集群任务 +// ExtractNodeClusterTask 鍒嗚В杈圭紭鑺傜偣闆嗙兢浠诲姟 func (this *NodeTaskDAO) ExtractNodeClusterTask(tx *dbs.Tx, clusterId int64, userId int64, serverId int64, taskType NodeTaskType) error { nodeIds, err := SharedNodeDAO.FindAllNodeIdsMatch(tx, clusterId, true, configutils.BoolStateYes) if err != nil { @@ -193,7 +199,7 @@ func (this *NodeTaskDAO) ExtractNodeClusterTask(tx *dbs.Tx, clusterId int64, use return nil } -// ExtractAllClusterTasks 分解所有集群任务 +// ExtractAllClusterTasks 鍒嗚В鎵€鏈夐泦缇や换鍔? func (this *NodeTaskDAO) ExtractAllClusterTasks(tx *dbs.Tx, role string) error { ones, err := this.Query(tx). Attr("role", role). @@ -216,12 +222,17 @@ func (this *NodeTaskDAO) ExtractAllClusterTasks(tx *dbs.Tx, role string) error { if err != nil { return err } + case nodeconfigs.NodeRoleHTTPDNS: + err = this.ExtractHTTPDNSClusterTask(tx, clusterId, one.(*NodeTask).Type) + if err != nil { + return err + } } } return nil } -// DeleteAllClusterTasks 删除集群所有相关任务 +// DeleteAllClusterTasks 鍒犻櫎闆嗙兢鎵€鏈夌浉鍏充换鍔? func (this *NodeTaskDAO) DeleteAllClusterTasks(tx *dbs.Tx, role string, clusterId int64) error { _, err := this.Query(tx). Attr("role", role). @@ -230,7 +241,7 @@ func (this *NodeTaskDAO) DeleteAllClusterTasks(tx *dbs.Tx, role string, clusterI return err } -// DeleteNodeTasks 删除节点相关任务 +// DeleteNodeTasks 鍒犻櫎鑺傜偣鐩稿叧浠诲姟 func (this *NodeTaskDAO) DeleteNodeTasks(tx *dbs.Tx, role string, nodeId int64) error { _, err := this.Query(tx). Attr("role", role). @@ -239,13 +250,13 @@ func (this *NodeTaskDAO) DeleteNodeTasks(tx *dbs.Tx, role string, nodeId int64) return err } -// DeleteAllNodeTasks 删除所有节点相关任务 +// DeleteAllNodeTasks 鍒犻櫎鎵€鏈夎妭鐐圭浉鍏充换鍔? func (this *NodeTaskDAO) DeleteAllNodeTasks(tx *dbs.Tx) error { return this.Query(tx). DeleteQuickly() } -// FindDoingNodeTasks 查询一个节点的所有任务 +// FindDoingNodeTasks 鏌ヨ涓€涓妭鐐圭殑鎵€鏈変换鍔? func (this *NodeTaskDAO) FindDoingNodeTasks(tx *dbs.Tx, role string, nodeId int64, version int64) (result []*NodeTask, err error) { if nodeId <= 0 { return @@ -256,10 +267,10 @@ func (this *NodeTaskDAO) FindDoingNodeTasks(tx *dbs.Tx, role string, nodeId int6 UseIndex("nodeId"). Asc("version") if version > 0 { - query.Lt("LENGTH(version)", 19) // 兼容以往版本 + query.Lt("LENGTH(version)", 19) // 鍏煎浠ュ線鐗堟湰 query.Gt("version", version) } else { - // 第一次访问时只取当前正在执行的或者执行失败的 + // 绗竴娆¤闂椂鍙彇褰撳墠姝ｅ湪鎵ц鐨勬垨鑰呮墽琛屽け璐ョ殑 query.Where("(isDone=0 OR (isDone=1 AND isOk=0))") } _, err = query. @@ -268,10 +279,10 @@ func (this *NodeTaskDAO) FindDoingNodeTasks(tx *dbs.Tx, role string, nodeId int6 return } -// UpdateNodeTaskDone 修改节点任务的完成状态 +// UpdateNodeTaskDone 淇敼鑺傜偣浠诲姟鐨勫畬鎴愮姸鎬? func (this *NodeTaskDAO) UpdateNodeTaskDone(tx *dbs.Tx, taskId int64, isOk bool, errorMessage string) error { if isOk { - // 特殊任务删除 + // 鐗规畩浠诲姟鍒犻櫎 taskType, err := this.Query(tx). Pk(taskId). Result("type"). @@ -286,7 +297,7 @@ func (this *NodeTaskDAO) UpdateNodeTaskDone(tx *dbs.Tx, taskId int64, isOk bool, } } - // 其他任务标记为完成 + // 鍏朵粬浠诲姟鏍囪涓哄畬鎴? var query = this.Query(tx). Pk(taskId) if !isOk { @@ -305,7 +316,7 @@ func (this *NodeTaskDAO) UpdateNodeTaskDone(tx *dbs.Tx, taskId int64, isOk bool, return err } -// FindAllDoingTaskClusterIds 查找正在更新的集群IDs +// FindAllDoingTaskClusterIds 鏌ユ壘姝ｅ湪鏇存柊鐨勯泦缇Ds func (this *NodeTaskDAO) FindAllDoingTaskClusterIds(tx *dbs.Tx, role string) ([]int64, error) { ones, _, err := this.Query(tx). Result("DISTINCT(clusterId) AS clusterId"). @@ -322,7 +333,7 @@ func (this *NodeTaskDAO) FindAllDoingTaskClusterIds(tx *dbs.Tx, role string) ([] return result, nil } -// FindAllDoingNodeTasksWithClusterId 查询某个集群下所有的任务 +// FindAllDoingNodeTasksWithClusterId 鏌ヨ鏌愪釜闆嗙兢涓嬫墍鏈夌殑浠诲姟 func (this *NodeTaskDAO) FindAllDoingNodeTasksWithClusterId(tx *dbs.Tx, role string, clusterId int64) (result []*NodeTask, err error) { _, err = this.Query(tx). Attr("role", role). @@ -337,7 +348,7 @@ func (this *NodeTaskDAO) FindAllDoingNodeTasksWithClusterId(tx *dbs.Tx, role str return } -// FindAllDoingNodeIds 查询有任务的节点IDs +// FindAllDoingNodeIds 鏌ヨ鏈変换鍔＄殑鑺傜偣IDs func (this *NodeTaskDAO) FindAllDoingNodeIds(tx *dbs.Tx, role string) ([]int64, error) { ones, err := this.Query(tx). Result("DISTINCT(nodeId) AS nodeId"). @@ -356,7 +367,7 @@ func (this *NodeTaskDAO) FindAllDoingNodeIds(tx *dbs.Tx, role string) ([]int64, return result, nil } -// ExistsDoingNodeTasks 检查是否有正在执行的任务 +// ExistsDoingNodeTasks 妫€鏌ユ槸鍚︽湁姝ｅ湪鎵ц鐨勪换鍔? func (this *NodeTaskDAO) ExistsDoingNodeTasks(tx *dbs.Tx, role string, excludeTypes []NodeTaskType) (bool, error) { var query = this.Query(tx). Attr("role", role). @@ -370,7 +381,7 @@ func (this *NodeTaskDAO) ExistsDoingNodeTasks(tx *dbs.Tx, role string, excludeTy return query.Exist() } -// ExistsErrorNodeTasks 是否有错误的任务 +// ExistsErrorNodeTasks 鏄惁鏈夐敊璇殑浠诲姟 func (this *NodeTaskDAO) ExistsErrorNodeTasks(tx *dbs.Tx, role string, excludeTypes []NodeTaskType) (bool, error) { var query = this.Query(tx). Attr("role", role). @@ -383,7 +394,7 @@ func (this *NodeTaskDAO) ExistsErrorNodeTasks(tx *dbs.Tx, role string, excludeTy return query.Exist() } -// DeleteNodeTask 删除任务 +// DeleteNodeTask 鍒犻櫎浠诲姟 func (this *NodeTaskDAO) DeleteNodeTask(tx *dbs.Tx, taskId int64) error { _, err := this.Query(tx). Pk(taskId). @@ -391,7 +402,7 @@ func (this *NodeTaskDAO) DeleteNodeTask(tx *dbs.Tx, taskId int64) error { return err } -// CountDoingNodeTasks 计算正在执行的任务 +// CountDoingNodeTasks 璁＄畻姝ｅ湪鎵ц鐨勪换鍔? func (this *NodeTaskDAO) CountDoingNodeTasks(tx *dbs.Tx, role string) (int64, error) { return this.Query(tx). Attr("isDone", 0). @@ -400,7 +411,7 @@ func (this *NodeTaskDAO) CountDoingNodeTasks(tx *dbs.Tx, role string) (int64, er Count() } -// FindNotifyingNodeTasks 查找需要通知的任务 +// FindNotifyingNodeTasks 鏌ユ壘闇€瑕侀€氱煡鐨勪换鍔? func (this *NodeTaskDAO) FindNotifyingNodeTasks(tx *dbs.Tx, role string, size int64) (result []*NodeTask, err error) { _, err = this.Query(tx). Attr("role", role). @@ -413,7 +424,7 @@ func (this *NodeTaskDAO) FindNotifyingNodeTasks(tx *dbs.Tx, role string, size in return } -// UpdateTasksNotified 设置任务已通知 +// UpdateTasksNotified 璁剧疆浠诲姟宸查€氱煡 func (this *NodeTaskDAO) UpdateTasksNotified(tx *dbs.Tx, taskIds []int64) error { if len(taskIds) == 0 { return nil @@ -430,7 +441,7 @@ func (this *NodeTaskDAO) UpdateTasksNotified(tx *dbs.Tx, taskIds []int64) error return nil } -// 生成一个版本号 +// 鐢熸垚涓€涓増鏈彿 func (this *NodeTaskDAO) increaseVersion(tx *dbs.Tx) (version int64, err error) { return SharedSysLockerDAO.Increase(tx, "NODE_TASK_VERSION", 0) } diff --git a/EdgeAPI/internal/db/models/node_task_dao_httpdns.go b/EdgeAPI/internal/db/models/node_task_dao_httpdns.go new file mode 100644 index 0000000..b07a685 --- /dev/null +++ b/EdgeAPI/internal/db/models/node_task_dao_httpdns.go @@ -0,0 +1,47 @@ +package models + +import ( + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + "github.com/iwind/TeaGo/dbs" +) + +// ExtractHTTPDNSClusterTask 分解HTTPDNS节点集群任务 +func (this *NodeTaskDAO) ExtractHTTPDNSClusterTask(tx *dbs.Tx, clusterId int64, taskType NodeTaskType) error { + nodes, err := SharedHTTPDNSNodeDAO.ListEnabledNodes(tx, clusterId) + if err != nil { + return err + } + + _, err = this.Query(tx). + Attr("role", nodeconfigs.NodeRoleHTTPDNS). + Attr("clusterId", clusterId). + Gt("nodeId", 0). + Attr("type", taskType). + Delete() + if err != nil { + return err + } + + for _, node := range nodes { + if !node.IsOn { + continue + } + + err = this.CreateNodeTask(tx, nodeconfigs.NodeRoleHTTPDNS, clusterId, int64(node.Id), 0, 0, taskType) + if err != nil { + return err + } + } + + _, err = this.Query(tx). + Attr("role", nodeconfigs.NodeRoleHTTPDNS). + Attr("clusterId", clusterId). + Attr("nodeId", 0). + Attr("type", taskType). + Delete() + if err != nil { + return err + } + + return nil +} diff --git a/EdgeAPI/internal/db/models/ns_node_dao.go b/EdgeAPI/internal/db/models/ns_node_dao.go index 278b8ad..bea3054 100644 --- a/EdgeAPI/internal/db/models/ns_node_dao.go +++ b/EdgeAPI/internal/db/models/ns_node_dao.go @@ -94,6 +94,8 @@ func (this *NSNodeDAO) CountAllLowerVersionNodesWithClusterId(tx *dbs.Tx, cluste State(NSNodeStateEnabled). Attr("clusterId", clusterId). Attr("isOn", true). + Attr("isUp", true). + Attr("isActive", true). Where("status IS NOT NULL"). Where("JSON_EXTRACT(status, '$.os')=:os"). Where("JSON_EXTRACT(status, '$.arch')=:arch"). @@ -104,6 +106,27 @@ func (this *NSNodeDAO) CountAllLowerVersionNodesWithClusterId(tx *dbs.Tx, cluste Count() } +// FindAllLowerVersionNodesWithClusterId 查找单个集群中所有低于某个版本的节点 +func (this *NSNodeDAO) FindAllLowerVersionNodesWithClusterId(tx *dbs.Tx, clusterId int64, os string, arch string, version string) (result []*NSNode, err error) { + _, err = this.Query(tx). + State(NSNodeStateEnabled). + Attr("clusterId", clusterId). + Attr("isOn", true). + Attr("isUp", true). + Attr("isActive", true). + Where("status IS NOT NULL"). + Where("JSON_EXTRACT(status, '$.os')=:os"). + Where("JSON_EXTRACT(status, '$.arch')=:arch"). + Where("(JSON_EXTRACT(status, '$.buildVersionCode') IS NULL OR JSON_EXTRACT(status, '$.buildVersionCode')<:version)"). + Param("os", os). + Param("arch", arch). + Param("version", utils.VersionToLong(version)). + DescPk(). + Slice(&result). + FindAll() + return +} + // FindEnabledNodeIdWithUniqueId 根据唯一ID获取节点ID func (this *NSNodeDAO) FindEnabledNodeIdWithUniqueId(tx *dbs.Tx, uniqueId string) (int64, error) { return this.Query(tx). diff --git a/EdgeAPI/internal/db/models/ns_node_dao_plus.go b/EdgeAPI/internal/db/models/ns_node_dao_plus.go index d74fd32..4a34786 100644 --- a/EdgeAPI/internal/db/models/ns_node_dao_plus.go +++ b/EdgeAPI/internal/db/models/ns_node_dao_plus.go @@ -209,6 +209,8 @@ func (this *NSNodeDAO) CountAllLowerVersionNodesWithClusterId(tx *dbs.Tx, cluste return this.Query(tx). State(NSNodeStateEnabled). Attr("isOn", true). + Attr("isUp", true). + Attr("isActive", true). Attr("clusterId", clusterId). Where("status IS NOT NULL"). Where("JSON_EXTRACT(status, '$.os')=:os"). @@ -412,6 +414,27 @@ func (this *NSNodeDAO) CountAllLowerVersionNodes(tx *dbs.Tx, version string) (in Count() } +// FindAllLowerVersionNodesWithClusterId 查找单个集群中所有低于某个版本的节点 +func (this *NSNodeDAO) FindAllLowerVersionNodesWithClusterId(tx *dbs.Tx, clusterId int64, os string, arch string, version string) (result []*NSNode, err error) { + _, err = this.Query(tx). + State(NSNodeStateEnabled). + Attr("clusterId", clusterId). + Attr("isOn", true). + Attr("isUp", true). + Attr("isActive", true). + Where("status IS NOT NULL"). + Where("JSON_EXTRACT(status, '$.os')=:os"). + Where("JSON_EXTRACT(status, '$.arch')=:arch"). + Where("(JSON_EXTRACT(status, '$.buildVersionCode') IS NULL OR JSON_EXTRACT(status, '$.buildVersionCode')<:version)"). + Param("os", os). + Param("arch", arch). + Param("version", utils.VersionToLong(version)). + DescPk(). + Slice(&result). + FindAll() + return +} + // ComposeNodeConfig 组合节点配置 func (this *NSNodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64) (*dnsconfigs.NSNodeConfig, error) { if nodeId <= 0 { diff --git a/EdgeAPI/internal/db/models/user_dao.go b/EdgeAPI/internal/db/models/user_dao.go index f4a4a66..0a495b7 100644 --- a/EdgeAPI/internal/db/models/user_dao.go +++ b/EdgeAPI/internal/db/models/user_dao.go @@ -246,7 +246,7 @@ func (this *UserDAO) CreateUser(tx *dbs.Tx, username string, } // UpdateUser 修改用户 -func (this *UserDAO) UpdateUser(tx *dbs.Tx, userId int64, username string, password string, fullname string, mobile string, tel string, email string, remark string, isOn bool, nodeClusterId int64, bandwidthAlgo systemconfigs.BandwidthAlgo) error { +func (this *UserDAO) UpdateUser(tx *dbs.Tx, userId int64, username string, password string, fullname string, mobile string, tel string, email string, remark string, isOn bool, nodeClusterId int64, bandwidthAlgo systemconfigs.BandwidthAlgo, httpdnsClusterIdsJSON []byte) error { if userId <= 0 { return errors.New("invalid userId") } @@ -265,6 +265,11 @@ func (this *UserDAO) UpdateUser(tx *dbs.Tx, userId int64, username string, passw op.ClusterId = nodeClusterId op.BandwidthAlgo = bandwidthAlgo op.IsOn = isOn + if len(httpdnsClusterIdsJSON) > 0 { + op.HttpdnsClusterIds = string(httpdnsClusterIdsJSON) + } else { + op.HttpdnsClusterIds = "[]" + } err := this.Save(tx, op) if err != nil { return err @@ -466,6 +471,21 @@ func (this *UserDAO) FindUserClusterId(tx *dbs.Tx, userId int64) (int64, error) FindInt64Col(0) } +// UpdateUserHttpdnsClusterIds 更新用户的HTTPDNS关联集群ID列表 +func (this *UserDAO) UpdateUserHttpdnsClusterIds(tx *dbs.Tx, userId int64, httpdnsClusterIdsJSON []byte) error { + if userId <= 0 { + return errors.New("invalid userId") + } + if len(httpdnsClusterIdsJSON) == 0 { + httpdnsClusterIdsJSON = []byte("[]") + } + _, err := this.Query(tx). + Pk(userId). + Set("httpdnsClusterIds", httpdnsClusterIdsJSON). + Update() + return err +} + // UpdateUserFeatures 更新单个用户Features func (this *UserDAO) UpdateUserFeatures(tx *dbs.Tx, userId int64, featuresJSON []byte) error { if userId <= 0 { diff --git a/EdgeAPI/internal/db/models/user_model.go b/EdgeAPI/internal/db/models/user_model.go index d259100..ed85eb6 100644 --- a/EdgeAPI/internal/db/models/user_model.go +++ b/EdgeAPI/internal/db/models/user_model.go @@ -37,6 +37,7 @@ const ( UserField_BandwidthAlgo dbs.FieldName = "bandwidthAlgo" // 带宽算法 UserField_BandwidthModifier dbs.FieldName = "bandwidthModifier" // 带宽修正值 UserField_Lang dbs.FieldName = "lang" // 语言代号 + UserField_HttpdnsClusterIds dbs.FieldName = "httpdnsClusterIds" // HTTPDNS关联集群ID列表 ) // User 用户 @@ -75,6 +76,7 @@ type User struct { BandwidthAlgo string `field:"bandwidthAlgo"` // 带宽算法 BandwidthModifier float64 `field:"bandwidthModifier"` // 带宽修正值 Lang string `field:"lang"` // 语言代号 + HttpdnsClusterIds dbs.JSON `field:"httpdnsClusterIds"` // HTTPDNS关联集群ID列表 } type UserOperator struct { @@ -112,6 +114,7 @@ type UserOperator struct { BandwidthAlgo any // 带宽算法 BandwidthModifier any // 带宽修正值 Lang any // 语言代号 + HttpdnsClusterIds any // HTTPDNS关联集群ID列表 } func NewUserOperator() *UserOperator { diff --git a/EdgeAPI/internal/installers/deploy_manager.go b/EdgeAPI/internal/installers/deploy_manager.go index 90a5cce..3ea01f2 100644 --- a/EdgeAPI/internal/installers/deploy_manager.go +++ b/EdgeAPI/internal/installers/deploy_manager.go @@ -15,8 +15,9 @@ var SharedDeployManager = NewDeployManager() type DeployManager struct { dir string - nodeFiles []*DeployFile - nsNodeFiles []*DeployFile + nodeFiles []*DeployFile + nsNodeFiles []*DeployFile + httpdnsNodeFiles []*DeployFile locker sync.Mutex } @@ -28,6 +29,7 @@ func NewDeployManager() *DeployManager { } manager.LoadNodeFiles() manager.LoadNSNodeFiles() + manager.LoadHTTPDNSNodeFiles() return manager } @@ -141,6 +143,61 @@ func (this *DeployManager) FindNSNodeFile(os string, arch string) *DeployFile { return nil } +// LoadHTTPDNSNodeFiles 加载所有HTTPDNS节点安装文件 +func (this *DeployManager) LoadHTTPDNSNodeFiles() []*DeployFile { + this.locker.Lock() + defer this.locker.Unlock() + + if len(this.httpdnsNodeFiles) > 0 { + return this.httpdnsNodeFiles + } + + var keyMap = map[string]*DeployFile{} // key => File + + var reg = regexp.MustCompile(`^edge-httpdns-(\w+)-(\w+)-v([0-9.]+)\.zip$`) + for _, file := range files.NewFile(this.dir).List() { + var name = file.Name() + if !reg.MatchString(name) { + continue + } + var matches = reg.FindStringSubmatch(name) + var osName = matches[1] + var arch = matches[2] + var version = matches[3] + + var key = osName + "_" + arch + oldFile, ok := keyMap[key] + if ok && stringutil.VersionCompare(oldFile.Version, version) > 0 { + continue + } + keyMap[key] = &DeployFile{ + OS: osName, + Arch: arch, + Version: version, + Path: file.Path(), + } + } + + var result = []*DeployFile{} + for _, v := range keyMap { + result = append(result, v) + } + + this.httpdnsNodeFiles = result + + return result +} + +// FindHTTPDNSNodeFile 查找特定平台的HTTPDNS节点安装文件 +func (this *DeployManager) FindHTTPDNSNodeFile(os string, arch string) *DeployFile { + for _, file := range this.LoadHTTPDNSNodeFiles() { + if file.OS == os && file.Arch == arch { + return file + } + } + return nil +} + // Reload 重置缓存 func (this *DeployManager) Reload() { this.locker.Lock() @@ -148,4 +205,5 @@ func (this *DeployManager) Reload() { this.nodeFiles = nil this.nsNodeFiles = nil + this.httpdnsNodeFiles = nil } diff --git a/EdgeAPI/internal/installers/fluent_bit.go b/EdgeAPI/internal/installers/fluent_bit.go index 2272230..9357b1d 100644 --- a/EdgeAPI/internal/installers/fluent_bit.go +++ b/EdgeAPI/internal/installers/fluent_bit.go @@ -33,11 +33,13 @@ const ( fluentBitServiceName = "fluent-bit" fluentBitDefaultBinPath = "/opt/fluent-bit/bin/fluent-bit" fluentBitLocalPackagesRoot = "packages" - fluentBitHTTPPathPattern = "/var/log/edge/edge-node/*.log" - fluentBitDNSPathPattern = "/var/log/edge/edge-dns/*.log" - fluentBitManagedMarker = "managed-by-edgeapi" - fluentBitRoleNode = "node" - fluentBitRoleDNS = "dns" + fluentBitHTTPPathPattern = "/var/log/edge/edge-node/*.log" + fluentBitDNSPathPattern = "/var/log/edge/edge-dns/*.log" + fluentBitHTTPDNSPathPattern = "/var/log/edge/edge-httpdns/*.log" + fluentBitManagedMarker = "managed-by-edgeapi" + fluentBitRoleNode = "node" + fluentBitRoleDNS = "dns" + fluentBitRoleHTTPDNS = "httpdns" ) var errFluentBitLocalPackageNotFound = errors.New("fluent-bit local package not found") @@ -57,10 +59,11 @@ type fluentBitManagedMeta struct { } type fluentBitDesiredConfig struct { - Roles []string - ClickHouse *systemconfigs.ClickHouseSetting - HTTPPathPattern string - DNSPathPattern string + Roles []string + ClickHouse *systemconfigs.ClickHouseSetting + HTTPPathPattern string + DNSPathPattern string + HTTPDNSPathPattern string } // SetupFluentBit 安装并托管 Fluent Bit 配置（离线包 + 平台渲染配置）。 @@ -343,6 +346,8 @@ func mapNodeRole(role nodeconfigs.NodeRole) (string, error) { return fluentBitRoleNode, nil case nodeconfigs.NodeRoleDNS: return fluentBitRoleDNS, nil + case nodeconfigs.NodeRoleHTTPDNS: + return fluentBitRoleHTTPDNS, nil default: return "", fmt.Errorf("unsupported fluent-bit role '%s'", role) } @@ -352,7 +357,7 @@ func normalizeRoles(rawRoles []string) []string { roleSet := map[string]struct{}{} for _, role := range rawRoles { role = strings.ToLower(strings.TrimSpace(role)) - if role != fluentBitRoleNode && role != fluentBitRoleDNS { + if role != fluentBitRoleNode && role != fluentBitRoleDNS && role != fluentBitRoleHTTPDNS { continue } roleSet[role] = struct{}{} @@ -418,6 +423,7 @@ func (this *BaseInstaller) buildDesiredFluentBitConfig(roles []string) (*fluentB httpPathPattern := fluentBitHTTPPathPattern dnsPathPattern := fluentBitDNSPathPattern + httpdnsPathPattern := fluentBitHTTPDNSPathPattern publicPolicyPath, err := this.readPublicAccessLogPolicyPath() if err != nil { return nil, err @@ -427,13 +433,15 @@ func (this *BaseInstaller) buildDesiredFluentBitConfig(roles []string) (*fluentB pattern := strings.TrimRight(policyDir, "/") + "/*.log" httpPathPattern = pattern dnsPathPattern = pattern + httpdnsPathPattern = pattern } return &fluentBitDesiredConfig{ - Roles: normalizeRoles(roles), - ClickHouse: ch, - HTTPPathPattern: httpPathPattern, - DNSPathPattern: dnsPathPattern, + Roles: normalizeRoles(roles), + ClickHouse: ch, + HTTPPathPattern: httpPathPattern, + DNSPathPattern: dnsPathPattern, + HTTPDNSPathPattern: httpdnsPathPattern, }, nil } @@ -554,6 +562,7 @@ func renderManagedConfig(desired *fluentBitDesiredConfig) (string, error) { insertHTTP := url.QueryEscape(fmt.Sprintf("INSERT INTO %s.logs_ingest FORMAT JSONEachRow", desired.ClickHouse.Database)) insertDNS := url.QueryEscape(fmt.Sprintf("INSERT INTO %s.dns_logs_ingest FORMAT JSONEachRow", desired.ClickHouse.Database)) + insertHTTPDNS := url.QueryEscape(fmt.Sprintf("INSERT INTO %s.httpdns_access_logs_ingest FORMAT JSONEachRow", desired.ClickHouse.Database)) lines := []string{ "# " + fluentBitManagedMarker, @@ -602,6 +611,23 @@ func renderManagedConfig(desired *fluentBitDesiredConfig) (string, error) { ) } + if hasRole(desired.Roles, fluentBitRoleHTTPDNS) { + lines = append(lines, + "[INPUT]", + " Name tail", + " Path "+desired.HTTPDNSPathPattern, + " Tag app.httpdns.logs", + " Parser json", + " Refresh_Interval 2", + " Read_from_Head false", + " DB /var/lib/fluent-bit/httpdns-logs.db", + " storage.type filesystem", + " Mem_Buf_Limit 256MB", + " Skip_Long_Lines On", + "", + ) + } + if hasRole(desired.Roles, fluentBitRoleNode) { lines = append(lines, "[OUTPUT]", @@ -664,6 +690,37 @@ func renderManagedConfig(desired *fluentBitDesiredConfig) (string, error) { lines = append(lines, "") } + if hasRole(desired.Roles, fluentBitRoleHTTPDNS) { + lines = append(lines, + "[OUTPUT]", + " Name http", + " Match app.httpdns.logs", + " Host "+desired.ClickHouse.Host, + " Port "+strconv.Itoa(desired.ClickHouse.Port), + " URI /?query="+insertHTTPDNS, + " Format json_lines", + " http_user ${CH_USER}", + " http_passwd ${CH_PASSWORD}", + " json_date_key timestamp", + " json_date_format epoch", + " workers 2", + " net.keepalive On", + " Retry_Limit False", + ) + if useTLS { + lines = append(lines, " tls On") + if desired.ClickHouse.TLSSkipVerify { + lines = append(lines, " tls.verify Off") + } else { + lines = append(lines, " tls.verify On") + } + if strings.TrimSpace(desired.ClickHouse.TLSServerName) != "" { + lines = append(lines, " tls.vhost "+strings.TrimSpace(desired.ClickHouse.TLSServerName)) + } + } + lines = append(lines, "") + } + return strings.Join(lines, "\n"), nil } diff --git a/EdgeAPI/internal/installers/installer_httpdns_node.go b/EdgeAPI/internal/installers/installer_httpdns_node.go new file mode 100644 index 0000000..f93b600 --- /dev/null +++ b/EdgeAPI/internal/installers/installer_httpdns_node.go @@ -0,0 +1,236 @@ +package installers + +import ( + "bytes" + "errors" + "fmt" + "os" + "path/filepath" + "regexp" + "strings" + + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" +) + +type HTTPDNSNodeInstaller struct { + BaseInstaller +} + +func (i *HTTPDNSNodeInstaller) Install(dir string, params interface{}, installStatus *models.NodeInstallStatus) error { + if params == nil { + return errors.New("'params' required for node installation") + } + nodeParams, ok := params.(*NodeParams) + if !ok { + return errors.New("'params' should be *NodeParams") + } + err := nodeParams.Validate() + if err != nil { + return fmt.Errorf("params validation: %w", err) + } + + installRootDir, appDir := resolveHTTPDNSInstallPaths(dir) + + _, err = i.client.Stat(installRootDir) + if err != nil { + err = i.client.MkdirAll(installRootDir) + if err != nil { + installStatus.ErrorCode = "CREATE_ROOT_DIRECTORY_FAILED" + return fmt.Errorf("create directory '%s' failed: %w", installRootDir, err) + } + } + + env, err := i.InstallHelper(installRootDir, nodeconfigs.NodeRoleHTTPDNS) + if err != nil { + installStatus.ErrorCode = "INSTALL_HELPER_FAILED" + return err + } + + filePrefix := "edge-httpdns-" + env.OS + "-" + env.Arch + zipFile, err := i.LookupLatestInstallerForTarget(filePrefix, env) + if err != nil { + return err + } + if len(zipFile) == 0 { + return errors.New("can not find installer file for " + env.OS + "/" + env.Arch + ", expected '" + filePrefix + "-v*.zip' or distro-specific '" + filePrefix + "-{ubuntu22.04|amzn2023}-v*.zip'") + } + + targetZip, err := i.copyZipToRemote(installRootDir, zipFile) + if err != nil { + return err + } + + if !nodeParams.IsUpgrading { + _, stderr, testErr := i.client.Exec(env.HelperPath + " -cmd=test") + if testErr != nil { + return fmt.Errorf("test failed: %w", testErr) + } + if len(stderr) > 0 { + return errors.New("test failed: " + stderr) + } + } + + exePath := appDir + "/bin/edge-httpdns" + if nodeParams.IsUpgrading { + _, err = i.client.Stat(exePath) + if err == nil { + _, _, _ = i.client.Exec(exePath + " stop") + removeErr := i.client.Remove(exePath) + if removeErr != nil && removeErr != os.ErrNotExist { + return fmt.Errorf("remove old file failed: %w", removeErr) + } + } + } + + _, stderr, err := i.client.Exec(env.HelperPath + " -cmd=unzip -zip=\"" + targetZip + "\" -target=\"" + installRootDir + "\"") + if err != nil { + return err + } + if len(stderr) > 0 { + return errors.New("unzip installer failed: " + stderr) + } + + certFile := appDir + "/configs/tls/server.crt" + keyFile := appDir + "/configs/tls/server.key" + err = i.writeTLSCertificate(certFile, keyFile, nodeParams.TLSCertData, nodeParams.TLSKeyData) + if err != nil { + installStatus.ErrorCode = "WRITE_TLS_CERT_FAILED" + return err + } + + configFile := appDir + "/configs/api_httpdns.yaml" + if i.client.sudo { + _, _, _ = i.client.Exec("chown " + i.client.User() + " " + filepath.Dir(configFile)) + } + + listenAddr := strings.TrimSpace(nodeParams.HTTPDNSListenAddr) + if len(listenAddr) == 0 { + listenAddr = ":443" + } + + configData := []byte(`rpc.endpoints: [ ${endpoints} ] +nodeId: "${nodeId}" +secret: "${nodeSecret}" + +https.listenAddr: "${listenAddr}" +https.cert: "${certFile}" +https.key: "${keyFile}"`) + certFileClean := strings.ReplaceAll(certFile, "\\", "/") + keyFileClean := strings.ReplaceAll(keyFile, "\\", "/") + + configData = bytes.ReplaceAll(configData, []byte("${endpoints}"), []byte(nodeParams.QuoteEndpoints())) + configData = bytes.ReplaceAll(configData, []byte("${nodeId}"), []byte(nodeParams.NodeId)) + configData = bytes.ReplaceAll(configData, []byte("${nodeSecret}"), []byte(nodeParams.Secret)) + configData = bytes.ReplaceAll(configData, []byte("${listenAddr}"), []byte(listenAddr)) + configData = bytes.ReplaceAll(configData, []byte("${certFile}"), []byte(certFileClean)) + configData = bytes.ReplaceAll(configData, []byte("${keyFile}"), []byte(keyFileClean)) + + _, err = i.client.WriteFile(configFile, configData) + if err != nil { + return fmt.Errorf("write '%s': %w", configFile, err) + } + + err = i.SetupFluentBit(nodeconfigs.NodeRoleHTTPDNS) + if err != nil { + installStatus.ErrorCode = "SETUP_FLUENT_BIT_FAILED" + return fmt.Errorf("setup fluent-bit failed: %w", err) + } + + startCmdPrefix := "cd " + shQuote(appDir+"/configs") + " && ../bin/edge-httpdns " + + stdout, stderr, err := i.client.Exec(startCmdPrefix + "test") + if err != nil { + installStatus.ErrorCode = "TEST_FAILED" + return fmt.Errorf("test edge-httpdns failed: %w, stdout: %s, stderr: %s", err, stdout, stderr) + } + if len(stderr) > 0 { + if regexp.MustCompile(`(?i)rpc`).MatchString(stderr) || regexp.MustCompile(`(?i)rpc`).MatchString(stdout) { + installStatus.ErrorCode = "RPC_TEST_FAILED" + } + return errors.New("test edge-httpdns failed, stdout: " + stdout + ", stderr: " + stderr) + } + + stdout, stderr, err = i.client.Exec(startCmdPrefix + "start") + if err != nil { + return fmt.Errorf("start edge-httpdns failed: %w, stdout: %s, stderr: %s", err, stdout, stderr) + } + if len(stderr) > 0 { + return errors.New("start edge-httpdns failed, stdout: " + stdout + ", stderr: " + stderr) + } + + return nil +} + +func resolveHTTPDNSInstallPaths(rawDir string) (installRootDir string, appDir string) { + dir := strings.TrimSpace(rawDir) + dir = strings.TrimRight(dir, "/") + if len(dir) == 0 { + return rawDir, rawDir + "/edge-httpdns" + } + + if strings.HasSuffix(dir, "/edge-httpdns") { + root := strings.TrimSuffix(dir, "/edge-httpdns") + if len(root) == 0 { + root = "/" + } + return root, dir + } + + return dir, dir + "/edge-httpdns" +} + +func (i *HTTPDNSNodeInstaller) copyZipToRemote(dir string, zipFile string) (string, error) { + targetZip := "" + var firstCopyErr error + zipName := filepath.Base(zipFile) + for _, candidate := range []string{ + dir + "/" + zipName, + i.client.UserHome() + "/" + zipName, + "/tmp/" + zipName, + } { + err := i.client.Copy(zipFile, candidate, 0777) + if err != nil { + if firstCopyErr == nil { + firstCopyErr = err + } + continue + } + targetZip = candidate + firstCopyErr = nil + break + } + if firstCopyErr != nil { + return "", fmt.Errorf("upload httpdns file failed: %w", firstCopyErr) + } + return targetZip, nil +} + +func (i *HTTPDNSNodeInstaller) writeTLSCertificate(certFile string, keyFile string, certData []byte, keyData []byte) error { + if len(certData) == 0 || len(keyData) == 0 { + return errors.New("cluster tls certificate is empty") + } + certDir := filepath.Dir(certFile) + _, stderr, err := i.client.Exec("mkdir -p " + shQuote(certDir)) + if err != nil { + return fmt.Errorf("create tls directory failed: %w, stderr: %s", err, stderr) + } + if i.client.sudo { + _, _, _ = i.client.Exec("chown " + i.client.User() + " " + shQuote(certDir)) + } + + _, err = i.client.WriteFile(certFile, certData) + if err != nil { + return fmt.Errorf("write cert file failed: %w", err) + } + _, err = i.client.WriteFile(keyFile, keyData) + if err != nil { + return fmt.Errorf("write key file failed: %w", err) + } + + _, stderr, err = i.client.Exec("chmod 0644 " + shQuote(certFile) + " && chmod 0600 " + shQuote(keyFile)) + if err != nil { + return fmt.Errorf("chmod tls files failed: %w, stderr: %s", err, stderr) + } + return nil +} diff --git a/EdgeAPI/internal/installers/params_node.go b/EdgeAPI/internal/installers/params_node.go index b825150..ad12fc4 100644 --- a/EdgeAPI/internal/installers/params_node.go +++ b/EdgeAPI/internal/installers/params_node.go @@ -6,10 +6,13 @@ import ( ) type NodeParams struct { - Endpoints []string - NodeId string - Secret string - IsUpgrading bool // 是否为升级 + Endpoints []string + NodeId string + Secret string + TLSCertData []byte + TLSKeyData []byte + HTTPDNSListenAddr string + IsUpgrading bool // 是否为升级 } func (this *NodeParams) Validate() error { diff --git a/EdgeAPI/internal/installers/queue_httpdns_node.go b/EdgeAPI/internal/installers/queue_httpdns_node.go new file mode 100644 index 0000000..ba64cae --- /dev/null +++ b/EdgeAPI/internal/installers/queue_httpdns_node.go @@ -0,0 +1,416 @@ +package installers + +import ( + "encoding/json" + "errors" + "fmt" + "net" + "strconv" + "strings" + "time" + + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeAPI/internal/goman" + "github.com/TeaOSLab/EdgeAPI/internal/utils" + "github.com/TeaOSLab/EdgeAPI/internal/utils/numberutils" + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" + "github.com/iwind/TeaGo/logs" +) + +var sharedHTTPDNSNodeQueue = NewHTTPDNSNodeQueue() + +type HTTPDNSNodeQueue struct{} + +func NewHTTPDNSNodeQueue() *HTTPDNSNodeQueue { + return &HTTPDNSNodeQueue{} +} + +func SharedHTTPDNSNodeQueue() *HTTPDNSNodeQueue { + return sharedHTTPDNSNodeQueue +} + +// InstallNodeProcess 鍦ㄧ嚎瀹夎 HTTPDNS 鑺傜偣娴佺▼鎺у埗 +func (q *HTTPDNSNodeQueue) InstallNodeProcess(nodeId int64, isUpgrading bool) error { + installStatus := models.NewNodeInstallStatus() + installStatus.IsRunning = true + installStatus.IsFinished = false + installStatus.IsOk = false + installStatus.Error = "" + installStatus.ErrorCode = "" + installStatus.UpdatedAt = time.Now().Unix() + + err := models.SharedHTTPDNSNodeDAO.UpdateNodeInstallStatus(nil, nodeId, installStatus) + if err != nil { + return err + } + + ticker := utils.NewTicker(3 * time.Second) + goman.New(func() { + for ticker.Wait() { + installStatus.UpdatedAt = time.Now().Unix() + updateErr := models.SharedHTTPDNSNodeDAO.UpdateNodeInstallStatus(nil, nodeId, installStatus) + if updateErr != nil { + logs.Println("[HTTPDNS_INSTALL]" + updateErr.Error()) + } + } + }) + defer ticker.Stop() + + err = q.InstallNode(nodeId, installStatus, isUpgrading) + + installStatus.IsRunning = false + installStatus.IsFinished = true + if err != nil { + installStatus.IsOk = false + installStatus.Error = err.Error() + } else { + installStatus.IsOk = true + } + installStatus.UpdatedAt = time.Now().Unix() + + updateErr := models.SharedHTTPDNSNodeDAO.UpdateNodeInstallStatus(nil, nodeId, installStatus) + if updateErr != nil { + return updateErr + } + + if installStatus.IsOk { + return models.SharedHTTPDNSNodeDAO.UpdateNodeIsInstalled(nil, nodeId, true) + } + return nil +} + +// InstallNode 鍦ㄧ嚎瀹夎 HTTPDNS 鑺傜偣 +func (q *HTTPDNSNodeQueue) InstallNode(nodeId int64, installStatus *models.NodeInstallStatus, isUpgrading bool) error { + node, err := models.SharedHTTPDNSNodeDAO.FindEnabledNode(nil, nodeId) + if err != nil { + return err + } + if node == nil { + return errors.New("can not find node, ID '" + numberutils.FormatInt64(nodeId) + "'") + } + cluster, err := models.SharedHTTPDNSClusterDAO.FindEnabledCluster(nil, int64(node.ClusterId)) + if err != nil { + return err + } + if cluster == nil { + return errors.New("can not find cluster") + } + + sshHost, sshPort, grantId, err := q.parseSSHInfo(node, installStatus) + if err != nil { + return err + } + + grant, err := models.SharedNodeGrantDAO.FindEnabledNodeGrant(nil, grantId) + if err != nil { + return err + } + if grant == nil { + installStatus.ErrorCode = "EMPTY_GRANT" + return errors.New("can not find user grant with id '" + numberutils.FormatInt64(grantId) + "'") + } + + apiNodes, err := models.SharedAPINodeDAO.FindAllEnabledAndOnAPINodes(nil) + if err != nil { + return err + } + if len(apiNodes) == 0 { + return errors.New("no available api nodes") + } + + apiEndpoints := make([]string, 0, 8) + for _, apiNode := range apiNodes { + addrConfigs, decodeErr := apiNode.DecodeAccessAddrs() + if decodeErr != nil { + return fmt.Errorf("decode api node access addresses failed: %w", decodeErr) + } + for _, addrConfig := range addrConfigs { + apiEndpoints = append(apiEndpoints, addrConfig.FullAddresses()...) + } + } + if len(apiEndpoints) == 0 { + return errors.New("no available api endpoints") + } + + tlsCertData, tlsKeyData, err := q.resolveClusterTLSCertPair(cluster) + if err != nil { + installStatus.ErrorCode = "EMPTY_TLS_CERT" + return err + } + httpdnsListenAddr, err := q.resolveClusterTLSListenAddr(cluster) + if err != nil { + installStatus.ErrorCode = "INVALID_TLS_LISTEN" + return err + } + + params := &NodeParams{ + Endpoints: apiEndpoints, + NodeId: node.UniqueId, + Secret: node.Secret, + TLSCertData: tlsCertData, + TLSKeyData: tlsKeyData, + HTTPDNSListenAddr: httpdnsListenAddr, + IsUpgrading: isUpgrading, + } + + installer := &HTTPDNSNodeInstaller{} + err = installer.Login(&Credentials{ + Host: sshHost, + Port: sshPort, + Username: grant.Username, + Password: grant.Password, + PrivateKey: grant.PrivateKey, + Passphrase: grant.Passphrase, + Method: grant.Method, + Sudo: grant.Su == 1, + }) + if err != nil { + installStatus.ErrorCode = "SSH_LOGIN_FAILED" + return err + } + defer func() { + _ = installer.Close() + }() + + installDir := node.InstallDir + if len(installDir) == 0 { + if cluster != nil && len(cluster.InstallDir) > 0 { + installDir = cluster.InstallDir + } + if len(installDir) == 0 { + installDir = installer.client.UserHome() + "/edge-httpdns" + } + } + + return installer.Install(installDir, params, installStatus) +} + +// StartNode 启动HTTPDNS节点 +func (q *HTTPDNSNodeQueue) StartNode(nodeId int64) error { + node, err := models.SharedHTTPDNSNodeDAO.FindEnabledNode(nil, nodeId) + if err != nil { + return err + } + if node == nil { + return errors.New("can not find node, ID '" + numberutils.FormatInt64(nodeId) + "'") + } + + // 登录信息 + login, err := models.SharedNodeLoginDAO.FindEnabledNodeLoginWithNodeId(nil, nodeconfigs.NodeRoleHTTPDNS, nodeId) + if err != nil { + return err + } + if login == nil { + return newGrantError("can not find node login information") + } + loginParams, err := login.DecodeSSHParams() + if err != nil { + return newGrantError(err.Error()) + } + if len(strings.TrimSpace(loginParams.Host)) == 0 { + return newGrantError("ssh host should not be empty") + } + if loginParams.Port <= 0 { + loginParams.Port = 22 + } + if loginParams.GrantId <= 0 { + return newGrantError("can not find node grant") + } + + grant, err := models.SharedNodeGrantDAO.FindEnabledNodeGrant(nil, loginParams.GrantId) + if err != nil { + return err + } + if grant == nil { + return newGrantError("can not find user grant with id '" + numberutils.FormatInt64(loginParams.GrantId) + "'") + } + + installer := &HTTPDNSNodeInstaller{} + err = installer.Login(&Credentials{ + Host: strings.TrimSpace(loginParams.Host), + Port: loginParams.Port, + Username: grant.Username, + Password: grant.Password, + PrivateKey: grant.PrivateKey, + Passphrase: grant.Passphrase, + Method: grant.Method, + Sudo: grant.Su == 1, + }) + if err != nil { + return err + } + defer func() { + _ = installer.Close() + }() + + installDir := strings.TrimSpace(node.InstallDir) + if len(installDir) == 0 { + cluster, err := models.SharedHTTPDNSClusterDAO.FindEnabledCluster(nil, int64(node.ClusterId)) + if err != nil { + return err + } + if cluster == nil { + return errors.New("can not find cluster, ID '" + numberutils.FormatInt64(int64(node.ClusterId)) + "'") + } + installDir = strings.TrimSpace(cluster.InstallDir) + if len(installDir) == 0 { + installDir = installer.client.UserHome() + "/edge-httpdns" + } + } + _, appDir := resolveHTTPDNSInstallPaths(installDir) + exeFile := appDir + "/bin/edge-httpdns" + + _, err = installer.client.Stat(exeFile) + if err != nil { + return errors.New("httpdns node is not installed correctly, can not find executable file: " + exeFile) + } + + // 先尝试 systemd 拉起 + _, _, _ = installer.client.Exec("/usr/bin/systemctl start edge-httpdns") + + _, stderr, err := installer.client.Exec(exeFile + " start") + if err != nil { + return fmt.Errorf("start failed: %w", err) + } + if len(strings.TrimSpace(stderr)) > 0 { + return errors.New("start failed: " + strings.TrimSpace(stderr)) + } + + return nil +} + +func (q *HTTPDNSNodeQueue) resolveClusterTLSCertPair(cluster *models.HTTPDNSCluster) ([]byte, []byte, error) { + if cluster == nil { + return nil, nil, errors.New("cluster not found") + } + if len(cluster.TLSPolicy) == 0 { + return nil, nil, errors.New("cluster tls policy is empty") + } + + tlsConfig := map[string]json.RawMessage{} + if err := json.Unmarshal(cluster.TLSPolicy, &tlsConfig); err != nil { + return nil, nil, fmt.Errorf("decode cluster tls policy failed: %w", err) + } + + sslPolicyData := tlsConfig["sslPolicy"] + if len(sslPolicyData) == 0 { + // Compatible with old data where TLSPolicy stores SSLPolicy directly. + sslPolicyData = json.RawMessage(cluster.TLSPolicy) + } + sslPolicy := &sslconfigs.SSLPolicy{} + if err := json.Unmarshal(sslPolicyData, sslPolicy); err != nil { + return nil, nil, fmt.Errorf("decode ssl policy failed: %w", err) + } + + for _, cert := range sslPolicy.Certs { + if cert == nil { + continue + } + if len(cert.CertData) > 0 && len(cert.KeyData) > 0 { + return cert.CertData, cert.KeyData, nil + } + } + + for _, certRef := range sslPolicy.CertRefs { + if certRef == nil || certRef.CertId <= 0 { + continue + } + certConfig, err := models.SharedSSLCertDAO.ComposeCertConfig(nil, certRef.CertId, false, nil, nil) + if err != nil { + return nil, nil, fmt.Errorf("load ssl cert %d failed: %w", certRef.CertId, err) + } + if certConfig == nil { + continue + } + if len(certConfig.CertData) > 0 && len(certConfig.KeyData) > 0 { + return certConfig.CertData, certConfig.KeyData, nil + } + } + + if sslPolicy.Id > 0 { + policyConfig, err := models.SharedSSLPolicyDAO.ComposePolicyConfig(nil, sslPolicy.Id, false, nil, nil) + if err != nil { + return nil, nil, fmt.Errorf("load ssl policy %d failed: %w", sslPolicy.Id, err) + } + if policyConfig != nil { + for _, cert := range policyConfig.Certs { + if cert == nil { + continue + } + if len(cert.CertData) > 0 && len(cert.KeyData) > 0 { + return cert.CertData, cert.KeyData, nil + } + } + } + } + + return nil, nil, errors.New("cluster tls certificate is not configured") +} + +func (q *HTTPDNSNodeQueue) resolveClusterTLSListenAddr(cluster *models.HTTPDNSCluster) (string, error) { + const defaultListenAddr = ":443" + + if cluster == nil || len(cluster.TLSPolicy) == 0 { + return defaultListenAddr, nil + } + + tlsConfig, err := serverconfigs.NewTLSProtocolConfigFromJSON(cluster.TLSPolicy) + if err != nil { + return "", fmt.Errorf("decode cluster tls listen failed: %w", err) + } + + for _, listen := range tlsConfig.Listen { + if listen == nil { + continue + } + + if err := listen.Init(); err != nil { + return "", fmt.Errorf("invalid cluster tls listen address '%s': %w", listen.PortRange, err) + } + if listen.MinPort <= 0 { + continue + } + + host := strings.TrimSpace(listen.Host) + return net.JoinHostPort(host, strconv.Itoa(listen.MinPort)), nil + } + + return defaultListenAddr, nil +} + +func (q *HTTPDNSNodeQueue) parseSSHInfo(node *models.HTTPDNSNode, installStatus *models.NodeInstallStatus) (string, int, int64, error) { + if node == nil { + return "", 0, 0, errors.New("node should not be nil") + } + + login, err := models.SharedNodeLoginDAO.FindEnabledNodeLoginWithNodeId(nil, nodeconfigs.NodeRoleHTTPDNS, int64(node.Id)) + if err != nil { + return "", 0, 0, err + } + if login == nil { + installStatus.ErrorCode = "EMPTY_SSH" + return "", 0, 0, errors.New("ssh login not found for node '" + numberutils.FormatInt64(int64(node.Id)) + "'") + } + + sshParams, err := login.DecodeSSHParams() + if err != nil { + installStatus.ErrorCode = "EMPTY_SSH" + return "", 0, 0, err + } + + if len(sshParams.Host) == 0 { + installStatus.ErrorCode = "EMPTY_SSH_HOST" + return "", 0, 0, errors.New("ssh host should not be empty") + } + if sshParams.Port <= 0 { + sshParams.Port = 22 + } + if sshParams.GrantId <= 0 { + installStatus.ErrorCode = "EMPTY_GRANT" + return "", 0, 0, errors.New("grant id should not be empty") + } + + return sshParams.Host, sshParams.Port, sshParams.GrantId, nil +} diff --git a/EdgeAPI/internal/installers/upgrade_queue.go b/EdgeAPI/internal/installers/upgrade_queue.go new file mode 100644 index 0000000..ca08654 --- /dev/null +++ b/EdgeAPI/internal/installers/upgrade_queue.go @@ -0,0 +1,25 @@ +package installers + +// UpgradeQueue 升级队列，控制并发数 +type UpgradeQueue struct { + sem chan struct{} +} + +// SharedUpgradeQueue 全局升级队列，最多5个并发 +var SharedUpgradeQueue = NewUpgradeQueue(5) + +// NewUpgradeQueue 创建升级队列 +func NewUpgradeQueue(maxConcurrent int) *UpgradeQueue { + return &UpgradeQueue{ + sem: make(chan struct{}, maxConcurrent), + } +} + +// SubmitNodeUpgrade 提交节点升级任务（异步执行，超过并发限制自动排队） +func (q *UpgradeQueue) SubmitNodeUpgrade(nodeId int64, upgradeFunc func(int64) error) { + go func() { + q.sem <- struct{}{} + defer func() { <-q.sem }() + _ = upgradeFunc(nodeId) + }() +} diff --git a/EdgeAPI/internal/nodes/api_node.go b/EdgeAPI/internal/nodes/api_node.go index c9ea2fc..e6b05e3 100644 --- a/EdgeAPI/internal/nodes/api_node.go +++ b/EdgeAPI/internal/nodes/api_node.go @@ -144,6 +144,17 @@ func (this *APINode) Start() { this.processTableNames() dbs.NotifyReady() + // 自动确保 ClickHouse 日志表存在（不阻断主流程） + this.setProgress("CLICKHOUSE", "正在检查 ClickHouse 日志表") + logs.Println("[API_NODE]ensuring clickhouse tables ...") + err = setup.EnsureClickHouseTables() + if err != nil { + logs.Println("[API_NODE]WARNING: ensure clickhouse tables failed: " + err.Error()) + remotelogs.Error("API_NODE", "ensure clickhouse tables failed: "+err.Error()) + } else { + logs.Println("[API_NODE]ensure clickhouse tables done") + } + // 设置时区 this.setProgress("TIMEZONE", "正在设置时区") this.setupTimeZone() diff --git a/EdgeAPI/internal/nodes/api_node_services.go b/EdgeAPI/internal/nodes/api_node_services.go index be28ac3..b7df91a 100644 --- a/EdgeAPI/internal/nodes/api_node_services.go +++ b/EdgeAPI/internal/nodes/api_node_services.go @@ -5,6 +5,7 @@ package nodes import ( "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" "github.com/TeaOSLab/EdgeAPI/internal/rpc/services/clients" + httpdnsservices "github.com/TeaOSLab/EdgeAPI/internal/rpc/services/httpdns" "github.com/TeaOSLab/EdgeAPI/internal/rpc/services/users" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "google.golang.org/grpc" @@ -425,6 +426,46 @@ func (this *APINode) registerServices(server *grpc.Server) { pb.RegisterDNSTaskServiceServer(server, instance) this.rest(instance) } + { + var instance = this.serviceInstance(&httpdnsservices.HTTPDNSClusterService{}).(*httpdnsservices.HTTPDNSClusterService) + pb.RegisterHTTPDNSClusterServiceServer(server, instance) + this.rest(instance) + } + { + var instance = this.serviceInstance(&httpdnsservices.HTTPDNSNodeService{}).(*httpdnsservices.HTTPDNSNodeService) + pb.RegisterHTTPDNSNodeServiceServer(server, instance) + this.rest(instance) + } + { + var instance = this.serviceInstance(&httpdnsservices.HTTPDNSAppService{}).(*httpdnsservices.HTTPDNSAppService) + pb.RegisterHTTPDNSAppServiceServer(server, instance) + this.rest(instance) + } + { + var instance = this.serviceInstance(&httpdnsservices.HTTPDNSDomainService{}).(*httpdnsservices.HTTPDNSDomainService) + pb.RegisterHTTPDNSDomainServiceServer(server, instance) + this.rest(instance) + } + { + var instance = this.serviceInstance(&httpdnsservices.HTTPDNSRuleService{}).(*httpdnsservices.HTTPDNSRuleService) + pb.RegisterHTTPDNSRuleServiceServer(server, instance) + this.rest(instance) + } + { + var instance = this.serviceInstance(&httpdnsservices.HTTPDNSAccessLogService{}).(*httpdnsservices.HTTPDNSAccessLogService) + pb.RegisterHTTPDNSAccessLogServiceServer(server, instance) + this.rest(instance) + } + { + var instance = this.serviceInstance(&httpdnsservices.HTTPDNSRuntimeLogService{}).(*httpdnsservices.HTTPDNSRuntimeLogService) + pb.RegisterHTTPDNSRuntimeLogServiceServer(server, instance) + this.rest(instance) + } + { + var instance = this.serviceInstance(&httpdnsservices.HTTPDNSSandboxService{}).(*httpdnsservices.HTTPDNSSandboxService) + pb.RegisterHTTPDNSSandboxServiceServer(server, instance) + this.rest(instance) + } { var instance = this.serviceInstance(&services.NodeClusterFirewallActionService{}).(*services.NodeClusterFirewallActionService) pb.RegisterNodeClusterFirewallActionServiceServer(server, instance) diff --git a/EdgeAPI/internal/rpc/services/httpdns/converters.go b/EdgeAPI/internal/rpc/services/httpdns/converters.go new file mode 100644 index 0000000..d8c70c9 --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/converters.go @@ -0,0 +1,220 @@ +package httpdns + +import ( + "encoding/json" + "log" + + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" + "github.com/iwind/TeaGo/dbs" +) + +func toPBCluster(cluster *models.HTTPDNSCluster) *pb.HTTPDNSCluster { + if cluster == nil { + return nil + } + return &pb.HTTPDNSCluster{ + Id: int64(cluster.Id), + IsOn: cluster.IsOn, + IsDefault: cluster.IsDefault, + Name: cluster.Name, + ServiceDomain: cluster.ServiceDomain, + DefaultTTL: cluster.DefaultTTL, + FallbackTimeoutMs: cluster.FallbackTimeoutMs, + InstallDir: cluster.InstallDir, + TlsPolicyJSON: cluster.TLSPolicy, + CreatedAt: int64(cluster.CreatedAt), + UpdatedAt: int64(cluster.UpdatedAt), + AutoRemoteStart: cluster.AutoRemoteStart, + AccessLogIsOn: cluster.AccessLogIsOn, + TimeZone: cluster.TimeZone, + } +} + +// toPBClusterWithResolvedCerts 转换集群并解析证书引用为实际 PEM 数据 +// 供节点调用的 RPC 使用，确保节点能拿到完整的证书内容 +func toPBClusterWithResolvedCerts(tx *dbs.Tx, cluster *models.HTTPDNSCluster) *pb.HTTPDNSCluster { + pbCluster := toPBCluster(cluster) + if pbCluster == nil { + return nil + } + resolved := resolveTLSPolicyCerts(tx, cluster.TLSPolicy) + if resolved != nil { + pbCluster.TlsPolicyJSON = resolved + } + return pbCluster +} + +// resolveTLSPolicyCerts 将 tlsPolicyJSON 中的 certRefs 解析为带实际 PEM 数据的 certs +func resolveTLSPolicyCerts(tx *dbs.Tx, tlsPolicyJSON []byte) []byte { + if len(tlsPolicyJSON) == 0 { + return nil + } + + // 解析外层结构: {"listen": [...], "sslPolicy": {...}} + var tlsConfig map[string]json.RawMessage + if err := json.Unmarshal(tlsPolicyJSON, &tlsConfig); err != nil { + return nil + } + + sslPolicyData, ok := tlsConfig["sslPolicy"] + if !ok || len(sslPolicyData) == 0 { + return nil + } + + var sslPolicy sslconfigs.SSLPolicy + if err := json.Unmarshal(sslPolicyData, &sslPolicy); err != nil { + return nil + } + + // 检查 certs 是否已经有实际数据 + for _, cert := range sslPolicy.Certs { + if cert != nil && len(cert.CertData) > 128 && len(cert.KeyData) > 128 { + return nil // 已有完整 PEM 数据，无需处理 + } + } + + // 从 certRefs 解析实际证书数据 + if len(sslPolicy.CertRefs) == 0 { + return nil + } + + var resolvedCerts []*sslconfigs.SSLCertConfig + for _, ref := range sslPolicy.CertRefs { + if ref == nil || ref.CertId <= 0 { + continue + } + certConfig, err := models.SharedSSLCertDAO.ComposeCertConfig(tx, ref.CertId, false, nil, nil) + if err != nil { + log.Println("[HTTPDNS]resolve cert", ref.CertId, "failed:", err.Error()) + continue + } + if certConfig == nil || len(certConfig.CertData) == 0 || len(certConfig.KeyData) == 0 { + continue + } + resolvedCerts = append(resolvedCerts, certConfig) + } + + if len(resolvedCerts) == 0 { + return nil + } + + // 把解析后的证书写回 sslPolicy.Certs + sslPolicy.Certs = resolvedCerts + + newPolicyData, err := json.Marshal(&sslPolicy) + if err != nil { + return nil + } + tlsConfig["sslPolicy"] = newPolicyData + + result, err := json.Marshal(tlsConfig) + if err != nil { + return nil + } + return result +} + +func toPBNode(node *models.HTTPDNSNode) *pb.HTTPDNSNode { + if node == nil { + return nil + } + return &pb.HTTPDNSNode{ + Id: int64(node.Id), + ClusterId: int64(node.ClusterId), + Name: node.Name, + IsOn: node.IsOn, + IsUp: node.IsUp, + IsInstalled: node.IsInstalled, + IsActive: node.IsActive, + UniqueId: node.UniqueId, + Secret: node.Secret, + InstallDir: node.InstallDir, + StatusJSON: node.Status, + InstallStatusJSON: node.InstallStatus, + CreatedAt: int64(node.CreatedAt), + UpdatedAt: int64(node.UpdatedAt), + } +} + +func toPBApp(app *models.HTTPDNSApp, secret *models.HTTPDNSAppSecret) *pb.HTTPDNSApp { + if app == nil { + return nil + } + var signEnabled bool + var signSecret string + var signUpdatedAt int64 + if secret != nil { + signEnabled = secret.SignEnabled + signSecret = secret.SignSecret + signUpdatedAt = int64(secret.SignUpdatedAt) + } + // 构建 clusterIdsJSON + clusterIds := models.SharedHTTPDNSAppDAO.ReadAppClusterIds(app) + clusterIdsJSON, _ := json.Marshal(clusterIds) + + return &pb.HTTPDNSApp{ + Id: int64(app.Id), + Name: app.Name, + AppId: app.AppId, + IsOn: app.IsOn, + SniMode: app.SNIMode, + SignEnabled: signEnabled, + SignSecret: signSecret, + SignUpdatedAt: signUpdatedAt, + CreatedAt: int64(app.CreatedAt), + UpdatedAt: int64(app.UpdatedAt), + UserId: int64(app.UserId), + ClusterIdsJSON: clusterIdsJSON, + } +} + +func toPBDomain(domain *models.HTTPDNSDomain, ruleCount int64) *pb.HTTPDNSDomain { + if domain == nil { + return nil + } + return &pb.HTTPDNSDomain{ + Id: int64(domain.Id), + AppId: int64(domain.AppId), + Domain: domain.Domain, + IsOn: domain.IsOn, + CreatedAt: int64(domain.CreatedAt), + UpdatedAt: int64(domain.UpdatedAt), + RuleCount: ruleCount, + } +} + +func toPBRule(rule *models.HTTPDNSCustomRule, records []*models.HTTPDNSCustomRuleRecord) *pb.HTTPDNSCustomRule { + if rule == nil { + return nil + } + var pbRecords []*pb.HTTPDNSRuleRecord + for _, record := range records { + pbRecords = append(pbRecords, &pb.HTTPDNSRuleRecord{ + Id: int64(record.Id), + RuleId: int64(record.RuleId), + RecordType: record.RecordType, + RecordValue: record.RecordValue, + Weight: record.Weight, + Sort: record.Sort, + }) + } + return &pb.HTTPDNSCustomRule{ + Id: int64(rule.Id), + AppId: int64(rule.AppId), + DomainId: int64(rule.DomainId), + RuleName: rule.RuleName, + LineScope: rule.LineScope, + LineCarrier: rule.LineCarrier, + LineRegion: rule.LineRegion, + LineProvince: rule.LineProvince, + LineContinent: rule.LineContinent, + LineCountry: rule.LineCountry, + Ttl: rule.TTL, + IsOn: rule.IsOn, + Priority: rule.Priority, + UpdatedAt: int64(rule.UpdatedAt), + Records: pbRecords, + } +} diff --git a/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_access_log.go b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_access_log.go new file mode 100644 index 0000000..be0e527 --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_access_log.go @@ -0,0 +1,287 @@ +package httpdns + +import ( + "context" + "log" + "strconv" + "strings" + "time" + + "github.com/TeaOSLab/EdgeAPI/internal/clickhouse" + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + timeutil "github.com/iwind/TeaGo/utils/time" +) + +type HTTPDNSAccessLogService struct { + services.BaseService + pb.UnimplementedHTTPDNSAccessLogServiceServer +} + +func (s *HTTPDNSAccessLogService) CreateHTTPDNSAccessLogs(ctx context.Context, req *pb.CreateHTTPDNSAccessLogsRequest) (*pb.CreateHTTPDNSAccessLogsResponse, error) { + nodeIdInContext, err := s.ValidateHTTPDNSNode(ctx) + if err != nil { + _, err = s.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + } + + if len(req.GetLogs()) == 0 { + return &pb.CreateHTTPDNSAccessLogsResponse{}, nil + } + + mysqlLogs := make([]*models.HTTPDNSAccessLog, 0, len(req.GetLogs())) + chLogs := make([]*pb.HTTPDNSAccessLog, 0, len(req.GetLogs())) + seen := map[string]struct{}{} + for _, item := range req.GetLogs() { + if item == nil { + continue + } + nodeId := item.GetNodeId() + // When called by HTTPDNS node, trust node id parsed from RPC token. + if nodeIdInContext > 0 { + nodeId = nodeIdInContext + } + clusterId := item.GetClusterId() + if clusterId <= 0 && nodeId > 0 { + clusterId, _ = models.SharedHTTPDNSNodeDAO.FindNodeClusterId(s.NullTx(), nodeId) + } + + key := item.GetRequestId() + "#" + strconv.FormatInt(nodeId, 10) + if _, ok := seen[key]; ok { + continue + } + seen[key] = struct{}{} + + createdAt := item.GetCreatedAt() + if createdAt <= 0 { + createdAt = time.Now().Unix() + } + day := item.GetDay() + if len(day) == 0 { + day = timeutil.Format("Ymd") + } + + mysqlLogs = append(mysqlLogs, &models.HTTPDNSAccessLog{ + RequestId: item.GetRequestId(), + ClusterId: uint32(clusterId), + NodeId: uint32(nodeId), + AppId: item.GetAppId(), + AppName: item.GetAppName(), + Domain: item.GetDomain(), + QType: item.GetQtype(), + ClientIP: item.GetClientIP(), + ClientRegion: item.GetClientRegion(), + Carrier: item.GetCarrier(), + SDKVersion: item.GetSdkVersion(), + OS: item.GetOs(), + ResultIPs: item.GetResultIPs(), + Status: item.GetStatus(), + ErrorCode: item.GetErrorCode(), + CostMs: item.GetCostMs(), + CreatedAt: uint64(createdAt), + Day: day, + Summary: item.GetSummary(), + }) + + chLogs = append(chLogs, &pb.HTTPDNSAccessLog{ + RequestId: item.GetRequestId(), + ClusterId: clusterId, + NodeId: nodeId, + AppId: item.GetAppId(), + AppName: item.GetAppName(), + Domain: item.GetDomain(), + Qtype: item.GetQtype(), + ClientIP: item.GetClientIP(), + ClientRegion: item.GetClientRegion(), + Carrier: item.GetCarrier(), + SdkVersion: item.GetSdkVersion(), + Os: item.GetOs(), + ResultIPs: item.GetResultIPs(), + Status: item.GetStatus(), + ErrorCode: item.GetErrorCode(), + CostMs: item.GetCostMs(), + CreatedAt: createdAt, + Day: day, + Summary: item.GetSummary(), + }) + } + + if s.canWriteHTTPDNSAccessLogsToMySQL() { + for _, item := range mysqlLogs { + err = models.SharedHTTPDNSAccessLogDAO.CreateLog(s.NullTx(), item) + if err != nil { + if models.CheckSQLDuplicateErr(err) { + continue + } + return nil, err + } + } + } + + store := clickhouse.NewHTTPDNSAccessLogsStore() + if s.canWriteHTTPDNSAccessLogsToClickHouse() && store.Client().IsConfigured() && len(chLogs) > 0 { + err = store.Insert(ctx, chLogs) + if err != nil { + log.Println("[HTTPDNS_ACCESS_LOG]write clickhouse failed, keep mysql success:", err.Error()) + } + } + + return &pb.CreateHTTPDNSAccessLogsResponse{}, nil +} + +func (s *HTTPDNSAccessLogService) ListHTTPDNSAccessLogs(ctx context.Context, req *pb.ListHTTPDNSAccessLogsRequest) (*pb.ListHTTPDNSAccessLogsResponse, error) { + _, userId, err := s.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + + allowedAppIds := []string(nil) + if userId > 0 { + if len(strings.TrimSpace(req.GetAppId())) > 0 { + app, err := ensureAppAccessByAppId(s.NullTx(), req.GetAppId(), userId) + if err != nil { + return nil, err + } + if app == nil { + return &pb.ListHTTPDNSAccessLogsResponse{ + Logs: []*pb.HTTPDNSAccessLog{}, + Total: 0, + }, nil + } + } else { + allowedAppIds, err = models.SharedHTTPDNSAppDAO.ListEnabledAppIdsWithUser(s.NullTx(), userId) + if err != nil { + return nil, err + } + if len(allowedAppIds) == 0 { + return &pb.ListHTTPDNSAccessLogsResponse{ + Logs: []*pb.HTTPDNSAccessLog{}, + Total: 0, + }, nil + } + } + } + + store := clickhouse.NewHTTPDNSAccessLogsStore() + canReadFromClickHouse := s.shouldReadHTTPDNSAccessLogsFromClickHouse() && store.Client().IsConfigured() + canReadFromMySQL := s.shouldReadHTTPDNSAccessLogsFromMySQL() + if canReadFromClickHouse { + resp, listErr := s.listFromClickHouse(ctx, store, req, allowedAppIds) + if listErr == nil { + return resp, nil + } + log.Println("[HTTPDNS_ACCESS_LOG]read clickhouse failed, fallback mysql:", listErr.Error()) + if !canReadFromMySQL { + return nil, listErr + } + } + + if !canReadFromMySQL { + return &pb.ListHTTPDNSAccessLogsResponse{ + Logs: []*pb.HTTPDNSAccessLog{}, + Total: 0, + }, nil + } + + total, err := models.SharedHTTPDNSAccessLogDAO.CountLogsWithAppIds(s.NullTx(), req.GetDay(), req.GetClusterId(), req.GetNodeId(), req.GetAppId(), allowedAppIds, req.GetDomain(), req.GetStatus(), req.GetKeyword()) + if err != nil { + return nil, err + } + logs, err := models.SharedHTTPDNSAccessLogDAO.ListLogsWithAppIds(s.NullTx(), req.GetDay(), req.GetClusterId(), req.GetNodeId(), req.GetAppId(), allowedAppIds, req.GetDomain(), req.GetStatus(), req.GetKeyword(), req.GetOffset(), req.GetSize()) + if err != nil { + return nil, err + } + + result := make([]*pb.HTTPDNSAccessLog, 0, len(logs)) + for _, item := range logs { + if item == nil { + continue + } + + clusterName, _ := models.SharedHTTPDNSClusterDAO.FindEnabledClusterName(s.NullTx(), int64(item.ClusterId)) + nodeName := "" + node, _ := models.SharedHTTPDNSNodeDAO.FindEnabledNode(s.NullTx(), int64(item.NodeId)) + if node != nil { + nodeName = node.Name + } + + result = append(result, &pb.HTTPDNSAccessLog{ + Id: int64(item.Id), + RequestId: item.RequestId, + ClusterId: int64(item.ClusterId), + NodeId: int64(item.NodeId), + AppId: item.AppId, + AppName: item.AppName, + Domain: item.Domain, + Qtype: item.QType, + ClientIP: item.ClientIP, + ClientRegion: item.ClientRegion, + Carrier: item.Carrier, + SdkVersion: item.SDKVersion, + Os: item.OS, + ResultIPs: item.ResultIPs, + Status: item.Status, + ErrorCode: item.ErrorCode, + CostMs: item.CostMs, + CreatedAt: int64(item.CreatedAt), + Day: item.Day, + Summary: item.Summary, + NodeName: nodeName, + ClusterName: clusterName, + }) + } + + return &pb.ListHTTPDNSAccessLogsResponse{ + Logs: result, + Total: total, + }, nil +} + +func (s *HTTPDNSAccessLogService) listFromClickHouse(ctx context.Context, store *clickhouse.HTTPDNSAccessLogsStore, req *pb.ListHTTPDNSAccessLogsRequest, allowedAppIds []string) (*pb.ListHTTPDNSAccessLogsResponse, error) { + filter := clickhouse.HTTPDNSAccessLogListFilter{ + Day: req.GetDay(), + ClusterId: req.GetClusterId(), + NodeId: req.GetNodeId(), + AppId: req.GetAppId(), + AppIds: allowedAppIds, + Domain: req.GetDomain(), + Status: req.GetStatus(), + Keyword: req.GetKeyword(), + Offset: req.GetOffset(), + Size: req.GetSize(), + } + + total, err := store.Count(ctx, filter) + if err != nil { + return nil, err + } + rows, err := store.List(ctx, filter) + if err != nil { + return nil, err + } + + result := make([]*pb.HTTPDNSAccessLog, 0, len(rows)) + for _, row := range rows { + item := clickhouse.HTTPDNSRowToPB(row) + if item == nil { + continue + } + clusterName, _ := models.SharedHTTPDNSClusterDAO.FindEnabledClusterName(s.NullTx(), item.GetClusterId()) + nodeName := "" + node, _ := models.SharedHTTPDNSNodeDAO.FindEnabledNode(s.NullTx(), item.GetNodeId()) + if node != nil { + nodeName = node.Name + } + item.ClusterName = clusterName + item.NodeName = nodeName + result = append(result, item) + } + + return &pb.ListHTTPDNSAccessLogsResponse{ + Logs: result, + Total: total, + }, nil +} diff --git a/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_access_log_ext.go b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_access_log_ext.go new file mode 100644 index 0000000..8a2c01d --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_access_log_ext.go @@ -0,0 +1,19 @@ +//go:build !plus + +package httpdns + +func (s *HTTPDNSAccessLogService) canWriteHTTPDNSAccessLogsToMySQL() bool { + return true +} + +func (s *HTTPDNSAccessLogService) canWriteHTTPDNSAccessLogsToClickHouse() bool { + return true +} + +func (s *HTTPDNSAccessLogService) shouldReadHTTPDNSAccessLogsFromClickHouse() bool { + return true +} + +func (s *HTTPDNSAccessLogService) shouldReadHTTPDNSAccessLogsFromMySQL() bool { + return true +} diff --git a/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_access_log_ext_plus.go b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_access_log_ext_plus.go new file mode 100644 index 0000000..cda9276 --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_access_log_ext_plus.go @@ -0,0 +1,124 @@ +//go:build plus + +package httpdns + +import ( + "log" + "sync" + "time" + + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" +) + +var ( + httpDNSAccessLogWriteTargetsLocker sync.RWMutex + httpDNSAccessLogWriteTargetsCache = &serverconfigs.AccessLogWriteTargets{ + File: true, + MySQL: true, + ClickHouse: false, + } + httpDNSAccessLogWriteTargetsExpireAt int64 +) + +const httpDNSAccessLogWriteTargetsCacheTTL = 10 * time.Second + +func (s *HTTPDNSAccessLogService) canWriteHTTPDNSAccessLogsToMySQL() bool { + targets := s.readHTTPDNSAccessLogWriteTargets() + if targets == nil { + return true + } + return targets.MySQL +} + +func (s *HTTPDNSAccessLogService) canWriteHTTPDNSAccessLogsToClickHouse() bool { + targets := s.readHTTPDNSAccessLogWriteTargets() + if targets == nil { + return false + } + return targets.ClickHouse +} + +func (s *HTTPDNSAccessLogService) shouldReadHTTPDNSAccessLogsFromClickHouse() bool { + targets := s.readHTTPDNSAccessLogWriteTargets() + if targets == nil { + return false + } + return targets.ClickHouse +} + +func (s *HTTPDNSAccessLogService) shouldReadHTTPDNSAccessLogsFromMySQL() bool { + targets := s.readHTTPDNSAccessLogWriteTargets() + if targets == nil { + return true + } + return targets.MySQL +} + +func (s *HTTPDNSAccessLogService) readHTTPDNSAccessLogWriteTargets() *serverconfigs.AccessLogWriteTargets { + now := time.Now().Unix() + + httpDNSAccessLogWriteTargetsLocker.RLock() + if now < httpDNSAccessLogWriteTargetsExpireAt && httpDNSAccessLogWriteTargetsCache != nil { + targets := *httpDNSAccessLogWriteTargetsCache + httpDNSAccessLogWriteTargetsLocker.RUnlock() + return &targets + } + httpDNSAccessLogWriteTargetsLocker.RUnlock() + + httpDNSAccessLogWriteTargetsLocker.Lock() + defer httpDNSAccessLogWriteTargetsLocker.Unlock() + + // double-check + now = time.Now().Unix() + if now < httpDNSAccessLogWriteTargetsExpireAt && httpDNSAccessLogWriteTargetsCache != nil { + targets := *httpDNSAccessLogWriteTargetsCache + return &targets + } + + targets := s.loadHTTPDNSAccessLogWriteTargetsFromPolicy() + if targets == nil { + targets = &serverconfigs.AccessLogWriteTargets{ + File: true, + MySQL: true, + ClickHouse: false, + } + } + + httpDNSAccessLogWriteTargetsCache = targets + httpDNSAccessLogWriteTargetsExpireAt = time.Now().Add(httpDNSAccessLogWriteTargetsCacheTTL).Unix() + + copyTargets := *targets + return ©Targets +} + +func (s *HTTPDNSAccessLogService) loadHTTPDNSAccessLogWriteTargetsFromPolicy() *serverconfigs.AccessLogWriteTargets { + tx := s.NullTx() + publicPolicyId, err := models.SharedHTTPAccessLogPolicyDAO.FindCurrentPublicPolicyId(tx) + if err != nil { + log.Println("[HTTPDNS_ACCESS_LOG]load public access log policy failed:", err.Error()) + return nil + } + if publicPolicyId <= 0 { + return &serverconfigs.AccessLogWriteTargets{ + File: true, + MySQL: true, + ClickHouse: false, + } + } + + policy, err := models.SharedHTTPAccessLogPolicyDAO.FindEnabledHTTPAccessLogPolicy(tx, publicPolicyId) + if err != nil { + log.Println("[HTTPDNS_ACCESS_LOG]load access log policy detail failed:", err.Error()) + return nil + } + if policy == nil { + return &serverconfigs.AccessLogWriteTargets{ + File: true, + MySQL: true, + ClickHouse: false, + } + } + + return serverconfigs.ParseWriteTargetsFromPolicy(policy.WriteTargets, policy.Type, policy.DisableDefaultDB) +} diff --git a/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_app.go b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_app.go new file mode 100644 index 0000000..6b64a1f --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_app.go @@ -0,0 +1,370 @@ +package httpdns + +import ( + "context" + "encoding/json" + "errors" + "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/userconfigs" + "github.com/iwind/TeaGo/dbs" + "strings" + "time" + + "github.com/TeaOSLab/EdgeAPI/internal/db/models" +) + +// HTTPDNSAppService HTTPDNS应用服务 +type HTTPDNSAppService struct { + services.BaseService + pb.UnimplementedHTTPDNSAppServiceServer +} + +func (this *HTTPDNSAppService) CreateHTTPDNSApp(ctx context.Context, req *pb.CreateHTTPDNSAppRequest) (*pb.CreateHTTPDNSAppResponse, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + if userId > 0 { + req.UserId = userId + } + appName := strings.TrimSpace(req.Name) + appId := strings.TrimSpace(req.AppId) + if len(appName) == 0 || len(appId) == 0 { + return nil, errors.New("required 'name' and 'appId'") + } + var appDbId int64 + now := time.Now().Unix() + err = this.RunTx(func(tx *dbs.Tx) error { + // 用户端防重复提交：短时间内同用户同应用名仅创建一次。 + if req.UserId > 0 { + latest, err := models.SharedHTTPDNSAppDAO.FindLatestEnabledAppWithNameAndUser(tx, appName, req.UserId) + if err != nil { + return err + } + if latest != nil && int64(latest.CreatedAt) >= now-5 { + appDbId = int64(latest.Id) + secret, err := models.SharedHTTPDNSAppSecretDAO.FindEnabledAppSecret(tx, appDbId) + if err != nil { + return err + } + if secret == nil { + _, _, err = models.SharedHTTPDNSAppSecretDAO.InitAppSecret(tx, appDbId, req.SignEnabled) + if err != nil { + return err + } + } + return nil + } + } + + exists, err := models.SharedHTTPDNSAppDAO.FindEnabledAppWithAppId(tx, appId) + if err != nil { + return err + } + if exists != nil { + return errors.New("appId already exists") + } + + // 使用 clusterIdsJSON；若为空则从用户关联集群获取 + clusterIdsJSON := req.ClusterIdsJSON + if len(clusterIdsJSON) == 0 || string(clusterIdsJSON) == "[]" || string(clusterIdsJSON) == "null" { + // 读取用户关联的 HTTPDNS 集群 + if req.UserId > 0 { + user, userErr := models.SharedUserDAO.FindEnabledUser(tx, req.UserId, nil) + if userErr != nil { + return userErr + } + if user != nil && len(user.HttpdnsClusterIds) > 0 { + var userClusterIds []int64 + if json.Unmarshal([]byte(user.HttpdnsClusterIds), &userClusterIds) == nil && len(userClusterIds) > 0 { + clusterIdsJSON, _ = json.Marshal(userClusterIds) + } + } + } + } + + // 如果仍然没有集群，则不允许创建 + if len(clusterIdsJSON) == 0 || string(clusterIdsJSON) == "[]" || string(clusterIdsJSON) == "null" { + return errors.New("用户尚未分配 HTTPDNS 集群，无法创建应用") + } + + appDbId, err = models.SharedHTTPDNSAppDAO.CreateApp(tx, appName, appId, clusterIdsJSON, req.IsOn, req.UserId) + if err != nil { + return err + } + _, _, err = models.SharedHTTPDNSAppSecretDAO.InitAppSecret(tx, appDbId, req.SignEnabled) + if err != nil { + return err + } + return notifyHTTPDNSAppTasksByAppDbId(tx, appDbId, models.HTTPDNSNodeTaskTypeAppChanged) + }) + if err != nil { + return nil, err + } + return &pb.CreateHTTPDNSAppResponse{AppDbId: appDbId}, nil +} + +// readHTTPDNSDefaultClusterIdList reads default cluster IDs from UserRegisterConfig. +func readHTTPDNSDefaultClusterIdList(tx *dbs.Tx) ([]int64, error) { + // 优先从 UserRegisterConfig 中读取 + configJSON, err := models.SharedSysSettingDAO.ReadSetting(tx, systemconfigs.SettingCodeUserRegisterConfig) + if err != nil { + return nil, err + } + if len(configJSON) > 0 { + var config userconfigs.UserRegisterConfig + if err := json.Unmarshal(configJSON, &config); err == nil { + if len(config.HTTPDNSDefaultClusterIds) > 0 { + // 验证集群有效性 + var validIds []int64 + for _, id := range config.HTTPDNSDefaultClusterIds { + if id <= 0 { + continue + } + cluster, err := models.SharedHTTPDNSClusterDAO.FindEnabledCluster(tx, id) + if err != nil { + return nil, err + } + if cluster != nil && cluster.IsOn { + validIds = append(validIds, id) + } + } + if len(validIds) > 0 { + return validIds, nil + } + } + } + } + + return nil, nil +} + +func (this *HTTPDNSAppService) UpdateHTTPDNSApp(ctx context.Context, req *pb.UpdateHTTPDNSAppRequest) (*pb.RPCSuccess, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + err = this.RunTx(func(tx *dbs.Tx) error { + oldApp, err := ensureAppAccess(tx, req.AppDbId, userId) + if err != nil { + return err + } + if oldApp == nil { + return errors.New("app not found") + } + + targetUserId := req.UserId + if targetUserId <= 0 { + targetUserId = oldApp.UserId + } + if userId > 0 { + targetUserId = userId + } + + err = models.SharedHTTPDNSAppDAO.UpdateApp(tx, req.AppDbId, req.Name, req.ClusterIdsJSON, req.IsOn, targetUserId) + if err != nil { + return err + } + + err = notifyHTTPDNSAppTasksByApp(tx, oldApp, models.HTTPDNSNodeTaskTypeAppChanged) + if err != nil { + return err + } + return notifyHTTPDNSAppTasksByAppDbId(tx, req.AppDbId, models.HTTPDNSNodeTaskTypeAppChanged) + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSAppService) DeleteHTTPDNSApp(ctx context.Context, req *pb.DeleteHTTPDNSAppRequest) (*pb.RPCSuccess, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + err = this.RunTx(func(tx *dbs.Tx) error { + app, err := ensureAppAccess(tx, req.AppDbId, userId) + if err != nil { + return err + } + if app == nil { + return nil + } + + // 1) 先停用规则记录 + rules, err := models.SharedHTTPDNSCustomRuleDAO.ListEnabledRulesWithAppId(tx, req.AppDbId) + if err != nil { + return err + } + for _, rule := range rules { + err = models.SharedHTTPDNSCustomRuleRecordDAO.DisableRecordsWithRuleId(tx, int64(rule.Id)) + if err != nil { + return err + } + } + + // 2) 停用规则、域名、密钥 + err = models.SharedHTTPDNSCustomRuleDAO.DisableRulesWithAppId(tx, req.AppDbId) + if err != nil { + return err + } + err = models.SharedHTTPDNSDomainDAO.DisableDomainsWithAppId(tx, req.AppDbId) + if err != nil { + return err + } + err = models.SharedHTTPDNSAppSecretDAO.DisableAppSecret(tx, req.AppDbId) + if err != nil { + return err + } + + // 3) 删除该应用的 MySQL 访问日志，避免残留 + err = models.SharedHTTPDNSAccessLogDAO.DeleteLogsWithAppId(tx, app.AppId) + if err != nil { + return err + } + + // 4) 最后停用应用 + err = models.SharedHTTPDNSAppDAO.DisableApp(tx, req.AppDbId) + if err != nil { + return err + } + + return notifyHTTPDNSAppTasksByApp(tx, app, models.HTTPDNSNodeTaskTypeAppChanged) + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSAppService) FindHTTPDNSApp(ctx context.Context, req *pb.FindHTTPDNSAppRequest) (*pb.FindHTTPDNSAppResponse, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + app, err := ensureAppAccess(this.NullTx(), req.AppDbId, userId) + if err != nil { + return nil, err + } + if app == nil { + return &pb.FindHTTPDNSAppResponse{}, nil + } + secret, err := models.SharedHTTPDNSAppSecretDAO.FindEnabledAppSecret(this.NullTx(), req.AppDbId) + if err != nil { + return nil, err + } + return &pb.FindHTTPDNSAppResponse{App: toPBApp(app, secret)}, nil +} + +func (this *HTTPDNSAppService) ListHTTPDNSApps(ctx context.Context, req *pb.ListHTTPDNSAppsRequest) (*pb.ListHTTPDNSAppsResponse, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + var apps []*models.HTTPDNSApp + if userId > 0 { + apps, err = models.SharedHTTPDNSAppDAO.ListEnabledAppsWithUser(this.NullTx(), userId, req.Offset, req.Size, req.Keyword) + } else { + apps, err = models.SharedHTTPDNSAppDAO.ListEnabledApps(this.NullTx(), req.Offset, req.Size, req.Keyword) + } + if err != nil { + return nil, err + } + var pbApps []*pb.HTTPDNSApp + for _, app := range apps { + secret, err := models.SharedHTTPDNSAppSecretDAO.FindEnabledAppSecret(this.NullTx(), int64(app.Id)) + if err != nil { + return nil, err + } + pbApps = append(pbApps, toPBApp(app, secret)) + } + return &pb.ListHTTPDNSAppsResponse{Apps: pbApps}, nil +} + +func (this *HTTPDNSAppService) FindAllHTTPDNSApps(ctx context.Context, req *pb.FindAllHTTPDNSAppsRequest) (*pb.FindAllHTTPDNSAppsResponse, error) { + _, userId, validateErr := this.ValidateAdminAndUser(ctx, true) + if validateErr != nil { + if _, nodeErr := this.ValidateHTTPDNSNode(ctx); nodeErr != nil { + return nil, validateErr + } + } + var apps []*models.HTTPDNSApp + var err error + if validateErr == nil && userId > 0 { + apps, err = models.SharedHTTPDNSAppDAO.FindAllEnabledAppsWithUser(this.NullTx(), userId) + } else { + apps, err = models.SharedHTTPDNSAppDAO.FindAllEnabledApps(this.NullTx()) + } + if err != nil { + return nil, err + } + var pbApps []*pb.HTTPDNSApp + for _, app := range apps { + secret, err := models.SharedHTTPDNSAppSecretDAO.FindEnabledAppSecret(this.NullTx(), int64(app.Id)) + if err != nil { + return nil, err + } + pbApps = append(pbApps, toPBApp(app, secret)) + } + return &pb.FindAllHTTPDNSAppsResponse{Apps: pbApps}, nil +} + +func (this *HTTPDNSAppService) UpdateHTTPDNSAppSignEnabled(ctx context.Context, req *pb.UpdateHTTPDNSAppSignEnabledRequest) (*pb.RPCSuccess, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + err = this.RunTx(func(tx *dbs.Tx) error { + app, err := ensureAppAccess(tx, req.AppDbId, userId) + if err != nil { + return err + } + if app == nil { + return errors.New("app not found") + } + + err = models.SharedHTTPDNSAppSecretDAO.UpdateSignEnabled(tx, req.AppDbId, req.SignEnabled) + if err != nil { + return err + } + return notifyHTTPDNSAppTasksByAppDbId(tx, req.AppDbId, models.HTTPDNSNodeTaskTypeAppChanged) + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSAppService) ResetHTTPDNSAppSignSecret(ctx context.Context, req *pb.ResetHTTPDNSAppSignSecretRequest) (*pb.ResetHTTPDNSAppSignSecretResponse, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + var signSecret string + var updatedAt int64 + err = this.RunTx(func(tx *dbs.Tx) error { + app, err := ensureAppAccess(tx, req.AppDbId, userId) + if err != nil { + return err + } + if app == nil { + return errors.New("app not found") + } + + signSecret, updatedAt, err = models.SharedHTTPDNSAppSecretDAO.ResetSignSecret(tx, req.AppDbId) + if err != nil { + return err + } + return notifyHTTPDNSAppTasksByAppDbId(tx, req.AppDbId, models.HTTPDNSNodeTaskTypeAppChanged) + }) + if err != nil { + return nil, err + } + return &pb.ResetHTTPDNSAppSignSecretResponse{ + SignSecret: signSecret, + UpdatedAt: updatedAt, + }, nil +} diff --git a/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_cluster.go b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_cluster.go new file mode 100644 index 0000000..94da75f --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_cluster.go @@ -0,0 +1,216 @@ +package httpdns + +import ( + "context" + "errors" + "fmt" + "strings" + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/dbs" + "google.golang.org/grpc" + "google.golang.org/grpc/metadata" +) + +// HTTPDNSClusterService HTTPDNS集群服务 +type HTTPDNSClusterService struct { + services.BaseService + pb.UnimplementedHTTPDNSClusterServiceServer +} + +func (this *HTTPDNSClusterService) CreateHTTPDNSCluster(ctx context.Context, req *pb.CreateHTTPDNSClusterRequest) (*pb.CreateHTTPDNSClusterResponse, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + if len(req.Name) == 0 { + return nil, errors.New("required 'name'") + } + var clusterId int64 + err = this.RunTx(func(tx *dbs.Tx) error { + clusterId, err = models.SharedHTTPDNSClusterDAO.CreateCluster(tx, req.Name, req.ServiceDomain, req.DefaultTTL, req.FallbackTimeoutMs, req.InstallDir, req.TlsPolicyJSON, req.IsOn, req.IsDefault, req.AutoRemoteStart, req.AccessLogIsOn, req.TimeZone) + if err != nil { + return err + } + return notifyHTTPDNSClusterTask(tx, clusterId, models.HTTPDNSNodeTaskTypeConfigChanged) + }) + if err != nil { + return nil, err + } + return &pb.CreateHTTPDNSClusterResponse{ClusterId: clusterId}, nil +} + +func (this *HTTPDNSClusterService) UpdateHTTPDNSCluster(ctx context.Context, req *pb.UpdateHTTPDNSClusterRequest) (*pb.RPCSuccess, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + + // Compatibility fallback: + // If protobuf schemas between edge-admin and edge-api are inconsistent, + // these newly-added fields may be lost on the wire. Read gRPC metadata as fallback. + if md, ok := metadata.FromIncomingContext(ctx); ok { + if values := md.Get("x-httpdns-auto-remote-start"); len(values) > 0 { + raw := strings.ToLower(strings.TrimSpace(values[0])) + req.AutoRemoteStart = raw == "1" || raw == "true" || raw == "on" || raw == "yes" || raw == "enabled" + } + if values := md.Get("x-httpdns-access-log-is-on"); len(values) > 0 { + raw := strings.ToLower(strings.TrimSpace(values[0])) + req.AccessLogIsOn = raw == "1" || raw == "true" || raw == "on" || raw == "yes" || raw == "enabled" + } + if values := md.Get("x-httpdns-time-zone"); len(values) > 0 { + raw := strings.TrimSpace(values[0]) + if len(raw) > 0 { + req.TimeZone = raw + } + } + } + + err = this.RunTx(func(tx *dbs.Tx) error { + // 先读取旧的 TLS 配置，用于判断是否真正发生了变化 + var oldTLSJSON string + oldCluster, findErr := models.SharedHTTPDNSClusterDAO.FindEnabledCluster(tx, req.ClusterId) + if findErr == nil && oldCluster != nil { + oldTLSJSON = string(oldCluster.TLSPolicy) + } + + err = models.SharedHTTPDNSClusterDAO.UpdateCluster(tx, req.ClusterId, req.Name, req.ServiceDomain, req.DefaultTTL, req.FallbackTimeoutMs, req.InstallDir, req.TlsPolicyJSON, req.IsOn, req.IsDefault, req.AutoRemoteStart, req.AccessLogIsOn, req.TimeZone) + if err != nil { + return err + } + taskType := models.HTTPDNSNodeTaskTypeConfigChanged + if len(req.TlsPolicyJSON) > 0 && string(req.TlsPolicyJSON) != oldTLSJSON { + taskType = models.HTTPDNSNodeTaskTypeTLSChanged + } + return notifyHTTPDNSClusterTask(tx, req.ClusterId, taskType) + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSClusterService) DeleteHTTPDNSCluster(ctx context.Context, req *pb.DeleteHTTPDNSClusterRequest) (*pb.RPCSuccess, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + err = this.RunTx(func(tx *dbs.Tx) error { + err = models.SharedHTTPDNSClusterDAO.DisableCluster(tx, req.ClusterId) + if err != nil { + return err + } + return notifyHTTPDNSClusterTask(tx, req.ClusterId, models.HTTPDNSNodeTaskTypeConfigChanged) + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSClusterService) FindHTTPDNSCluster(ctx context.Context, req *pb.FindHTTPDNSClusterRequest) (*pb.FindHTTPDNSClusterResponse, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + cluster, err := models.SharedHTTPDNSClusterDAO.FindEnabledCluster(this.NullTx(), req.ClusterId) + if err != nil { + return nil, err + } + if cluster != nil { + _ = grpc.SetHeader(ctx, metadata.Pairs( + "x-httpdns-auto-remote-start", fmt.Sprintf("%t", cluster.AutoRemoteStart), + "x-httpdns-access-log-is-on", fmt.Sprintf("%t", cluster.AccessLogIsOn), + "x-httpdns-time-zone", cluster.TimeZone, + )) + } + return &pb.FindHTTPDNSClusterResponse{Cluster: toPBCluster(cluster)}, nil +} + +func (this *HTTPDNSClusterService) ListHTTPDNSClusters(ctx context.Context, req *pb.ListHTTPDNSClustersRequest) (*pb.ListHTTPDNSClustersResponse, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + clusters, err := models.SharedHTTPDNSClusterDAO.ListEnabledClusters(this.NullTx(), req.Offset, req.Size, req.Keyword) + if err != nil { + return nil, err + } + var pbClusters []*pb.HTTPDNSCluster + for _, cluster := range clusters { + pbClusters = append(pbClusters, toPBCluster(cluster)) + } + return &pb.ListHTTPDNSClustersResponse{Clusters: pbClusters}, nil +} + +func (this *HTTPDNSClusterService) FindAllHTTPDNSClusters(ctx context.Context, req *pb.FindAllHTTPDNSClustersRequest) (*pb.FindAllHTTPDNSClustersResponse, error) { + _, _, validateErr := this.ValidateAdminAndUser(ctx, true) + isNode := false + if validateErr != nil { + if _, nodeErr := this.ValidateHTTPDNSNode(ctx); nodeErr != nil { + return nil, validateErr + } + isNode = true + } + clusters, err := models.SharedHTTPDNSClusterDAO.FindAllEnabledClusters(this.NullTx()) + if err != nil { + return nil, err + } + var pbClusters []*pb.HTTPDNSCluster + for _, cluster := range clusters { + if isNode { + // 节点调用时解析证书引用，嵌入实际 PEM 数据 + pbClusters = append(pbClusters, toPBClusterWithResolvedCerts(this.NullTx(), cluster)) + } else { + pbClusters = append(pbClusters, toPBCluster(cluster)) + } + } + return &pb.FindAllHTTPDNSClustersResponse{Clusters: pbClusters}, nil +} + +func (this *HTTPDNSClusterService) UpdateHTTPDNSClusterDefault(ctx context.Context, req *pb.UpdateHTTPDNSClusterDefaultRequest) (*pb.RPCSuccess, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + err = this.RunTx(func(tx *dbs.Tx) error { + err = models.SharedHTTPDNSClusterDAO.UpdateDefaultCluster(tx, req.ClusterId) + if err != nil { + return err + } + + clusters, err := models.SharedHTTPDNSClusterDAO.FindAllEnabledClusters(tx) + if err != nil { + return err + } + + for _, cluster := range clusters { + err = notifyHTTPDNSClusterTask(tx, int64(cluster.Id), models.HTTPDNSNodeTaskTypeConfigChanged) + if err != nil { + return err + } + } + return nil + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSClusterService) ListHTTPDNSNodesWithClusterId(ctx context.Context, req *pb.ListHTTPDNSNodesWithClusterIdRequest) (*pb.ListHTTPDNSNodesWithClusterIdResponse, error) { + _, _, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + nodes, err := models.SharedHTTPDNSNodeDAO.ListEnabledNodes(this.NullTx(), req.ClusterId) + if err != nil { + return nil, err + } + var pbNodes []*pb.HTTPDNSNode + for _, node := range nodes { + pbNodes = append(pbNodes, toPBNode(node)) + } + return &pb.ListHTTPDNSNodesWithClusterIdResponse{Nodes: pbNodes}, nil +} diff --git a/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_domain.go b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_domain.go new file mode 100644 index 0000000..0f93cc3 --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_domain.go @@ -0,0 +1,128 @@ +package httpdns + +import ( + "context" + "errors" + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/dbs" +) + +// HTTPDNSDomainService HTTPDNS域名服务 +type HTTPDNSDomainService struct { + services.BaseService + pb.UnimplementedHTTPDNSDomainServiceServer +} + +func (this *HTTPDNSDomainService) CreateHTTPDNSDomain(ctx context.Context, req *pb.CreateHTTPDNSDomainRequest) (*pb.CreateHTTPDNSDomainResponse, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + if req.AppDbId <= 0 || len(req.Domain) == 0 { + return nil, errors.New("required 'appDbId' and 'domain'") + } + var domainId int64 + err = this.RunTx(func(tx *dbs.Tx) error { + app, err := ensureAppAccess(tx, req.AppDbId, userId) + if err != nil { + return err + } + if app == nil { + return errors.New("app not found") + } + + domainId, err = models.SharedHTTPDNSDomainDAO.CreateDomain(tx, req.AppDbId, req.Domain, req.IsOn) + if err != nil { + return err + } + return notifyHTTPDNSAppTasksByAppDbId(tx, req.AppDbId, models.HTTPDNSNodeTaskTypeDomainChanged) + }) + if err != nil { + return nil, err + } + return &pb.CreateHTTPDNSDomainResponse{DomainId: domainId}, nil +} + +func (this *HTTPDNSDomainService) DeleteHTTPDNSDomain(ctx context.Context, req *pb.DeleteHTTPDNSDomainRequest) (*pb.RPCSuccess, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + err = this.RunTx(func(tx *dbs.Tx) error { + domain, app, err := ensureDomainAccess(tx, req.DomainId, userId) + if err != nil { + return err + } + if domain == nil { + return nil + } + + err = models.SharedHTTPDNSDomainDAO.DisableDomain(tx, req.DomainId) + if err != nil { + return err + } + return notifyHTTPDNSAppTasksByAppDbId(tx, int64(app.Id), models.HTTPDNSNodeTaskTypeDomainChanged) + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSDomainService) UpdateHTTPDNSDomainStatus(ctx context.Context, req *pb.UpdateHTTPDNSDomainStatusRequest) (*pb.RPCSuccess, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + err = this.RunTx(func(tx *dbs.Tx) error { + domain, app, err := ensureDomainAccess(tx, req.DomainId, userId) + if err != nil { + return err + } + if domain == nil { + return nil + } + + err = models.SharedHTTPDNSDomainDAO.UpdateDomainStatus(tx, req.DomainId, req.IsOn) + if err != nil { + return err + } + return notifyHTTPDNSAppTasksByAppDbId(tx, int64(app.Id), models.HTTPDNSNodeTaskTypeDomainChanged) + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSDomainService) ListHTTPDNSDomainsWithAppId(ctx context.Context, req *pb.ListHTTPDNSDomainsWithAppIdRequest) (*pb.ListHTTPDNSDomainsWithAppIdResponse, error) { + _, userId, validateErr := this.ValidateAdminAndUser(ctx, true) + if validateErr != nil { + if _, nodeErr := this.ValidateHTTPDNSNode(ctx); nodeErr != nil { + return nil, validateErr + } + } else if userId > 0 { + app, err := ensureAppAccess(this.NullTx(), req.AppDbId, userId) + if err != nil { + return nil, err + } + if app == nil { + return &pb.ListHTTPDNSDomainsWithAppIdResponse{}, nil + } + } + domains, err := models.SharedHTTPDNSDomainDAO.ListEnabledDomainsWithAppId(this.NullTx(), req.AppDbId, req.Keyword) + if err != nil { + return nil, err + } + var pbDomains []*pb.HTTPDNSDomain + for _, domain := range domains { + ruleCount, err := models.SharedHTTPDNSCustomRuleDAO.CountEnabledRulesWithDomainId(this.NullTx(), int64(domain.Id)) + if err != nil { + return nil, err + } + pbDomains = append(pbDomains, toPBDomain(domain, ruleCount)) + } + return &pb.ListHTTPDNSDomainsWithAppIdResponse{Domains: pbDomains}, nil +} diff --git a/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_node.go b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_node.go new file mode 100644 index 0000000..a12ce8e --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_node.go @@ -0,0 +1,409 @@ +package httpdns + +import ( + "context" + "encoding/json" + "errors" + "io" + "path/filepath" + + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeAPI/internal/goman" + "github.com/TeaOSLab/EdgeAPI/internal/installers" + "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" + "github.com/TeaOSLab/EdgeAPI/internal/setup" + rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils" + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/dbs" + "github.com/iwind/TeaGo/logs" + stringutil "github.com/iwind/TeaGo/utils/string" +) + +// HTTPDNSNodeService HTTPDNS节点服务 +type HTTPDNSNodeService struct { + services.BaseService + pb.UnimplementedHTTPDNSNodeServiceServer +} + +func (this *HTTPDNSNodeService) CreateHTTPDNSNode(ctx context.Context, req *pb.CreateHTTPDNSNodeRequest) (*pb.CreateHTTPDNSNodeResponse, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + if req.ClusterId <= 0 { + return nil, errors.New("required 'clusterId'") + } + var nodeId int64 + err = this.RunTx(func(tx *dbs.Tx) error { + nodeId, err = models.SharedHTTPDNSNodeDAO.CreateNode(tx, req.ClusterId, req.Name, req.InstallDir, req.IsOn) + if err != nil { + return err + } + return notifyHTTPDNSClusterTask(tx, req.ClusterId, models.HTTPDNSNodeTaskTypeConfigChanged) + }) + if err != nil { + return nil, err + } + return &pb.CreateHTTPDNSNodeResponse{NodeId: nodeId}, nil +} + +func (this *HTTPDNSNodeService) UpdateHTTPDNSNode(ctx context.Context, req *pb.UpdateHTTPDNSNodeRequest) (*pb.RPCSuccess, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + err = this.RunTx(func(tx *dbs.Tx) error { + node, err := models.SharedHTTPDNSNodeDAO.FindEnabledNode(tx, req.NodeId) + if err != nil { + return err + } + if node == nil { + return errors.New("node not found") + } + + err = models.SharedHTTPDNSNodeDAO.UpdateNode(tx, req.NodeId, req.Name, req.InstallDir, req.IsOn) + if err != nil { + return err + } + return notifyHTTPDNSClusterTask(tx, int64(node.ClusterId), models.HTTPDNSNodeTaskTypeConfigChanged) + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSNodeService) DeleteHTTPDNSNode(ctx context.Context, req *pb.DeleteHTTPDNSNodeRequest) (*pb.RPCSuccess, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + err = this.RunTx(func(tx *dbs.Tx) error { + node, err := models.SharedHTTPDNSNodeDAO.FindEnabledNode(tx, req.NodeId) + if err != nil { + return err + } + if node == nil { + return nil + } + + err = models.SharedHTTPDNSNodeDAO.DisableNode(tx, req.NodeId) + if err != nil { + return err + } + return notifyHTTPDNSClusterTask(tx, int64(node.ClusterId), models.HTTPDNSNodeTaskTypeConfigChanged) + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSNodeService) FindHTTPDNSNode(ctx context.Context, req *pb.FindHTTPDNSNodeRequest) (*pb.FindHTTPDNSNodeResponse, error) { + nodeId := req.NodeId + if nodeId <= 0 { + parsedNodeId, nodeErr := this.ValidateHTTPDNSNode(ctx) + if nodeErr != nil { + return nil, errors.New("invalid 'nodeId'") + } + nodeId = parsedNodeId + } else { + _, _, validateErr := this.ValidateAdminAndUser(ctx, true) + if validateErr != nil { + if _, nodeErr := this.ValidateHTTPDNSNode(ctx); nodeErr != nil { + return nil, validateErr + } + } + } + + node, err := models.SharedHTTPDNSNodeDAO.FindEnabledNode(this.NullTx(), nodeId) + if err != nil { + return nil, err + } + + pbNode := toPBNode(node) + + // 认证信息 + if pbNode != nil { + login, loginErr := models.SharedNodeLoginDAO.FindEnabledNodeLoginWithNodeId(this.NullTx(), nodeconfigs.NodeRoleHTTPDNS, nodeId) + if loginErr != nil { + return nil, loginErr + } + if login != nil { + pbNode.NodeLogin = &pb.NodeLogin{ + Id: int64(login.Id), + Name: login.Name, + Type: login.Type, + Params: login.Params, + } + } + } + + return &pb.FindHTTPDNSNodeResponse{Node: pbNode}, nil +} + +func (this *HTTPDNSNodeService) ListHTTPDNSNodes(ctx context.Context, req *pb.ListHTTPDNSNodesRequest) (*pb.ListHTTPDNSNodesResponse, error) { + _, _, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + nodes, err := models.SharedHTTPDNSNodeDAO.ListEnabledNodes(this.NullTx(), req.ClusterId) + if err != nil { + return nil, err + } + var pbNodes []*pb.HTTPDNSNode + for _, node := range nodes { + pbNodes = append(pbNodes, toPBNode(node)) + } + return &pb.ListHTTPDNSNodesResponse{Nodes: pbNodes}, nil +} + +func (this *HTTPDNSNodeService) UpdateHTTPDNSNodeStatus(ctx context.Context, req *pb.UpdateHTTPDNSNodeStatusRequest) (*pb.RPCSuccess, error) { + nodeId := req.GetNodeId() + isAdminCaller := false + if nodeId > 0 { + if _, adminErr := this.ValidateAdmin(ctx); adminErr == nil { + isAdminCaller = true + } + } + if !isAdminCaller { + if nodeId <= 0 { + parsedNodeId, err := this.ValidateHTTPDNSNode(ctx) + if err != nil { + return nil, err + } + nodeId = parsedNodeId + } + } + if nodeId <= 0 { + return nil, errors.New("invalid 'nodeId'") + } + + err := models.SharedHTTPDNSNodeDAO.UpdateNodeStatus(this.NullTx(), nodeId, req.GetIsUp(), req.GetIsInstalled(), req.GetIsActive(), req.GetStatusJSON(), req.GetInstallStatusJSON()) + if err != nil { + return nil, err + } + + if isAdminCaller && shouldTriggerHTTPDNSInstall(req.GetInstallStatusJSON()) { + goman.New(func() { + installErr := installers.SharedHTTPDNSNodeQueue().InstallNodeProcess(nodeId, false) + if installErr != nil { + logs.Println("[RPC][HTTPDNS]install node failed:", installErr.Error()) + } + }) + } + + return this.Success() +} + +// UpdateHTTPDNSNodeLogin 修改HTTPDNS节点登录信息 +func (this *HTTPDNSNodeService) UpdateHTTPDNSNodeLogin(ctx context.Context, req *pb.UpdateHTTPDNSNodeLoginRequest) (*pb.RPCSuccess, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + + var tx = this.NullTx() + + if req.NodeLogin.Id <= 0 { + loginId, createErr := models.SharedNodeLoginDAO.CreateNodeLogin(tx, nodeconfigs.NodeRoleHTTPDNS, req.NodeId, req.NodeLogin.Name, req.NodeLogin.Type, req.NodeLogin.Params) + if createErr != nil { + return nil, createErr + } + req.NodeLogin.Id = loginId + } + + err = models.SharedNodeLoginDAO.UpdateNodeLogin(tx, req.NodeLogin.Id, req.NodeLogin.Name, req.NodeLogin.Type, req.NodeLogin.Params) + if err != nil { + return nil, err + } + + return this.Success() +} + +// CheckHTTPDNSNodeLatestVersion 检查HTTPDNS节点新版本 +func (this *HTTPDNSNodeService) CheckHTTPDNSNodeLatestVersion(ctx context.Context, req *pb.CheckHTTPDNSNodeLatestVersionRequest) (*pb.CheckHTTPDNSNodeLatestVersionResponse, error) { + _, _, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin, rpcutils.UserTypeHTTPDNS) + if err != nil { + return nil, err + } + + deployFiles := installers.SharedDeployManager.LoadHTTPDNSNodeFiles() + for _, file := range deployFiles { + if file.OS == req.Os && file.Arch == req.Arch && stringutil.VersionCompare(file.Version, req.CurrentVersion) > 0 { + return &pb.CheckHTTPDNSNodeLatestVersionResponse{ + HasNewVersion: true, + NewVersion: file.Version, + }, nil + } + } + return &pb.CheckHTTPDNSNodeLatestVersionResponse{HasNewVersion: false}, nil +} + +// DownloadHTTPDNSNodeInstallationFile 下载最新HTTPDNS节点安装文件 +func (this *HTTPDNSNodeService) DownloadHTTPDNSNodeInstallationFile(ctx context.Context, req *pb.DownloadHTTPDNSNodeInstallationFileRequest) (*pb.DownloadHTTPDNSNodeInstallationFileResponse, error) { + nodeId, err := this.ValidateHTTPDNSNode(ctx) + if err != nil { + return nil, err + } + + // 检查自动升级开关 + upgradeConfig, _ := setup.LoadUpgradeConfig() + if upgradeConfig != nil && !upgradeConfig.AutoUpgrade { + return &pb.DownloadHTTPDNSNodeInstallationFileResponse{}, nil + } + + var file = installers.SharedDeployManager.FindHTTPDNSNodeFile(req.Os, req.Arch) + if file == nil { + return &pb.DownloadHTTPDNSNodeInstallationFileResponse{}, nil + } + + sum, err := file.Sum() + if err != nil { + return nil, err + } + + data, offset, err := file.Read(req.ChunkOffset) + if err != nil && err != io.EOF { + return nil, err + } + + // 增加下载速度监控 + installers.SharedUpgradeLimiter.UpdateNodeBytes(nodeconfigs.NodeRoleHTTPDNS, nodeId, int64(len(data))) + + return &pb.DownloadHTTPDNSNodeInstallationFileResponse{ + Sum: sum, + Offset: offset, + ChunkData: data, + Version: file.Version, + Filename: filepath.Base(file.Path), + }, nil +} + +// CountAllUpgradeHTTPDNSNodesWithClusterId 计算需要升级的HTTPDNS节点数量 +func (this *HTTPDNSNodeService) CountAllUpgradeHTTPDNSNodesWithClusterId(ctx context.Context, req *pb.CountAllUpgradeHTTPDNSNodesWithClusterIdRequest) (*pb.RPCCountResponse, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + + var tx = this.NullTx() + deployFiles := installers.SharedDeployManager.LoadHTTPDNSNodeFiles() + total := int64(0) + for _, deployFile := range deployFiles { + count, err := models.SharedHTTPDNSNodeDAO.CountAllLowerVersionNodesWithClusterId(tx, req.ClusterId, deployFile.OS, deployFile.Arch, deployFile.Version) + if err != nil { + return nil, err + } + total += count + } + return this.SuccessCount(total) +} + +// FindAllUpgradeHTTPDNSNodesWithClusterId 列出所有需要升级的HTTPDNS节点 +func (this *HTTPDNSNodeService) FindAllUpgradeHTTPDNSNodesWithClusterId(ctx context.Context, req *pb.FindAllUpgradeHTTPDNSNodesWithClusterIdRequest) (*pb.FindAllUpgradeHTTPDNSNodesWithClusterIdResponse, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + + var tx = this.NullTx() + deployFiles := installers.SharedDeployManager.LoadHTTPDNSNodeFiles() + var result []*pb.FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade + for _, deployFile := range deployFiles { + nodes, err := models.SharedHTTPDNSNodeDAO.FindAllLowerVersionNodesWithClusterId(tx, req.ClusterId, deployFile.OS, deployFile.Arch, deployFile.Version) + if err != nil { + return nil, err + } + for _, node := range nodes { + // 解析状态获取当前版本 + var oldVersion string + if len(node.Status) > 0 { + var statusMap map[string]interface{} + if json.Unmarshal(node.Status, &statusMap) == nil { + if v, ok := statusMap["buildVersion"]; ok { + oldVersion, _ = v.(string) + } + } + } + + pbNode := toPBNode(node) + + // 认证信息 + login, loginErr := models.SharedNodeLoginDAO.FindEnabledNodeLoginWithNodeId(tx, nodeconfigs.NodeRoleHTTPDNS, int64(node.Id)) + if loginErr != nil { + return nil, loginErr + } + if login != nil && pbNode != nil { + pbNode.NodeLogin = &pb.NodeLogin{ + Id: int64(login.Id), + Name: login.Name, + Type: login.Type, + Params: login.Params, + } + } + + result = append(result, &pb.FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade{ + Node: pbNode, + Os: deployFile.OS, + Arch: deployFile.Arch, + OldVersion: oldVersion, + NewVersion: deployFile.Version, + }) + } + } + return &pb.FindAllUpgradeHTTPDNSNodesWithClusterIdResponse{Nodes: result}, nil +} + +// UpgradeHTTPDNSNode 升级单个HTTPDNS节点 +func (this *HTTPDNSNodeService) UpgradeHTTPDNSNode(ctx context.Context, req *pb.UpgradeHTTPDNSNodeRequest) (*pb.RPCSuccess, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + + var tx = this.NullTx() + + err = models.SharedHTTPDNSNodeDAO.UpdateNodeIsInstalled(tx, req.NodeId, false) + if err != nil { + return nil, err + } + + // 重置安装状态 + installStatus, err := models.SharedHTTPDNSNodeDAO.FindNodeInstallStatus(tx, req.NodeId) + if err != nil { + return nil, err + } + if installStatus == nil { + installStatus = &models.NodeInstallStatus{} + } + installStatus.IsOk = false + installStatus.IsFinished = false + err = models.SharedHTTPDNSNodeDAO.UpdateNodeInstallStatus(tx, req.NodeId, installStatus) + if err != nil { + return nil, err + } + + goman.New(func() { + installErr := installers.SharedHTTPDNSNodeQueue().InstallNodeProcess(req.NodeId, true) + if installErr != nil { + logs.Println("[RPC][HTTPDNS]upgrade node failed:", installErr.Error()) + } + }) + + return this.Success() +} + +func shouldTriggerHTTPDNSInstall(installStatusJSON []byte) bool { + if len(installStatusJSON) == 0 { + return false + } + + installStatus := &models.NodeInstallStatus{} + err := json.Unmarshal(installStatusJSON, installStatus) + if err != nil { + return false + } + return installStatus.IsRunning && !installStatus.IsFinished +} diff --git a/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_rule.go b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_rule.go new file mode 100644 index 0000000..6e397dc --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_rule.go @@ -0,0 +1,206 @@ +package httpdns + +import ( + "context" + "errors" + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/dbs" +) + +// HTTPDNSRuleService HTTPDNS规则服务 +type HTTPDNSRuleService struct { + services.BaseService + pb.UnimplementedHTTPDNSRuleServiceServer +} + +func (this *HTTPDNSRuleService) CreateHTTPDNSCustomRule(ctx context.Context, req *pb.CreateHTTPDNSCustomRuleRequest) (*pb.CreateHTTPDNSCustomRuleResponse, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + if req.Rule == nil { + return nil, errors.New("required 'rule'") + } + var ruleId int64 + err = this.RunTx(func(tx *dbs.Tx) error { + domain, app, err := ensureDomainAccess(tx, req.Rule.DomainId, userId) + if err != nil { + return err + } + if domain == nil || app == nil { + return errors.New("domain not found") + } + + rule := &models.HTTPDNSCustomRule{ + AppId: domain.AppId, + DomainId: uint32(req.Rule.DomainId), + RuleName: req.Rule.RuleName, + LineScope: req.Rule.LineScope, + LineCarrier: req.Rule.LineCarrier, + LineRegion: req.Rule.LineRegion, + LineProvince: req.Rule.LineProvince, + LineContinent: req.Rule.LineContinent, + LineCountry: req.Rule.LineCountry, + TTL: req.Rule.Ttl, + IsOn: req.Rule.IsOn, + Priority: req.Rule.Priority, + } + ruleId, err = models.SharedHTTPDNSCustomRuleDAO.CreateRule(tx, rule) + if err != nil { + return err + } + for _, record := range req.Rule.Records { + _, err := models.SharedHTTPDNSCustomRuleRecordDAO.CreateRecord(tx, ruleId, record.RecordType, record.RecordValue, record.Weight, record.Sort) + if err != nil { + return err + } + } + return notifyHTTPDNSAppTasksByAppDbId(tx, int64(app.Id), models.HTTPDNSNodeTaskTypeRuleChanged) + }) + if err != nil { + return nil, err + } + return &pb.CreateHTTPDNSCustomRuleResponse{RuleId: ruleId}, nil +} + +func (this *HTTPDNSRuleService) UpdateHTTPDNSCustomRule(ctx context.Context, req *pb.UpdateHTTPDNSCustomRuleRequest) (*pb.RPCSuccess, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + if req.Rule == nil || req.Rule.Id <= 0 { + return nil, errors.New("invalid 'rule.id'") + } + err = this.RunTx(func(tx *dbs.Tx) error { + oldRule, app, err := ensureRuleAccess(tx, req.Rule.Id, userId) + if err != nil { + return err + } + if oldRule == nil { + return errors.New("rule not found") + } + + rule := &models.HTTPDNSCustomRule{ + Id: uint32(req.Rule.Id), + RuleName: req.Rule.RuleName, + LineScope: req.Rule.LineScope, + LineCarrier: req.Rule.LineCarrier, + LineRegion: req.Rule.LineRegion, + LineProvince: req.Rule.LineProvince, + LineContinent: req.Rule.LineContinent, + LineCountry: req.Rule.LineCountry, + TTL: req.Rule.Ttl, + IsOn: req.Rule.IsOn, + Priority: req.Rule.Priority, + } + err = models.SharedHTTPDNSCustomRuleDAO.UpdateRule(tx, rule) + if err != nil { + return err + } + err = models.SharedHTTPDNSCustomRuleRecordDAO.DisableRecordsWithRuleId(tx, req.Rule.Id) + if err != nil { + return err + } + for _, record := range req.Rule.Records { + _, err := models.SharedHTTPDNSCustomRuleRecordDAO.CreateRecord(tx, req.Rule.Id, record.RecordType, record.RecordValue, record.Weight, record.Sort) + if err != nil { + return err + } + } + err = notifyHTTPDNSAppTasksByAppDbId(tx, int64(app.Id), models.HTTPDNSNodeTaskTypeRuleChanged) + if err != nil { + return err + } + + targetAppDbId := int64(app.Id) + return notifyHTTPDNSAppTasksByAppDbId(tx, targetAppDbId, models.HTTPDNSNodeTaskTypeRuleChanged) + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSRuleService) DeleteHTTPDNSCustomRule(ctx context.Context, req *pb.DeleteHTTPDNSCustomRuleRequest) (*pb.RPCSuccess, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + err = this.RunTx(func(tx *dbs.Tx) error { + rule, app, err := ensureRuleAccess(tx, req.RuleId, userId) + if err != nil { + return err + } + if rule == nil { + return nil + } + + err = models.SharedHTTPDNSCustomRuleDAO.DisableRule(tx, req.RuleId) + if err != nil { + return err + } + return notifyHTTPDNSAppTasksByAppDbId(tx, int64(app.Id), models.HTTPDNSNodeTaskTypeRuleChanged) + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSRuleService) UpdateHTTPDNSCustomRuleStatus(ctx context.Context, req *pb.UpdateHTTPDNSCustomRuleStatusRequest) (*pb.RPCSuccess, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + err = this.RunTx(func(tx *dbs.Tx) error { + rule, app, err := ensureRuleAccess(tx, req.RuleId, userId) + if err != nil { + return err + } + if rule == nil { + return nil + } + + err = models.SharedHTTPDNSCustomRuleDAO.UpdateRuleStatus(tx, req.RuleId, req.IsOn) + if err != nil { + return err + } + return notifyHTTPDNSAppTasksByAppDbId(tx, int64(app.Id), models.HTTPDNSNodeTaskTypeRuleChanged) + }) + if err != nil { + return nil, err + } + return this.Success() +} + +func (this *HTTPDNSRuleService) ListHTTPDNSCustomRulesWithDomainId(ctx context.Context, req *pb.ListHTTPDNSCustomRulesWithDomainIdRequest) (*pb.ListHTTPDNSCustomRulesWithDomainIdResponse, error) { + _, userId, validateErr := this.ValidateAdminAndUser(ctx, true) + if validateErr != nil { + if _, nodeErr := this.ValidateHTTPDNSNode(ctx); nodeErr != nil { + return nil, validateErr + } + } else if userId > 0 { + domain, _, err := ensureDomainAccess(this.NullTx(), req.DomainId, userId) + if err != nil { + return nil, err + } + if domain == nil { + return &pb.ListHTTPDNSCustomRulesWithDomainIdResponse{}, nil + } + } + rules, err := models.SharedHTTPDNSCustomRuleDAO.ListEnabledRulesWithDomainId(this.NullTx(), req.DomainId) + if err != nil { + return nil, err + } + var pbRules []*pb.HTTPDNSCustomRule + for _, rule := range rules { + records, err := models.SharedHTTPDNSCustomRuleRecordDAO.ListEnabledRecordsWithRuleId(this.NullTx(), int64(rule.Id)) + if err != nil { + return nil, err + } + pbRules = append(pbRules, toPBRule(rule, records)) + } + return &pb.ListHTTPDNSCustomRulesWithDomainIdResponse{Rules: pbRules}, nil +} diff --git a/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_runtime_log.go b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_runtime_log.go new file mode 100644 index 0000000..a56ef93 --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_runtime_log.go @@ -0,0 +1,107 @@ +package httpdns + +import ( + "context" + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + timeutil "github.com/iwind/TeaGo/utils/time" + "time" +) + +// HTTPDNSRuntimeLogService HTTPDNS运行日志服务 +type HTTPDNSRuntimeLogService struct { + services.BaseService + pb.UnimplementedHTTPDNSRuntimeLogServiceServer +} + +func (this *HTTPDNSRuntimeLogService) CreateHTTPDNSRuntimeLogs(ctx context.Context, req *pb.CreateHTTPDNSRuntimeLogsRequest) (*pb.CreateHTTPDNSRuntimeLogsResponse, error) { + nodeIdInContext, err := this.ValidateHTTPDNSNode(ctx) + if err != nil { + _, err = this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + } + for _, item := range req.Logs { + createdAt := item.CreatedAt + if createdAt <= 0 { + createdAt = time.Now().Unix() + } + day := item.Day + if len(day) == 0 { + day = timeutil.Format("Ymd") + } + nodeId := item.NodeId + // When called by HTTPDNS node, trust node id parsed from RPC token. + if nodeIdInContext > 0 { + nodeId = nodeIdInContext + } + + clusterId := item.ClusterId + if clusterId <= 0 && nodeId > 0 { + clusterId, _ = models.SharedHTTPDNSNodeDAO.FindNodeClusterId(this.NullTx(), nodeId) + } + + log := &models.HTTPDNSRuntimeLog{ + ClusterId: uint32(clusterId), + NodeId: uint32(nodeId), + Level: item.Level, + Type: item.Type, + Module: item.Module, + Description: item.Description, + Count: item.Count, + RequestId: item.RequestId, + CreatedAt: uint64(createdAt), + Day: day, + } + err := models.SharedHTTPDNSRuntimeLogDAO.CreateLog(this.NullTx(), log) + if err != nil { + return nil, err + } + } + return &pb.CreateHTTPDNSRuntimeLogsResponse{}, nil +} + +func (this *HTTPDNSRuntimeLogService) ListHTTPDNSRuntimeLogs(ctx context.Context, req *pb.ListHTTPDNSRuntimeLogsRequest) (*pb.ListHTTPDNSRuntimeLogsResponse, error) { + _, _, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + total, err := models.SharedHTTPDNSRuntimeLogDAO.CountLogs(this.NullTx(), req.Day, req.ClusterId, req.NodeId, req.Level, req.Keyword) + if err != nil { + return nil, err + } + logs, err := models.SharedHTTPDNSRuntimeLogDAO.ListLogs(this.NullTx(), req.Day, req.ClusterId, req.NodeId, req.Level, req.Keyword, req.Offset, req.Size) + if err != nil { + return nil, err + } + var pbLogs []*pb.HTTPDNSRuntimeLog + for _, item := range logs { + clusterName, _ := models.SharedHTTPDNSClusterDAO.FindEnabledClusterName(this.NullTx(), int64(item.ClusterId)) + nodeName := "" + node, _ := models.SharedHTTPDNSNodeDAO.FindEnabledNode(this.NullTx(), int64(item.NodeId)) + if node != nil { + nodeName = node.Name + } + pbLogs = append(pbLogs, &pb.HTTPDNSRuntimeLog{ + Id: int64(item.Id), + ClusterId: int64(item.ClusterId), + NodeId: int64(item.NodeId), + Level: item.Level, + Type: item.Type, + Module: item.Module, + Description: item.Description, + Count: item.Count, + RequestId: item.RequestId, + CreatedAt: int64(item.CreatedAt), + Day: item.Day, + ClusterName: clusterName, + NodeName: nodeName, + }) + } + return &pb.ListHTTPDNSRuntimeLogsResponse{ + Logs: pbLogs, + Total: total, + }, nil +} diff --git a/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_sandbox.go b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_sandbox.go new file mode 100644 index 0000000..d0b4a86 --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/service_httpdns_sandbox.go @@ -0,0 +1,285 @@ +package httpdns + +import ( + "context" + "crypto/hmac" + "crypto/sha256" + "crypto/tls" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/rands" + "io" + "net/http" + "net/url" + "strconv" + "strings" + "time" +) + +// HTTPDNSSandboxService HTTPDNS解析测试服务 +type HTTPDNSSandboxService struct { + services.BaseService + pb.UnimplementedHTTPDNSSandboxServiceServer +} + +// nodeResolveResponse 节点返回的 JSON 结构（对齐 EdgeHttpDNS resolve_server.go） +type nodeResolveResponse struct { + Code string `json:"code"` + Message string `json:"message"` + RequestID string `json:"requestId"` + Data *nodeResolveData `json:"data,omitempty"` +} + +type nodeResolveData struct { + Domain string `json:"domain"` + QType string `json:"qtype"` + TTL int32 `json:"ttl"` + Records []*nodeResolveRecord `json:"records"` + Client *nodeClientInfo `json:"client"` + Summary string `json:"summary"` +} + +type nodeResolveRecord struct { + Type string `json:"type"` + IP string `json:"ip"` + Weight int32 `json:"weight"` + Line string `json:"line"` + Region string `json:"region"` +} + +type nodeClientInfo struct { + IP string `json:"ip"` + Region string `json:"region"` + Carrier string `json:"carrier"` + Country string `json:"country"` +} + +func (this *HTTPDNSSandboxService) TestHTTPDNSResolve(ctx context.Context, req *pb.TestHTTPDNSResolveRequest) (*pb.TestHTTPDNSResolveResponse, error) { + _, userId, err := this.ValidateAdminAndUser(ctx, true) + if err != nil { + return nil, err + } + + if len(req.AppId) == 0 || len(req.Domain) == 0 { + return nil, errors.New("appId 和 domain 不能为空") + } + + app, err := models.SharedHTTPDNSAppDAO.FindEnabledAppWithAppId(this.NullTx(), req.AppId) + if err != nil { + return nil, err + } + if userId > 0 && app != nil && app.UserId != userId { + return nil, errors.New("access denied") + } + if app == nil || !app.IsOn { + return &pb.TestHTTPDNSResolveResponse{ + Code: "APP_NOT_FOUND_OR_DISABLED", + Message: "找不到指定的应用，或该应用已下线", + RequestId: "rid-" + rands.HexString(12), + }, nil + } + // 检查集群是否绑定 + appClusterIds := models.SharedHTTPDNSAppDAO.ReadAppClusterIds(app) + if req.ClusterId > 0 { + var found bool + for _, cid := range appClusterIds { + if cid == req.ClusterId { + found = true + break + } + } + if !found { + return &pb.TestHTTPDNSResolveResponse{ + Code: "APP_CLUSTER_MISMATCH", + Message: "当前应用未绑定到该集群", + RequestId: "rid-" + rands.HexString(12), + }, nil + } + } + + qtype := strings.ToUpper(strings.TrimSpace(req.Qtype)) + if qtype == "" { + qtype = "A" + } + + // 获取集群服务域名 + clusterId := req.ClusterId + if clusterId <= 0 && len(appClusterIds) > 0 { + clusterId = appClusterIds[0] + } + cluster, err := models.SharedHTTPDNSClusterDAO.FindEnabledCluster(this.NullTx(), clusterId) + if err != nil { + return nil, err + } + if cluster == nil { + return &pb.TestHTTPDNSResolveResponse{ + Code: "CLUSTER_NOT_FOUND", + Message: "找不到指定的集群", + RequestId: "rid-" + rands.HexString(12), + }, nil + } + + serviceDomain := strings.TrimSpace(cluster.ServiceDomain) + if len(serviceDomain) == 0 { + return &pb.TestHTTPDNSResolveResponse{ + Code: "NO_SERVICE_DOMAIN", + Message: "该集群未配置服务域名", + RequestId: "rid-" + rands.HexString(12), + }, nil + } + + // 构造请求转发到 EdgeHttpDNS 节点 + secret, err := models.SharedHTTPDNSAppSecretDAO.FindEnabledAppSecret(this.NullTx(), int64(app.Id)) + if err != nil { + return nil, err + } + + port := "443" + if len(cluster.TLSPolicy) > 0 { + var tlsConfig map[string]interface{} + if err := json.Unmarshal(cluster.TLSPolicy, &tlsConfig); err == nil { + if listenRaw, ok := tlsConfig["listen"]; ok && listenRaw != nil { + if data, err := json.Marshal(listenRaw); err == nil { + var listenAddresses []map[string]interface{} + if err := json.Unmarshal(data, &listenAddresses); err == nil { + if len(listenAddresses) > 0 { + if portRange, ok := listenAddresses[0]["portRange"].(string); ok && len(portRange) > 0 { + port = portRange + } + } + } + } + } + } + } + + query := url.Values{} + query.Set("appId", req.AppId) + query.Set("dn", req.Domain) + query.Set("qtype", qtype) + if len(req.ClientIP) > 0 { + query.Set("cip", req.ClientIP) + } + if len(req.Sid) > 0 { + query.Set("sid", req.Sid) + } + if len(req.SdkVersion) > 0 { + query.Set("sdk_version", req.SdkVersion) + } + if len(req.Os) > 0 { + query.Set("os", req.Os) + } + + // 应用开启验签时，沙盒自动生成签名参数，避免测试请求被拒绝 + if secret != nil && secret.SignEnabled { + signSecret := strings.TrimSpace(secret.SignSecret) + if len(signSecret) == 0 { + return &pb.TestHTTPDNSResolveResponse{ + Code: "SIGN_INVALID", + Message: "应用开启了请求验签，但未配置有效加签 Secret", + RequestId: "rid-" + rands.HexString(12), + Domain: req.Domain, + Qtype: qtype, + }, nil + } + + exp := strconv.FormatInt(time.Now().Unix()+300, 10) + nonce := "sandbox-" + rands.HexString(16) + sign := buildSandboxResolveSign(signSecret, req.AppId, req.Domain, qtype, exp, nonce) + + query.Set("exp", exp) + query.Set("nonce", nonce) + query.Set("sign", sign) + } + + resolveURL := "https://" + serviceDomain + ":" + port + "/resolve?" + query.Encode() + + httpClient := &http.Client{ + Timeout: 5 * time.Second, + Transport: &http.Transport{ + TLSClientConfig: &tls.Config{ + InsecureSkipVerify: true, // 沙盒测试环境允许自签名证书 + }, + }, + } + + httpReq, err := http.NewRequestWithContext(ctx, http.MethodGet, resolveURL, nil) + if err != nil { + return nil, fmt.Errorf("构建请求失败: %w", err) + } + + resp, err := httpClient.Do(httpReq) + if err != nil { + return &pb.TestHTTPDNSResolveResponse{ + Code: "NODE_UNREACHABLE", + Message: "无法连接到 HTTPDNS 节点: " + err.Error(), + RequestId: "rid-" + rands.HexString(12), + Domain: req.Domain, + Qtype: qtype, + }, nil + } + defer resp.Body.Close() + + body, err := io.ReadAll(io.LimitReader(resp.Body, 64*1024)) + if err != nil { + return nil, fmt.Errorf("读取节点响应失败: %w", err) + } + + // 解析节点返回的 JSON + var nodeResp nodeResolveResponse + if err := json.Unmarshal(body, &nodeResp); err != nil { + return &pb.TestHTTPDNSResolveResponse{ + Code: "PARSE_ERROR", + Message: "解析节点返回数据失败: " + err.Error(), + RequestId: "rid-" + rands.HexString(12), + Domain: req.Domain, + Qtype: qtype, + }, nil + } + + // 映射节点响应到 protobuf 响应 + pbResp := &pb.TestHTTPDNSResolveResponse{ + Code: nodeResp.Code, + Message: nodeResp.Message, + RequestId: nodeResp.RequestID, + Domain: req.Domain, + Qtype: qtype, + } + + if nodeResp.Data != nil { + pbResp.Ttl = nodeResp.Data.TTL + pbResp.Summary = nodeResp.Data.Summary + + if nodeResp.Data.Client != nil { + pbResp.ClientIP = nodeResp.Data.Client.IP + pbResp.ClientRegion = nodeResp.Data.Client.Region + pbResp.ClientCarrier = nodeResp.Data.Client.Carrier + pbResp.ClientCountry = nodeResp.Data.Client.Country + } + + for _, rec := range nodeResp.Data.Records { + pbResp.Records = append(pbResp.Records, &pb.HTTPDNSResolveRecord{ + Type: rec.Type, + Ip: rec.IP, + Ttl: nodeResp.Data.TTL, + Weight: rec.Weight, + Line: rec.Line, + Region: rec.Region, + }) + } + } + + return pbResp, nil +} + +func buildSandboxResolveSign(signSecret string, appID string, domain string, qtype string, exp string, nonce string) string { + raw := strings.TrimSpace(appID) + "|" + strings.ToLower(strings.TrimSpace(domain)) + "|" + strings.ToUpper(strings.TrimSpace(qtype)) + "|" + strings.TrimSpace(exp) + "|" + strings.TrimSpace(nonce) + mac := hmac.New(sha256.New, []byte(strings.TrimSpace(signSecret))) + _, _ = mac.Write([]byte(raw)) + return hex.EncodeToString(mac.Sum(nil)) +} diff --git a/EdgeAPI/internal/rpc/services/httpdns/task_notify.go b/EdgeAPI/internal/rpc/services/httpdns/task_notify.go new file mode 100644 index 0000000..b87301b --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/task_notify.go @@ -0,0 +1,47 @@ +package httpdns + +import ( + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + "github.com/iwind/TeaGo/dbs" +) + +func notifyHTTPDNSClusterTask(tx *dbs.Tx, clusterId int64, taskType models.NodeTaskType) error { + if clusterId <= 0 { + return nil + } + return models.SharedNodeTaskDAO.CreateClusterTask(tx, nodeconfigs.NodeRoleHTTPDNS, clusterId, 0, 0, taskType) +} + +func notifyHTTPDNSAppTasksByApp(tx *dbs.Tx, app *models.HTTPDNSApp, taskType models.NodeTaskType) error { + if app == nil { + return nil + } + + clusterIds := models.SharedHTTPDNSAppDAO.ReadAppClusterIds(app) + notified := map[int64]bool{} + for _, clusterId := range clusterIds { + if clusterId <= 0 || notified[clusterId] { + continue + } + notified[clusterId] = true + err := notifyHTTPDNSClusterTask(tx, clusterId, taskType) + if err != nil { + return err + } + } + + return nil +} + +func notifyHTTPDNSAppTasksByAppDbId(tx *dbs.Tx, appDbId int64, taskType models.NodeTaskType) error { + if appDbId <= 0 { + return nil + } + + app, err := models.SharedHTTPDNSAppDAO.FindEnabledApp(tx, appDbId) + if err != nil { + return err + } + return notifyHTTPDNSAppTasksByApp(tx, app, taskType) +} diff --git a/EdgeAPI/internal/rpc/services/httpdns/user_auth_helpers.go b/EdgeAPI/internal/rpc/services/httpdns/user_auth_helpers.go new file mode 100644 index 0000000..87604b4 --- /dev/null +++ b/EdgeAPI/internal/rpc/services/httpdns/user_auth_helpers.go @@ -0,0 +1,81 @@ +package httpdns + +import ( + "errors" + "strings" + + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/iwind/TeaGo/dbs" +) + +func ensureAppAccess(tx *dbs.Tx, appDbId int64, userId int64) (*models.HTTPDNSApp, error) { + app, err := models.SharedHTTPDNSAppDAO.FindEnabledApp(tx, appDbId) + if err != nil { + return nil, err + } + if app == nil { + return nil, nil + } + if userId > 0 && app.UserId != userId { + return nil, errors.New("access denied") + } + return app, nil +} + +func ensureAppAccessByAppId(tx *dbs.Tx, appId string, userId int64) (*models.HTTPDNSApp, error) { + appId = strings.TrimSpace(appId) + if len(appId) == 0 { + return nil, nil + } + app, err := models.SharedHTTPDNSAppDAO.FindEnabledAppWithAppId(tx, appId) + if err != nil { + return nil, err + } + if app == nil { + return nil, nil + } + if userId > 0 && app.UserId != userId { + return nil, errors.New("access denied") + } + return app, nil +} + +func ensureDomainAccess(tx *dbs.Tx, domainId int64, userId int64) (*models.HTTPDNSDomain, *models.HTTPDNSApp, error) { + domain, err := models.SharedHTTPDNSDomainDAO.FindEnabledDomain(tx, domainId) + if err != nil { + return nil, nil, err + } + if domain == nil { + return nil, nil, nil + } + + app, err := ensureAppAccess(tx, int64(domain.AppId), userId) + if err != nil { + return nil, nil, err + } + if app == nil { + return nil, nil, nil + } + + return domain, app, nil +} + +func ensureRuleAccess(tx *dbs.Tx, ruleId int64, userId int64) (*models.HTTPDNSCustomRule, *models.HTTPDNSApp, error) { + rule, err := models.SharedHTTPDNSCustomRuleDAO.FindEnabledRule(tx, ruleId) + if err != nil { + return nil, nil, err + } + if rule == nil { + return nil, nil, nil + } + + app, err := ensureAppAccess(tx, int64(rule.AppId), userId) + if err != nil { + return nil, nil, err + } + if app == nil { + return nil, nil, nil + } + + return rule, app, nil +} diff --git a/EdgeAPI/internal/rpc/services/nameservers/service_ns_node.go b/EdgeAPI/internal/rpc/services/nameservers/service_ns_node.go index 3cb4a33..ecbbeb6 100644 --- a/EdgeAPI/internal/rpc/services/nameservers/service_ns_node.go +++ b/EdgeAPI/internal/rpc/services/nameservers/service_ns_node.go @@ -12,6 +12,7 @@ import ( "github.com/TeaOSLab/EdgeAPI/internal/goman" "github.com/TeaOSLab/EdgeAPI/internal/installers" "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" + "github.com/TeaOSLab/EdgeAPI/internal/setup" rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" @@ -484,6 +485,12 @@ func (this *NSNodeService) DownloadNSNodeInstallationFile(ctx context.Context, r return nil, err } + // 检查自动升级开关 + upgradeConfig, _ := setup.LoadUpgradeConfig() + if upgradeConfig != nil && !upgradeConfig.AutoUpgrade { + return &pb.DownloadNSNodeInstallationFileResponse{}, nil + } + var file = installers.SharedDeployManager.FindNSNodeFile(req.Os, req.Arch) if file == nil { return &pb.DownloadNSNodeInstallationFileResponse{}, nil @@ -738,3 +745,109 @@ func (this *NSNodeService) UpdateNSNodeAPIConfig(ctx context.Context, req *pb.Up return this.Success() } + +// FindAllUpgradeNSNodesWithNSClusterId 列出所有需要升级的NS节点 +func (this *NSNodeService) FindAllUpgradeNSNodesWithNSClusterId(ctx context.Context, req *pb.FindAllUpgradeNSNodesWithNSClusterIdRequest) (*pb.FindAllUpgradeNSNodesWithNSClusterIdResponse, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + + var tx = this.NullTx() + deployFiles := installers.SharedDeployManager.LoadNSNodeFiles() + var result []*pb.FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade + for _, deployFile := range deployFiles { + nodes, err := models.SharedNSNodeDAO.FindAllLowerVersionNodesWithClusterId(tx, req.NsClusterId, deployFile.OS, deployFile.Arch, deployFile.Version) + if err != nil { + return nil, err + } + for _, node := range nodes { + // 解析状态获取当前版本 + var oldVersion string + if len(node.Status) > 0 { + var statusMap map[string]interface{} + if json.Unmarshal(node.Status, &statusMap) == nil { + if v, ok := statusMap["buildVersion"]; ok { + oldVersion, _ = v.(string) + } + } + } + + // 安装信息 + installStatus, installErr := node.DecodeInstallStatus() + if installErr != nil { + return nil, installErr + } + pbInstallStatus := &pb.NodeInstallStatus{} + if installStatus != nil { + pbInstallStatus = &pb.NodeInstallStatus{ + IsRunning: installStatus.IsRunning, + IsFinished: installStatus.IsFinished, + IsOk: installStatus.IsOk, + Error: installStatus.Error, + ErrorCode: installStatus.ErrorCode, + UpdatedAt: installStatus.UpdatedAt, + } + } + + // 认证信息 + login, loginErr := models.SharedNodeLoginDAO.FindEnabledNodeLoginWithNodeId(tx, nodeconfigs.NodeRoleDNS, int64(node.Id)) + if loginErr != nil { + return nil, loginErr + } + var pbLogin *pb.NodeLogin + if login != nil { + pbLogin = &pb.NodeLogin{ + Id: int64(login.Id), + Name: login.Name, + Type: login.Type, + Params: login.Params, + } + } + + result = append(result, &pb.FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade{ + NsNode: &pb.NSNode{ + Id: int64(node.Id), + Name: node.Name, + IsOn: node.IsOn, + UniqueId: node.UniqueId, + IsInstalled: node.IsInstalled, + IsUp: node.IsUp, + IsActive: node.IsActive, + StatusJSON: node.Status, + InstallStatus: pbInstallStatus, + NodeLogin: pbLogin, + }, + Os: deployFile.OS, + Arch: deployFile.Arch, + OldVersion: oldVersion, + NewVersion: deployFile.Version, + }) + } + } + return &pb.FindAllUpgradeNSNodesWithNSClusterIdResponse{Nodes: result}, nil +} + +// UpgradeNSNode 升级单个NS节点 +func (this *NSNodeService) UpgradeNSNode(ctx context.Context, req *pb.UpgradeNSNodeRequest) (*pb.RPCSuccess, error) { + _, err := this.ValidateAdmin(ctx) + if err != nil { + return nil, err + } + + var tx = this.NullTx() + + err = models.SharedNSNodeDAO.UpdateNodeIsInstalled(tx, req.NsNodeId, false) + if err != nil { + return nil, err + } + + goman.New(func() { + installErr := installers.SharedNSNodeQueue().InstallNodeProcess(req.NsNodeId, true) + if installErr != nil { + logs.Println("[RPC]upgrade dns node:" + installErr.Error()) + } + }) + + return this.Success() +} diff --git a/EdgeAPI/internal/rpc/services/service_base.go b/EdgeAPI/internal/rpc/services/service_base.go index 66fb9fe..661ba99 100644 --- a/EdgeAPI/internal/rpc/services/service_base.go +++ b/EdgeAPI/internal/rpc/services/service_base.go @@ -83,6 +83,12 @@ func (this *BaseService) ValidateNSNode(ctx context.Context) (nodeId int64, err return } +// ValidateHTTPDNSNode 校验HTTPDNS节点 +func (this *BaseService) ValidateHTTPDNSNode(ctx context.Context) (nodeId int64, err error) { + _, _, nodeId, err = rpcutils.ValidateRequest(ctx, rpcutils.UserTypeHTTPDNS) + return +} + // ValidateUserNode 校验用户节点 func (this *BaseService) ValidateUserNode(ctx context.Context, canRest bool) (userId int64, err error) { // 不允许REST调用 @@ -105,7 +111,7 @@ func (this *BaseService) ValidateAuthorityNode(ctx context.Context) (nodeId int6 func (this *BaseService) ValidateNodeId(ctx context.Context, roles ...rpcutils.UserType) (role rpcutils.UserType, nodeIntId int64, err error) { // 默认包含大部分节点 if len(roles) == 0 { - roles = []rpcutils.UserType{rpcutils.UserTypeNode, rpcutils.UserTypeCluster, rpcutils.UserTypeAdmin, rpcutils.UserTypeUser, rpcutils.UserTypeDNS, rpcutils.UserTypeReport, rpcutils.UserTypeLog, rpcutils.UserTypeAPI} + roles = []rpcutils.UserType{rpcutils.UserTypeNode, rpcutils.UserTypeCluster, rpcutils.UserTypeAdmin, rpcutils.UserTypeUser, rpcutils.UserTypeDNS, rpcutils.UserTypeHTTPDNS, rpcutils.UserTypeReport, rpcutils.UserTypeLog, rpcutils.UserTypeAPI} } if ctx == nil { @@ -191,6 +197,8 @@ func (this *BaseService) ValidateNodeId(ctx context.Context, roles ...rpcutils.U nodeIntId = 0 case rpcutils.UserTypeDNS: nodeIntId, err = models.SharedNSNodeDAO.FindEnabledNodeIdWithUniqueId(nil, nodeId) + case rpcutils.UserTypeHTTPDNS: + nodeIntId, err = models.SharedHTTPDNSNodeDAO.FindEnabledNodeIdWithUniqueId(nil, nodeId) case rpcutils.UserTypeReport: nodeIntId, err = models.SharedReportNodeDAO.FindEnabledNodeIdWithUniqueId(nil, nodeId) case rpcutils.UserTypeAuthority: diff --git a/EdgeAPI/internal/rpc/services/service_node.go b/EdgeAPI/internal/rpc/services/service_node.go index 723f76b..25b82b2 100644 --- a/EdgeAPI/internal/rpc/services/service_node.go +++ b/EdgeAPI/internal/rpc/services/service_node.go @@ -12,6 +12,7 @@ import ( "github.com/TeaOSLab/EdgeAPI/internal/installers" "github.com/TeaOSLab/EdgeAPI/internal/remotelogs" rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils" + "github.com/TeaOSLab/EdgeAPI/internal/setup" "github.com/TeaOSLab/EdgeAPI/internal/utils" "github.com/TeaOSLab/EdgeAPI/internal/utils/numberutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" @@ -1716,6 +1717,12 @@ func (this *NodeService) DownloadNodeInstallationFile(ctx context.Context, req * return nil, err } + // 检查自动升级开关 + upgradeConfig, _ := setup.LoadUpgradeConfig() + if upgradeConfig != nil && !upgradeConfig.AutoUpgrade { + return &pb.DownloadNodeInstallationFileResponse{}, nil + } + var file = installers.SharedDeployManager.FindNodeFile(req.Os, req.Arch) if file == nil { return &pb.DownloadNodeInstallationFileResponse{}, nil diff --git a/EdgeAPI/internal/rpc/services/service_node_task.go b/EdgeAPI/internal/rpc/services/service_node_task.go index 5651fb7..b7fa3a7 100644 --- a/EdgeAPI/internal/rpc/services/service_node_task.go +++ b/EdgeAPI/internal/rpc/services/service_node_task.go @@ -19,7 +19,7 @@ type NodeTaskService struct { // FindNodeTasks 获取单节点同步任务 func (this *NodeTaskService) FindNodeTasks(ctx context.Context, req *pb.FindNodeTasksRequest) (*pb.FindNodeTasksResponse, error) { - nodeType, nodeId, err := this.ValidateNodeId(ctx, rpcutils.UserTypeNode, rpcutils.UserTypeDNS) + nodeType, nodeId, err := this.ValidateNodeId(ctx, rpcutils.UserTypeNode, rpcutils.UserTypeDNS, rpcutils.UserTypeHTTPDNS) if err != nil { return nil, err } @@ -65,7 +65,7 @@ func (this *NodeTaskService) FindNodeTasks(ctx context.Context, req *pb.FindNode // ReportNodeTaskDone 报告同步任务结果 func (this *NodeTaskService) ReportNodeTaskDone(ctx context.Context, req *pb.ReportNodeTaskDoneRequest) (*pb.RPCSuccess, error) { - _, _, err := this.ValidateNodeId(ctx, rpcutils.UserTypeNode, rpcutils.UserTypeDNS) + _, _, err := this.ValidateNodeId(ctx, rpcutils.UserTypeNode, rpcutils.UserTypeDNS, rpcutils.UserTypeHTTPDNS) if err != nil { return nil, err } diff --git a/EdgeAPI/internal/rpc/services/users/service_user.go b/EdgeAPI/internal/rpc/services/users/service_user.go index afe7ee3..55c4931 100644 --- a/EdgeAPI/internal/rpc/services/users/service_user.go +++ b/EdgeAPI/internal/rpc/services/users/service_user.go @@ -71,7 +71,7 @@ func (this *UserService) UpdateUser(ctx context.Context, req *pb.UpdateUserReque return nil, err } - err = models.SharedUserDAO.UpdateUser(tx, req.UserId, req.Username, req.Password, req.Fullname, req.Mobile, req.Tel, req.Email, req.Remark, req.IsOn, req.NodeClusterId, req.BandwidthAlgo) + err = models.SharedUserDAO.UpdateUser(tx, req.UserId, req.Username, req.Password, req.Fullname, req.Mobile, req.Tel, req.Email, req.Remark, req.IsOn, req.NodeClusterId, req.BandwidthAlgo, req.HttpdnsClusterIdsJSON) if err != nil { return nil, err } @@ -242,6 +242,20 @@ func (this *UserService) FindEnabledUser(ctx context.Context, req *pb.FindEnable } } + // 用户功能列表 + var pbFeatures []*pb.UserFeature + userFeatures, err := models.SharedUserDAO.FindUserFeatures(tx, req.UserId) + if err != nil { + return nil, err + } + for _, f := range userFeatures { + pbFeatures = append(pbFeatures, &pb.UserFeature{ + Name: f.Name, + Code: f.Code, + Description: f.Description, + }) + } + return &pb.FindEnabledUserResponse{ User: &pb.User{ Id: int64(user.Id), @@ -265,6 +279,8 @@ func (this *UserService) FindEnabledUser(ctx context.Context, req *pb.FindEnable BandwidthAlgo: user.BandwidthAlgo, OtpLogin: pbOtpAuth, Lang: user.Lang, + Features: pbFeatures, + HttpdnsClusterIdsJSON: user.HttpdnsClusterIds, }, }, nil } diff --git a/EdgeAPI/internal/rpc/services/users/service_user_ext_plus.go b/EdgeAPI/internal/rpc/services/users/service_user_ext_plus.go index c106a0c..2038d6f 100644 --- a/EdgeAPI/internal/rpc/services/users/service_user_ext_plus.go +++ b/EdgeAPI/internal/rpc/services/users/service_user_ext_plus.go @@ -5,6 +5,7 @@ package users import ( "context" + "encoding/json" "errors" "github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -142,13 +143,24 @@ func (this *UserService) RegisterUser(ctx context.Context, req *pb.RegisterUserR return errors.New("the username exists already") } + features := registerConfig.Features + // 创建用户 - userId, err := models.SharedUserDAO.CreateUser(tx, req.Username, req.Password, req.Fullname, req.Mobile, "", req.Email, "", req.Source, registerConfig.ClusterId, registerConfig.Features, req.Ip, !registerConfig.RequireVerification) + userId, err := models.SharedUserDAO.CreateUser(tx, req.Username, req.Password, req.Fullname, req.Mobile, "", req.Email, "", req.Source, registerConfig.ClusterId, features, req.Ip, !registerConfig.RequireVerification) if err != nil { return err } createdUserId = userId + // 自动关联默认 HTTPDNS 集群 + if registerConfig.HTTPDNSIsOn && len(registerConfig.HTTPDNSDefaultClusterIds) > 0 { + httpdnsJSON, _ := json.Marshal(registerConfig.HTTPDNSDefaultClusterIds) + err = models.SharedUserDAO.UpdateUserHttpdnsClusterIds(tx, userId, httpdnsJSON) + if err != nil { + return err + } + } + // 发送激活邮件 if len(req.Email) > 0 && registerConfig.EmailVerification.IsOn { _, err := models.SharedUserEmailVerificationDAO.CreateVerification(tx, userId, req.Email) diff --git a/EdgeAPI/internal/rpc/utils/utils.go b/EdgeAPI/internal/rpc/utils/utils.go index 6ea6906..cb9f459 100644 --- a/EdgeAPI/internal/rpc/utils/utils.go +++ b/EdgeAPI/internal/rpc/utils/utils.go @@ -16,6 +16,7 @@ const ( UserTypeCluster = "cluster" UserTypeStat = "stat" UserTypeDNS = "dns" + UserTypeHTTPDNS = "httpdns" UserTypeLog = "log" UserTypeAPI = "api" UserTypeAuthority = "authority" diff --git a/EdgeAPI/internal/rpc/utils/utils_ext.go b/EdgeAPI/internal/rpc/utils/utils_ext.go index aa8c0aa..a1ae946 100644 --- a/EdgeAPI/internal/rpc/utils/utils_ext.go +++ b/EdgeAPI/internal/rpc/utils/utils_ext.go @@ -142,6 +142,16 @@ func ValidateRequest(ctx context.Context, userTypes ...UserType) (userType UserT return UserTypeUser, 0, 0, errors.New("context: not found node with id '" + nodeId + "'") } resultNodeId = nodeIntId + case UserTypeHTTPDNS: + nodeIntId, err := models.SharedHTTPDNSNodeDAO.FindEnabledNodeIdWithUniqueId(nil, nodeId) + if err != nil { + return UserTypeHTTPDNS, nodeIntId, 0, errors.New("context: " + err.Error()) + } + if nodeIntId <= 0 { + return UserTypeHTTPDNS, nodeIntId, 0, errors.New("context: not found node with id '" + nodeId + "'") + } + nodeUserId = nodeIntId + resultNodeId = nodeIntId } if nodeUserId > 0 { diff --git a/EdgeAPI/internal/rpc/utils/utils_ext_plus.go b/EdgeAPI/internal/rpc/utils/utils_ext_plus.go index 49d8784..8a9e133 100644 --- a/EdgeAPI/internal/rpc/utils/utils_ext_plus.go +++ b/EdgeAPI/internal/rpc/utils/utils_ext_plus.go @@ -171,6 +171,16 @@ func ValidateRequest(ctx context.Context, userTypes ...UserType) (userType UserT } nodeUserId = nodeIntId resultNodeId = nodeIntId + case UserTypeHTTPDNS: + nodeIntId, err := models.SharedHTTPDNSNodeDAO.FindEnabledNodeIdWithUniqueId(nil, nodeId) + if err != nil { + return UserTypeHTTPDNS, nodeIntId, 0, errors.New("context: " + err.Error()) + } + if nodeIntId <= 0 { + return UserTypeHTTPDNS, nodeIntId, 0, errors.New("context: not found node with id '" + nodeId + "'") + } + nodeUserId = nodeIntId + resultNodeId = nodeIntId case UserTypeReport: nodeIntId, err := models.SharedReportNodeDAO.FindEnabledNodeIdWithUniqueId(nil, nodeId) if err != nil { diff --git a/EdgeAPI/internal/setup/clickhouse_upgrade.go b/EdgeAPI/internal/setup/clickhouse_upgrade.go new file mode 100644 index 0000000..e7690d4 --- /dev/null +++ b/EdgeAPI/internal/setup/clickhouse_upgrade.go @@ -0,0 +1,132 @@ +package setup + +import ( + "context" + "strings" + "time" + + "github.com/TeaOSLab/EdgeAPI/internal/clickhouse" +) + +// EnsureClickHouseTables 自动确保日志相关 ClickHouse 表存在。 +// 仅做 CREATE TABLE IF NOT EXISTS，不会覆盖已有表结构。 +func EnsureClickHouseTables() error { + client := clickhouse.NewClient() + if !client.IsConfigured() { + return nil + } + + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + defer cancel() + + sqls := []string{ + `CREATE TABLE IF NOT EXISTS logs_ingest +( + timestamp DateTime CODEC(DoubleDelta, ZSTD(1)), + node_id UInt64, + cluster_id UInt64, + server_id UInt64, + host LowCardinality(String), + ip String, + method LowCardinality(String), + path String CODEC(ZSTD(1)), + status UInt16, + bytes_in UInt64 CODEC(Delta, ZSTD(1)), + bytes_out UInt64 CODEC(Delta, ZSTD(1)), + cost_ms UInt32 CODEC(Delta, ZSTD(1)), + ua String CODEC(ZSTD(1)), + referer String CODEC(ZSTD(1)), + log_type LowCardinality(String), + trace_id String, + firewall_policy_id UInt64 DEFAULT 0, + firewall_rule_group_id UInt64 DEFAULT 0, + firewall_rule_set_id UInt64 DEFAULT 0, + firewall_rule_id UInt64 DEFAULT 0, + request_headers String DEFAULT '' CODEC(ZSTD(3)), + request_body String DEFAULT '' CODEC(ZSTD(3)), + response_headers String DEFAULT '' CODEC(ZSTD(3)), + response_body String DEFAULT '' CODEC(ZSTD(3)), + INDEX idx_trace_id trace_id TYPE bloom_filter(0.01) GRANULARITY 4, + INDEX idx_ip ip TYPE bloom_filter(0.01) GRANULARITY 4, + INDEX idx_host host TYPE tokenbf_v1(10240, 3, 0) GRANULARITY 4, + INDEX idx_fw_policy firewall_policy_id TYPE minmax GRANULARITY 4, + INDEX idx_status status TYPE minmax GRANULARITY 4 +) +ENGINE = MergeTree +PARTITION BY toYYYYMMDD(timestamp) +ORDER BY (timestamp, node_id, server_id, trace_id) +SETTINGS index_granularity = 8192`, + `CREATE TABLE IF NOT EXISTS dns_logs_ingest +( + timestamp DateTime CODEC(DoubleDelta, ZSTD(1)), + request_id String, + node_id UInt64, + cluster_id UInt64, + domain_id UInt64, + record_id UInt64, + remote_addr String, + question_name String, + question_type LowCardinality(String), + record_name String, + record_type LowCardinality(String), + record_value String, + networking LowCardinality(String), + is_recursive UInt8, + error String CODEC(ZSTD(1)), + ns_route_codes Array(String), + content_json String DEFAULT '' CODEC(ZSTD(3)), + INDEX idx_request_id request_id TYPE bloom_filter(0.01) GRANULARITY 4, + INDEX idx_remote_addr remote_addr TYPE bloom_filter(0.01) GRANULARITY 4, + INDEX idx_question_name question_name TYPE tokenbf_v1(10240, 3, 0) GRANULARITY 4, + INDEX idx_domain_id domain_id TYPE minmax GRANULARITY 4 +) +ENGINE = MergeTree +PARTITION BY toYYYYMMDD(timestamp) +ORDER BY (timestamp, request_id, node_id) +SETTINGS index_granularity = 8192`, + `CREATE TABLE IF NOT EXISTS httpdns_access_logs_ingest +( + request_id String, + cluster_id UInt64, + node_id UInt64, + app_id String, + app_name String, + domain String, + qtype LowCardinality(String), + client_ip String, + client_region String, + carrier String, + sdk_version String, + os LowCardinality(String), + result_ips String, + status LowCardinality(String), + error_code String, + cost_ms UInt32, + created_at UInt64, + day String, + summary String CODEC(ZSTD(1)), + INDEX idx_request_id request_id TYPE bloom_filter(0.01) GRANULARITY 4, + INDEX idx_cluster_id cluster_id TYPE minmax GRANULARITY 4, + INDEX idx_node_id node_id TYPE minmax GRANULARITY 4, + INDEX idx_app_id app_id TYPE tokenbf_v1(10240, 3, 0) GRANULARITY 4, + INDEX idx_domain domain TYPE tokenbf_v1(10240, 3, 0) GRANULARITY 4, + INDEX idx_status status TYPE minmax GRANULARITY 4 +) +ENGINE = MergeTree +PARTITION BY day +ORDER BY (day, created_at, request_id, node_id) +SETTINGS index_granularity = 8192`, + } + + for _, sql := range sqls { + stmt := strings.TrimSpace(sql) + if len(stmt) == 0 { + continue + } + if err := client.Execute(ctx, stmt); err != nil { + return err + } + } + + return nil +} diff --git a/EdgeAPI/internal/setup/sql_upgrade.go b/EdgeAPI/internal/setup/sql_upgrade.go index ff0e77b..40b789f 100644 --- a/EdgeAPI/internal/setup/sql_upgrade.go +++ b/EdgeAPI/internal/setup/sql_upgrade.go @@ -110,6 +110,12 @@ var upgradeFuncs = []*upgradeVersion{ { "1.4.4", upgradeV1_4_4, }, + { + "1.4.8", upgradeV1_4_8, + }, + { + "1.4.9", upgradeV1_4_9, + }, } // UpgradeSQLData 升级SQL数据 @@ -269,14 +275,14 @@ func upgradeV0_0_10(db *dbs.DB) error { // v0.2.5 func upgradeV0_2_5(db *dbs.DB) error { - // 更新用户 + // 鏇存柊鐢ㄦ埛 _, err := db.Exec("UPDATE edgeUsers SET day=FROM_UNIXTIME(createdAt,'%Y%m%d') WHERE day IS NULL OR LENGTH(day)=0") if err != nil { return err } - // 更新防火墙规则 - ones, _, err := db.FindOnes("SELECT id, actions, action, actionOptions FROM edgeHTTPFirewallRuleSets WHERE actions IS NULL OR LENGTH(actions)=0") + // 更新防火墙规则 + ones, _, err := db.FindOnes("SELECT id, actions, action, actionOptions FROM edgeHTTPFirewallRuleSets WHERE actions IS NULL OR LENGTH(actions)=0") if err != nil { return err } @@ -309,8 +315,8 @@ func upgradeV0_2_5(db *dbs.DB) error { // v0.3.0 func upgradeV0_3_0(db *dbs.DB) error { - // 升级健康检查 - ones, _, err := db.FindOnes("SELECT id,healthCheck FROM edgeNodeClusters WHERE state=1") + // 升级健康检查 + ones, _, err := db.FindOnes("SELECT id,healthCheck FROM edgeNodeClusters WHERE state=1") if err != nil { return err } @@ -342,11 +348,10 @@ func upgradeV0_3_0(db *dbs.DB) error { // v0.3.1 func upgradeV0_3_1(db *dbs.DB) error { - // 清空域名统计，已使用分表代替 - // 因为可能有权限问题，所以我们忽略错误 - _, _ = db.Exec("TRUNCATE table edgeServerDomainHourlyStats") + // 娓呯┖鍩熷悕缁熻锛屽凡浣跨敤鍒嗚〃浠ｆ浛 + // 鍥犱负鍙兘鏈夋潈闄愰棶棰橈紝鎵€浠ユ垜浠拷鐣ラ敊璇? _, _ = db.Exec("TRUNCATE table edgeServerDomainHourlyStats") - // 升级APIToken + // 鍗囩骇APIToken ones, _, err := db.FindOnes("SELECT uniqueId,secret FROM edgeNodeClusters") if err != nil { return err @@ -374,9 +379,9 @@ func upgradeV0_3_2(db *dbs.DB) error { // gzip => compression type HTTPGzipRef struct { - IsPrior bool `yaml:"isPrior" json:"isPrior"` // 是否覆盖 - IsOn bool `yaml:"isOn" json:"isOn"` // 是否开启 - GzipId int64 `yaml:"gzipId" json:"gzipId"` // 使用的配置ID + IsPrior bool `yaml:"isPrior" json:"isPrior"` // 鏄惁瑕嗙洊 + IsOn bool `yaml:"isOn" json:"isOn"` // 是否开启 + GzipId int64 `yaml:"gzipId" json:"gzipId"` // 使用的配置ID } webOnes, _, err := db.FindOnes("SELECT id, gzip FROM edgeHTTPWebs WHERE gzip IS NOT NULL AND compression IS NULL") @@ -458,7 +463,7 @@ func upgradeV0_3_2(db *dbs.DB) error { } } - // 更新服务端口 + // 鏇存柊鏈嶅姟绔彛 var serverDAO = models.NewServerDAO() ones, err := serverDAO.Query(nil). ResultPk(). @@ -479,14 +484,14 @@ func upgradeV0_3_2(db *dbs.DB) error { // v0.3.3 func upgradeV0_3_3(db *dbs.DB) error { - // 升级CC请求数Code - _, err := db.Exec("UPDATE edgeHTTPFirewallRuleSets SET code='8002' WHERE name='CC请求数' AND code='8001'") + // 鍗囩骇CC璇锋眰鏁癈ode + _, err := db.Exec("UPDATE edgeHTTPFirewallRuleSets SET code='8002' WHERE name='CC璇锋眰鏁? AND code='8001'") if err != nil { return err } - // 清除节点 - // 删除7天以前的info日志 + // 娓呴櫎鑺傜偣 + // 鍒犻櫎7澶╀互鍓嶇殑info鏃ュ織 err = models.NewNodeLogDAO().DeleteExpiredLogsWithLevel(nil, "info", 7) if err != nil { return err @@ -497,13 +502,13 @@ func upgradeV0_3_3(db *dbs.DB) error { // v0.3.7 func upgradeV0_3_7(db *dbs.DB) error { - // 修改所有edgeNodeGrants中的su为0 + // 淇敼鎵€鏈塭dgeNodeGrants涓殑su涓? _, err := db.Exec("UPDATE edgeNodeGrants SET su=0 WHERE su=1") if err != nil { return err } - // WAF预置分组 + // WAF棰勭疆鍒嗙粍 _, err = db.Exec("UPDATE edgeHTTPFirewallRuleGroups SET isTemplate=1 WHERE LENGTH(code)>0") if err != nil { return err @@ -514,7 +519,7 @@ func upgradeV0_3_7(db *dbs.DB) error { // v0.4.0 func upgradeV0_4_0(db *dbs.DB) error { - // 升级SYN Flood配置 + // 鍗囩骇SYN Flood閰嶇疆 synFloodJSON, err := json.Marshal(firewallconfigs.NewSYNFloodConfig()) if err == nil { _, err := db.Exec("UPDATE edgeHTTPFirewallPolicies SET synFlood=? WHERE synFlood IS NULL AND state=1", string(synFloodJSON)) @@ -528,13 +533,13 @@ func upgradeV0_4_0(db *dbs.DB) error { // v0.4.1 func upgradeV0_4_1(db *dbs.DB) error { - // 升级 servers.lastUserPlanId + // 鍗囩骇 servers.lastUserPlanId _, err := db.Exec("UPDATE edgeServers SET lastUserPlanId=userPlanId WHERE userPlanId>0") if err != nil { return err } - // 执行域名统计清理 + // 鎵ц鍩熷悕缁熻娓呯悊 err = stats.NewServerDomainHourlyStatDAO().CleanDays(nil, 7) if err != nil { return err @@ -545,7 +550,7 @@ func upgradeV0_4_1(db *dbs.DB) error { // v0.4.5 func upgradeV0_4_5(db *dbs.DB) error { - // 升级访问日志自动分表 + // 鍗囩骇璁块棶鏃ュ織鑷姩鍒嗚〃 { var dao = models.NewSysSettingDAO() valueJSON, err := dao.ReadSetting(nil, systemconfigs.SettingCodeAccessLogQueue) @@ -569,7 +574,7 @@ func upgradeV0_4_5(db *dbs.DB) error { } } - // 升级一个防SQL注入规则 + // 鍗囩骇涓€涓槻SQL娉ㄥ叆瑙勫垯 { ones, _, err := db.FindOnes(`SELECT id FROM edgeHTTPFirewallRules WHERE value=?`, "(updatexml|extractvalue|ascii|ord|char|chr|count|concat|rand|floor|substr|length|len|user|database|benchmark|analyse)\\s*\\(") if err != nil { @@ -589,7 +594,7 @@ func upgradeV0_4_5(db *dbs.DB) error { // v0.4.7 func upgradeV0_4_7(db *dbs.DB) error { - // 升级 edgeServers 中的 plainServerNames + // 鍗囩骇 edgeServers 涓殑 plainServerNames { ones, _, err := db.FindOnes("SELECT id,serverNames FROM edgeServers WHERE state=1") if err != nil { @@ -621,7 +626,7 @@ func upgradeV0_4_7(db *dbs.DB) error { // v0.4.8 func upgradeV0_4_8(db *dbs.DB) error { - // 设置edgeIPLists中的serverId + // 璁剧疆edgeIPLists涓殑serverId { firewallPolicyOnes, _, err := db.FindOnes("SELECT inbound,serverId FROM edgeHTTPFirewallPolicies WHERE serverId>0") if err != nil { @@ -673,7 +678,7 @@ func upgradeV0_4_8(db *dbs.DB) error { // v0.4.11 func upgradeV0_4_11(db *dbs.DB) error { - // 升级ns端口 + // 鍗囩骇ns绔彛 { // TCP { @@ -751,19 +756,19 @@ func upgradeV1_2_1(db *dbs.DB) error { // 1.2.10 func upgradeV1_2_10(db *dbs.DB) error { { - type OldGlobalConfig struct { - // HTTP & HTTPS相关配置 - HTTPAll struct { - DomainAuditingIsOn bool `yaml:"domainAuditingIsOn" json:"domainAuditingIsOn"` // 域名是否需要审核 - DomainAuditingPrompt string `yaml:"domainAuditingPrompt" json:"domainAuditingPrompt"` // 域名审核的提示 - } `yaml:"httpAll" json:"httpAll"` + type OldGlobalConfig struct { + // HTTP & HTTPS鐩稿叧閰嶇疆 + HTTPAll struct { + DomainAuditingIsOn bool `yaml:"domainAuditingIsOn" json:"domainAuditingIsOn"` // 域名是否需要审核 + DomainAuditingPrompt string `yaml:"domainAuditingPrompt" json:"domainAuditingPrompt"` // 域名审核提示 + } `yaml:"httpAll" json:"httpAll"` - TCPAll struct { - PortRangeMin int `yaml:"portRangeMin" json:"portRangeMin"` // 最小端口 - PortRangeMax int `yaml:"portRangeMax" json:"portRangeMax"` // 最大端口 - DenyPorts []int `yaml:"denyPorts" json:"denyPorts"` // 禁止使用的端口 - } `yaml:"tcpAll" json:"tcpAll"` - } + TCPAll struct { + PortRangeMin int `yaml:"portRangeMin" json:"portRangeMin"` // 最小端口 + PortRangeMax int `yaml:"portRangeMax" json:"portRangeMax"` // 最大端口 + DenyPorts []int `yaml:"denyPorts" json:"denyPorts"` // 禁止端口 + } `yaml:"tcpAll" json:"tcpAll"` + } globalConfigValue, err := db.FindCol(0, "SELECT value FROM edgeSysSettings WHERE code='serverGlobalConfig'") if err != nil { @@ -1023,7 +1028,7 @@ func upgradeV1_3_2(db *dbs.DB) error { } } - err = addRuleToGroup(ruleGroup.GetInt64("id"), "7010", "SQL注入检测", []*firewallconfigs.HTTPFirewallActionConfig{ + err = addRuleToGroup(ruleGroup.GetInt64("id"), "7010", "SQL注入检测", []*firewallconfigs.HTTPFirewallActionConfig{ { Code: firewallconfigs.HTTPFirewallActionPage, Options: maps.Map{"status": 403, "body": ""}, @@ -1131,7 +1136,7 @@ func upgradeV1_3_2(db *dbs.DB) error { } } - err = addRuleToGroup(ruleGroup.GetInt64("id"), "1010", "XSS攻击检测", []*firewallconfigs.HTTPFirewallActionConfig{ + err = addRuleToGroup(ruleGroup.GetInt64("id"), "1010", "XSS攻击检测", []*firewallconfigs.HTTPFirewallActionConfig{ { Code: firewallconfigs.HTTPFirewallActionPage, Options: maps.Map{"status": 403, "body": ""}, @@ -1233,8 +1238,8 @@ func upgradeV1_3_4(db *dbs.DB) error { // 1.4.4 func upgradeV1_4_4(db *dbs.DB) error { - // 检查 encryption 字段是否已存在 - col, err := db.FindCol(0, "SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='edgeHTTPWebs' AND COLUMN_NAME='encryption'") + // 检查 encryption 字段是否已存在 + col, err := db.FindCol(0, "SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='edgeHTTPWebs' AND COLUMN_NAME='encryption'") if err != nil { return err } @@ -1253,3 +1258,58 @@ func upgradeV1_4_4(db *dbs.DB) error { return nil } + +// 1.4.8 +func upgradeV1_4_8(db *dbs.DB) error { + err := createHTTPDNSTables(db) + if err != nil { + return err + } + + // edgeUsers: 增加 httpdnsClusterIds 字段 + _, alterErr := db.Exec("ALTER TABLE `edgeUsers` ADD COLUMN `httpdnsClusterIds` text DEFAULT NULL") + if alterErr != nil { + if strings.Contains(alterErr.Error(), "Duplicate column") { + return nil + } + return alterErr + } + return nil +} + +// 1.4.9 +func upgradeV1_4_9(db *dbs.DB) error { + _, err := db.Exec("ALTER TABLE `edgeHTTPDNSClusters` ALTER COLUMN `installDir` SET DEFAULT '/root/edge-httpdns'") + if err != nil { + return err + } + + _, err = db.Exec("ALTER TABLE `edgeHTTPDNSNodes` ALTER COLUMN `installDir` SET DEFAULT '/root/edge-httpdns'") + if err != nil { + return err + } + + return nil +} + +func createHTTPDNSTables(db *dbs.DB) error { + sqls := []string{ + "CREATE TABLE IF NOT EXISTS `edgeHTTPDNSClusters` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`name` varchar(255) DEFAULT NULL,`isOn` tinyint unsigned DEFAULT '1',`isDefault` tinyint unsigned DEFAULT '0',`serviceDomain` varchar(255) DEFAULT NULL,`defaultTTL` int unsigned DEFAULT '30',`fallbackTimeoutMs` int unsigned DEFAULT '300',`installDir` varchar(255) DEFAULT '/root/edge-httpdns',`tlsPolicy` json DEFAULT NULL,`autoRemoteStart` tinyint unsigned DEFAULT '0',`accessLogIsOn` tinyint unsigned DEFAULT '0',`timeZone` varchar(128) NOT NULL DEFAULT '',`createdAt` bigint unsigned DEFAULT '0',`updatedAt` bigint unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),KEY `name` (`name`),KEY `isDefault` (`isDefault`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS集群配置表（默认TTL、回退超时、服务域名等）'", + "CREATE TABLE IF NOT EXISTS `edgeHTTPDNSNodes` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`clusterId` bigint unsigned DEFAULT '0',`name` varchar(255) DEFAULT NULL,`isOn` tinyint unsigned DEFAULT '1',`isUp` tinyint unsigned DEFAULT '0',`isInstalled` tinyint unsigned DEFAULT '0',`isActive` tinyint unsigned DEFAULT '0',`uniqueId` varchar(64) DEFAULT NULL,`secret` varchar(64) DEFAULT NULL,`installDir` varchar(255) DEFAULT '/root/edge-httpdns',`status` json DEFAULT NULL,`installStatus` json DEFAULT NULL,`createdAt` bigint unsigned DEFAULT '0',`updatedAt` bigint unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),UNIQUE KEY `uniqueId` (`uniqueId`),KEY `clusterId` (`clusterId`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS节点表（节点基础信息与运行状态）'", + "CREATE TABLE IF NOT EXISTS `edgeHTTPDNSApps` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`name` varchar(255) DEFAULT NULL,`appId` varchar(64) DEFAULT NULL,`isOn` tinyint unsigned DEFAULT '1',`clusterIdsJSON` text DEFAULT NULL,`sniMode` varchar(64) DEFAULT 'fixed_hide',`userId` bigint unsigned DEFAULT '0',`createdAt` bigint unsigned DEFAULT '0',`updatedAt` bigint unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),UNIQUE KEY `appId` (`appId`),KEY `name` (`name`),KEY `userId` (`userId`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS应用表（应用与集群绑定关系）'", + "CREATE TABLE IF NOT EXISTS `edgeHTTPDNSAppSecrets` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`appId` bigint unsigned DEFAULT '0',`signEnabled` tinyint unsigned DEFAULT '0',`signSecret` varchar(255) DEFAULT NULL,`signUpdatedAt` bigint unsigned DEFAULT '0',`updatedAt` bigint unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),UNIQUE KEY `appId` (`appId`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS应用密钥表（请求验签开关与加签Secret）'", + "CREATE TABLE IF NOT EXISTS `edgeHTTPDNSDomains` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`appId` bigint unsigned DEFAULT '0',`domain` varchar(255) DEFAULT NULL,`isOn` tinyint unsigned DEFAULT '1',`createdAt` bigint unsigned DEFAULT '0',`updatedAt` bigint unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),UNIQUE KEY `appId_domain` (`appId`,`domain`),KEY `domain` (`domain`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS应用域名表（应用绑定的业务域名）'", + "CREATE TABLE IF NOT EXISTS `edgeHTTPDNSCustomRules` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`appId` bigint unsigned DEFAULT '0',`domainId` bigint unsigned DEFAULT '0',`ruleName` varchar(255) DEFAULT NULL,`lineScope` varchar(64) DEFAULT NULL,`lineCarrier` varchar(64) DEFAULT NULL,`lineRegion` varchar(64) DEFAULT NULL,`lineProvince` varchar(64) DEFAULT NULL,`lineContinent` varchar(64) DEFAULT NULL,`lineCountry` varchar(128) DEFAULT NULL,`ttl` int unsigned DEFAULT '30',`isOn` tinyint unsigned DEFAULT '1',`priority` int unsigned DEFAULT '0',`updatedAt` bigint unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),KEY `domainId_isOn_priority` (`domainId`,`isOn`,`priority`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS自定义解析规则表（按线路/地域匹配）'", + "CREATE TABLE IF NOT EXISTS `edgeHTTPDNSCustomRuleRecords` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`ruleId` bigint unsigned DEFAULT '0',`recordType` varchar(32) DEFAULT NULL,`recordValue` varchar(255) DEFAULT NULL,`weight` int unsigned DEFAULT '0',`sort` int unsigned DEFAULT '0',`state` tinyint unsigned DEFAULT '1',PRIMARY KEY (`id`),KEY `ruleId` (`ruleId`),KEY `state` (`state`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS自定义规则记录值表（A/AAAA及权重）'", + "CREATE TABLE IF NOT EXISTS `edgeHTTPDNSAccessLogs` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`requestId` varchar(128) DEFAULT NULL,`clusterId` bigint unsigned DEFAULT '0',`nodeId` bigint unsigned DEFAULT '0',`appId` varchar(64) DEFAULT NULL,`appName` varchar(255) DEFAULT NULL,`domain` varchar(255) DEFAULT NULL,`qtype` varchar(16) DEFAULT NULL,`clientIP` varchar(64) DEFAULT NULL,`clientRegion` varchar(255) DEFAULT NULL,`carrier` varchar(128) DEFAULT NULL,`sdkVersion` varchar(64) DEFAULT NULL,`os` varchar(64) DEFAULT NULL,`resultIPs` text,`status` varchar(32) DEFAULT NULL,`errorCode` varchar(64) DEFAULT NULL,`costMs` int unsigned DEFAULT '0',`createdAt` bigint unsigned DEFAULT '0',`day` varchar(8) DEFAULT NULL,`summary` text,PRIMARY KEY (`id`),UNIQUE KEY `requestId_nodeId` (`requestId`,`nodeId`),KEY `day_cluster_node_domain_status_createdAt` (`day`,`clusterId`,`nodeId`,`domain`,`status`,`createdAt`),KEY `appId` (`appId`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS访问日志表（解析请求与结果）'", + "CREATE TABLE IF NOT EXISTS `edgeHTTPDNSRuntimeLogs` (`id` bigint unsigned NOT NULL AUTO_INCREMENT,`clusterId` bigint unsigned DEFAULT '0',`nodeId` bigint unsigned DEFAULT '0',`level` varchar(32) DEFAULT NULL,`type` varchar(64) DEFAULT NULL,`module` varchar(64) DEFAULT NULL,`description` text,`count` bigint unsigned DEFAULT '1',`requestId` varchar(128) DEFAULT NULL,`createdAt` bigint unsigned DEFAULT '0',`day` varchar(8) DEFAULT NULL,PRIMARY KEY (`id`),KEY `day_cluster_node_level_createdAt` (`day`,`clusterId`,`nodeId`,`level`,`createdAt`),KEY `requestId` (`requestId`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='HTTPDNS运行日志表（节点运行与异常日志）'", + } + for _, sql := range sqls { + if _, err := db.Exec(sql); err != nil { + return err + } + } + return nil +} + + diff --git a/EdgeAPI/internal/setup/upgrade_config.go b/EdgeAPI/internal/setup/upgrade_config.go new file mode 100644 index 0000000..99ef559 --- /dev/null +++ b/EdgeAPI/internal/setup/upgrade_config.go @@ -0,0 +1,45 @@ +package setup + +import ( + "encoding/json" + "sync" + "time" + + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" +) + +var ( + sharedUpgradeConfig *systemconfigs.UpgradeConfig + sharedUpgradeConfigTime time.Time + sharedUpgradeConfigMu sync.Mutex +) + +const upgradeConfigTTL = 5 * time.Minute + +// LoadUpgradeConfig 读取升级配置（带5分钟内存缓存） +func LoadUpgradeConfig() (*systemconfigs.UpgradeConfig, error) { + sharedUpgradeConfigMu.Lock() + defer sharedUpgradeConfigMu.Unlock() + + if sharedUpgradeConfig != nil && time.Since(sharedUpgradeConfigTime) < upgradeConfigTTL { + return sharedUpgradeConfig, nil + } + + valueJSON, err := models.SharedSysSettingDAO.ReadSetting(nil, systemconfigs.SettingCodeUpgradeConfig) + if err != nil { + return nil, err + } + + config := systemconfigs.NewUpgradeConfig() + if len(valueJSON) > 0 { + err = json.Unmarshal(valueJSON, config) + if err != nil { + return config, nil + } + } + + sharedUpgradeConfig = config + sharedUpgradeConfigTime = time.Now() + return config, nil +} diff --git a/EdgeAPI/internal/tasks/httpdns_node_monitor_task.go b/EdgeAPI/internal/tasks/httpdns_node_monitor_task.go new file mode 100644 index 0000000..949d91b --- /dev/null +++ b/EdgeAPI/internal/tasks/httpdns_node_monitor_task.go @@ -0,0 +1,107 @@ +package tasks + +import ( + "time" + + "github.com/TeaOSLab/EdgeAPI/internal/db/models" + "github.com/TeaOSLab/EdgeAPI/internal/goman" + "github.com/TeaOSLab/EdgeAPI/internal/installers" + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + "github.com/iwind/TeaGo/dbs" +) + +func init() { + dbs.OnReadyDone(func() { + goman.New(func() { + NewHTTPDNSNodeMonitorTask(1 * time.Minute).Start() + }) + }) +} + +type httpdnsNodeStartingTry struct { + count int + timestamp int64 +} + +// HTTPDNSNodeMonitorTask monitors HTTPDNS node activity and optionally tries to start offline nodes. +type HTTPDNSNodeMonitorTask struct { + BaseTask + + ticker *time.Ticker + + recoverMap map[int64]*httpdnsNodeStartingTry // nodeId => retry info +} + +func NewHTTPDNSNodeMonitorTask(duration time.Duration) *HTTPDNSNodeMonitorTask { + return &HTTPDNSNodeMonitorTask{ + ticker: time.NewTicker(duration), + recoverMap: map[int64]*httpdnsNodeStartingTry{}, + } +} + +func (t *HTTPDNSNodeMonitorTask) Start() { + for range t.ticker.C { + if err := t.Loop(); err != nil { + t.logErr("HTTPDNS_NODE_MONITOR", err.Error()) + } + } +} + +func (t *HTTPDNSNodeMonitorTask) Loop() error { + // only run on primary api node + if !t.IsPrimaryNode() { + return nil + } + + clusters, err := models.SharedHTTPDNSClusterDAO.FindAllEnabledClusters(nil) + if err != nil { + return err + } + + for _, cluster := range clusters { + if cluster == nil || !cluster.IsOn || !cluster.AutoRemoteStart { + continue + } + clusterID := int64(cluster.Id) + inactiveNodes, err := models.SharedHTTPDNSNodeDAO.FindAllInactiveNodesWithClusterId(nil, clusterID) + if err != nil { + return err + } + if len(inactiveNodes) == 0 { + continue + } + + nodeQueue := installers.NewHTTPDNSNodeQueue() + for _, node := range inactiveNodes { + nodeID := int64(node.Id) + tryInfo, ok := t.recoverMap[nodeID] + if !ok { + tryInfo = &httpdnsNodeStartingTry{ + count: 1, + timestamp: time.Now().Unix(), + } + t.recoverMap[nodeID] = tryInfo + } else { + if tryInfo.count >= 3 { + if tryInfo.timestamp+10*60 > time.Now().Unix() { + continue + } + tryInfo.timestamp = time.Now().Unix() + tryInfo.count = 0 + } + tryInfo.count++ + } + + err = nodeQueue.StartNode(nodeID) + if err != nil { + if !installers.IsGrantError(err) { + _ = models.SharedNodeLogDAO.CreateLog(nil, nodeconfigs.NodeRoleHTTPDNS, nodeID, 0, 0, models.LevelError, "NODE", "start node from remote API failed: "+err.Error(), time.Now().Unix(), "", nil) + } + continue + } + _ = models.SharedNodeLogDAO.CreateLog(nil, nodeconfigs.NodeRoleHTTPDNS, nodeID, 0, 0, models.LevelSuccess, "NODE", "start node from remote API successfully", time.Now().Unix(), "", nil) + } + } + + return nil +} diff --git a/EdgeAPI/internal/tasks/node_task_extractor.go b/EdgeAPI/internal/tasks/node_task_extractor.go index 99b6567..82b4bbc 100644 --- a/EdgeAPI/internal/tasks/node_task_extractor.go +++ b/EdgeAPI/internal/tasks/node_task_extractor.go @@ -46,7 +46,7 @@ func (this *NodeTaskExtractor) Loop() error { // 这里不解锁，是为了让任务N秒钟之内只运行一次 - for _, role := range []string{nodeconfigs.NodeRoleNode, nodeconfigs.NodeRoleDNS} { + for _, role := range []string{nodeconfigs.NodeRoleNode, nodeconfigs.NodeRoleDNS, nodeconfigs.NodeRoleHTTPDNS} { err := models.SharedNodeTaskDAO.ExtractAllClusterTasks(nil, role) if err != nil { return err diff --git a/EdgeAdmin/build/build.sh b/EdgeAdmin/build/build.sh index 56c1c96..e3eb1ac 100644 --- a/EdgeAdmin/build/build.sh +++ b/EdgeAdmin/build/build.sh @@ -1,4 +1,28 @@ #!/usr/bin/env bash +set -e + +function verify_components_bundle() { + local file_path="$1" + if [ ! -f "$file_path" ]; then + echo "[error] components.js not found: $file_path" + return 1 + fi + + local file_size + file_size=$(wc -c < "$file_path") + if [ "$file_size" -lt 100000 ]; then + echo "[error] components.js looks too small ($file_size bytes), generate likely failed" + return 1 + fi + + if ! grep -q 'Vue.component("csrf-token"' "$file_path"; then + echo "[error] components.js missing csrf-token component, generate likely failed" + return 1 + fi + + echo "verify components.js: ok ($file_size bytes)" + return 0 +} function build() { ROOT=$(dirname "$0") @@ -58,7 +82,7 @@ function build() { # generate files echo "generating files ..." - env CGO_ENABLED=0 go run -tags $TAG "$ROOT"/../cmd/edge-admin/main.go generate + env TEAROOT="$ROOT" CGO_ENABLED=0 go run -tags "$TAG" "$ROOT"/../cmd/edge-admin/main.go generate if [ "$(which uglifyjs)" ]; then echo "compress to component.js ..." uglifyjs --compress --mangle -- "${JS_ROOT}"/components.src.js > "${JS_ROOT}"/components.js @@ -69,6 +93,8 @@ function build() { cp "${JS_ROOT}"/utils.js "${JS_ROOT}"/utils.min.js fi + verify_components_bundle "${JS_ROOT}/components.js" + # create dir & copy files echo "copying ..." if [ ! -d "$DIST" ]; then diff --git a/EdgeAdmin/build/generate.sh b/EdgeAdmin/build/generate.sh index 248bfa2..99fbdba 100644 --- a/EdgeAdmin/build/generate.sh +++ b/EdgeAdmin/build/generate.sh @@ -1,22 +1,49 @@ #!/usr/bin/env bash +set -e -JS_ROOT=../web/public/js +ROOT=$(cd "$(dirname "$0")" && pwd) +JS_ROOT="$ROOT"/../web/public/js + +function verify_components_bundle() { + local file_path="$1" + if [ ! -f "$file_path" ]; then + echo "[error] components.js not found: $file_path" + return 1 + fi + + local file_size + file_size=$(wc -c < "$file_path") + if [ "$file_size" -lt 100000 ]; then + echo "[error] components.js looks too small ($file_size bytes), generate likely failed" + return 1 + fi + + if ! grep -q 'Vue.component("csrf-token"' "$file_path"; then + echo "[error] components.js missing csrf-token component, generate likely failed" + return 1 + fi + + echo "verify components.js: ok ($file_size bytes)" + return 0 +} echo "generating component.src.js ..." -env CGO_ENABLED=0 go run -tags=community ../cmd/edge-admin/main.go generate +env TEAROOT="$ROOT" CGO_ENABLED=0 go run -tags=community "$ROOT"/../cmd/edge-admin/main.go generate if [ "$(which uglifyjs)" ]; then echo "compress to component.js ..." - uglifyjs --compress --mangle -- ${JS_ROOT}/components.src.js > ${JS_ROOT}/components.js + uglifyjs --compress --mangle -- "${JS_ROOT}"/components.src.js > "${JS_ROOT}"/components.js echo "compress to utils.min.js ..." - uglifyjs --compress --mangle -- ${JS_ROOT}/utils.js > ${JS_ROOT}/utils.min.js + uglifyjs --compress --mangle -- "${JS_ROOT}"/utils.js > "${JS_ROOT}"/utils.min.js else echo "copy to component.js ..." - cp ${JS_ROOT}/components.src.js ${JS_ROOT}/components.js + cp "${JS_ROOT}"/components.src.js "${JS_ROOT}"/components.js echo "copy to utils.min.js ..." - cp ${JS_ROOT}/utils.js ${JS_ROOT}/utils.min.js + cp "${JS_ROOT}"/utils.js "${JS_ROOT}"/utils.min.js fi -echo "ok" \ No newline at end of file +verify_components_bundle "${JS_ROOT}/components.js" + +echo "ok" diff --git a/EdgeAdmin/cmd/edge-admin/main.go b/EdgeAdmin/cmd/edge-admin/main.go index 2e4eaa2..52fd816 100644 --- a/EdgeAdmin/cmd/edge-admin/main.go +++ b/EdgeAdmin/cmd/edge-admin/main.go @@ -22,6 +22,7 @@ import ( "log" "os" "os/exec" + "path/filepath" "time" ) @@ -112,10 +113,12 @@ func main() { } }) app.On("generate", func() { + prepareGenerateRoot() + err := gen.Generate() if err != nil { fmt.Println("generate failed: " + err.Error()) - return + os.Exit(1) } }) app.On("dev", func() { @@ -214,3 +217,32 @@ func main() { adminNode.Run() }) } + +func prepareGenerateRoot() { + wd, err := os.Getwd() + if err != nil { + return + } + + candidates := []string{ + wd, + filepath.Clean(filepath.Join(wd, "..")), + } + + for _, root := range candidates { + componentsDir := filepath.Join(root, "web", "public", "js", "components") + stat, statErr := os.Stat(componentsDir) + if statErr != nil || !stat.IsDir() { + continue + } + + // In testing mode, generator reads from Tea.Root + "/../web/...", + // so keep Root under build dir to make relative path stable. + buildRoot := filepath.Join(root, "build") + Tea.UpdateRoot(buildRoot) + Tea.SetPublicDir(filepath.Join(root, "web", "public")) + Tea.SetViewsDir(filepath.Join(root, "web", "views")) + Tea.SetTmpDir(filepath.Join(root, "web", "tmp")) + return + } +} diff --git a/EdgeAdmin/edge-admin b/EdgeAdmin/edge-admin new file mode 100644 index 0000000..e8e6c24 Binary files /dev/null and b/EdgeAdmin/edge-admin differ diff --git a/EdgeAdmin/internal/configloaders/admin_module.go b/EdgeAdmin/internal/configloaders/admin_module.go index 9468436..8e40b49 100644 --- a/EdgeAdmin/internal/configloaders/admin_module.go +++ b/EdgeAdmin/internal/configloaders/admin_module.go @@ -18,6 +18,7 @@ const ( AdminModuleCodeServer AdminModuleCode = "server" // 网站 AdminModuleCodeNode AdminModuleCode = "node" // 节点 AdminModuleCodeDNS AdminModuleCode = "dns" // DNS + AdminModuleCodeHttpDNS AdminModuleCode = "httpdns" // HTTPDNS AdminModuleCodeNS AdminModuleCode = "ns" // 域名服务 AdminModuleCodeAdmin AdminModuleCode = "admin" // 系统用户 AdminModuleCodeUser AdminModuleCode = "user" // 平台用户 @@ -106,7 +107,19 @@ func AllowModule(adminId int64, module string) bool { list, ok := sharedAdminModuleMapping[adminId] if ok { - return list.Allow(module) + if list.Allow(module) { + return true + } + + // Backward compatibility: old admin module sets may not contain "httpdns". + // In that case, reuse related CDN module permissions to keep HTTPDNS visible/accessible. + if module == AdminModuleCodeHttpDNS { + return list.Allow(AdminModuleCodeDNS) || + list.Allow(AdminModuleCodeNode) || + list.Allow(AdminModuleCodeServer) + } + + return false } return false @@ -226,6 +239,11 @@ func AllModuleMaps(langCode string) []maps.Map { "code": AdminModuleCodeDNS, "url": "/dns", }, + { + "name": "HTTPDNS", + "code": AdminModuleCodeHttpDNS, + "url": "/httpdns/clusters", + }, } if teaconst.IsPlus { m = append(m, maps.Map{ diff --git a/EdgeAdmin/internal/configloaders/upgrade_config.go b/EdgeAdmin/internal/configloaders/upgrade_config.go new file mode 100644 index 0000000..cb299d1 --- /dev/null +++ b/EdgeAdmin/internal/configloaders/upgrade_config.go @@ -0,0 +1,69 @@ +package configloaders + +import ( + "encoding/json" + + "github.com/TeaOSLab/EdgeAdmin/internal/rpc" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" +) + +const UpgradeSettingName = "upgradeConfig" + +var sharedUpgradeConfig *systemconfigs.UpgradeConfig + +func LoadUpgradeConfig() (*systemconfigs.UpgradeConfig, error) { + locker.Lock() + defer locker.Unlock() + + if sharedUpgradeConfig != nil { + return sharedUpgradeConfig, nil + } + + rpcClient, err := rpc.SharedRPC() + if err != nil { + return nil, err + } + resp, err := rpcClient.SysSettingRPC().ReadSysSetting(rpcClient.Context(0), &pb.ReadSysSettingRequest{ + Code: UpgradeSettingName, + }) + if err != nil { + return nil, err + } + if len(resp.ValueJSON) == 0 { + sharedUpgradeConfig = systemconfigs.NewUpgradeConfig() + return sharedUpgradeConfig, nil + } + + config := systemconfigs.NewUpgradeConfig() + err = json.Unmarshal(resp.ValueJSON, config) + if err != nil { + sharedUpgradeConfig = systemconfigs.NewUpgradeConfig() + return sharedUpgradeConfig, nil + } + sharedUpgradeConfig = config + return sharedUpgradeConfig, nil +} + +func UpdateUpgradeConfig(config *systemconfigs.UpgradeConfig) error { + locker.Lock() + defer locker.Unlock() + + rpcClient, err := rpc.SharedRPC() + if err != nil { + return err + } + valueJSON, err := json.Marshal(config) + if err != nil { + return err + } + _, err = rpcClient.SysSettingRPC().UpdateSysSetting(rpcClient.Context(0), &pb.UpdateSysSettingRequest{ + Code: UpgradeSettingName, + ValueJSON: valueJSON, + }) + if err != nil { + return err + } + sharedUpgradeConfig = config + return nil +} diff --git a/EdgeAdmin/internal/const/const.go b/EdgeAdmin/internal/const/const.go index fb41589..55a74ae 100644 --- a/EdgeAdmin/internal/const/const.go +++ b/EdgeAdmin/internal/const/const.go @@ -1,9 +1,9 @@ package teaconst const ( - Version = "1.4.7" //1.3.9 + Version = "1.4.9" //1.3.9 - APINodeVersion = "1.4.7" //1.3.9 + APINodeVersion = "1.4.9" //1.3.9 ProductName = "Edge Admin" ProcessName = "edge-admin" diff --git a/EdgeAdmin/internal/rpc/rpc_client.go b/EdgeAdmin/internal/rpc/rpc_client.go index 753a4e7..0bd112c 100644 --- a/EdgeAdmin/internal/rpc/rpc_client.go +++ b/EdgeAdmin/internal/rpc/rpc_client.go @@ -349,6 +349,38 @@ func (this *RPCClient) DNSTaskRPC() pb.DNSTaskServiceClient { return pb.NewDNSTaskServiceClient(this.pickConn()) } +func (this *RPCClient) HTTPDNSClusterRPC() pb.HTTPDNSClusterServiceClient { + return pb.NewHTTPDNSClusterServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSNodeRPC() pb.HTTPDNSNodeServiceClient { + return pb.NewHTTPDNSNodeServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSAppRPC() pb.HTTPDNSAppServiceClient { + return pb.NewHTTPDNSAppServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSDomainRPC() pb.HTTPDNSDomainServiceClient { + return pb.NewHTTPDNSDomainServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSRuleRPC() pb.HTTPDNSRuleServiceClient { + return pb.NewHTTPDNSRuleServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSAccessLogRPC() pb.HTTPDNSAccessLogServiceClient { + return pb.NewHTTPDNSAccessLogServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSRuntimeLogRPC() pb.HTTPDNSRuntimeLogServiceClient { + return pb.NewHTTPDNSRuntimeLogServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSSandboxRPC() pb.HTTPDNSSandboxServiceClient { + return pb.NewHTTPDNSSandboxServiceClient(this.pickConn()) +} + func (this *RPCClient) ACMEUserRPC() pb.ACMEUserServiceClient { return pb.NewACMEUserServiceClient(this.pickConn()) } diff --git a/EdgeAdmin/internal/utils/lookup.go b/EdgeAdmin/internal/utils/lookup.go index ea7c845..969b83e 100644 --- a/EdgeAdmin/internal/utils/lookup.go +++ b/EdgeAdmin/internal/utils/lookup.go @@ -1,45 +1,52 @@ package utils import ( - teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" - "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "errors" + "sync" + "github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/logs" "github.com/miekg/dns" - "sync" ) -var sharedDNSClient *dns.Client -var sharedDNSConfig *dns.ClientConfig +var dnsClient *dns.Client +var dnsConfig *dns.ClientConfig func init() { - if !teaconst.IsMain { - return - } + // The teaconst.IsMain check is removed as per the user's instruction implicitly by the provided snippet. + // if !teaconst.IsMain { + // return + // } config, err := dns.ClientConfigFromFile("/etc/resolv.conf") if err != nil { - logs.Println("ERROR: configure dns client failed: " + err.Error()) - return + // Fallback for Windows or systems without resolv.conf + config = &dns.ClientConfig{ + Servers: []string{"8.8.8.8", "8.8.4.4"}, + Search: []string{}, + Port: "53", + Ndots: 1, + Timeout: 5, + Attempts: 2, + } + logs.Println("WARNING: configure dns client: /etc/resolv.conf not found, using fallback 8.8.8.8") } - sharedDNSConfig = config - sharedDNSClient = &dns.Client{} + dnsConfig = config + dnsClient = new(dns.Client) } // LookupCNAME 获取CNAME func LookupCNAME(host string) (string, error) { - var m = new(dns.Msg) + if dnsClient == nil || dnsConfig == nil { + return "", errors.New("dns client not initialized") + } - m.SetQuestion(host+".", dns.TypeCNAME) + m := new(dns.Msg) + m.SetQuestion(dns.Fqdn(host), dns.TypeCNAME) m.RecursionDesired = true - var lastErr error - var success = false - var result = "" - - var serverAddrs = sharedDNSConfig.Servers - + var serverAddrs = dnsConfig.Servers { var publicDNSHosts = []string{"8.8.8.8" /** Google **/, "8.8.4.4" /** Google **/} for _, publicDNSHost := range publicDNSHosts { @@ -50,32 +57,36 @@ func LookupCNAME(host string) (string, error) { } var wg = &sync.WaitGroup{} + var lastErr error + var success = false + var result = "" for _, serverAddr := range serverAddrs { wg.Add(1) - - go func(serverAddr string) { + go func(server string) { defer wg.Done() - r, _, err := sharedDNSClient.Exchange(m, configutils.QuoteIP(serverAddr)+":"+sharedDNSConfig.Port) - if err != nil { + r, _, err := dnsClient.Exchange(m, server+":"+dnsConfig.Port) + if err == nil && r != nil && r.Rcode == dns.RcodeSuccess { + for _, ans := range r.Answer { + if cname, ok := ans.(*dns.CNAME); ok { + success = true + result = cname.Target + } + } + } else if err != nil { lastErr = err - return } - - success = true - - if len(r.Answer) == 0 { - return - } - - result = r.Answer[0].(*dns.CNAME).Target }(serverAddr) } + wg.Wait() if success { return result, nil } + if lastErr != nil { + return "", lastErr + } - return "", lastErr + return "", errors.New("lookup failed") } diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/addPortPopup.go b/EdgeAdmin/internal/web/actions/default/httpdns/addPortPopup.go new file mode 100644 index 0000000..d652e1b --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/addPortPopup.go @@ -0,0 +1,123 @@ +package httpdns + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" + "github.com/iwind/TeaGo/types" + "regexp" + "strings" +) + +type AddPortPopupAction struct { + actionutils.ParentAction +} + +func (this *AddPortPopupAction) Init() { + this.Nav("", "", "") +} + +func (this *AddPortPopupAction) RunGet(params struct { + Protocol string + From string + SupportRange bool +}) { + this.Data["from"] = params.From + + var protocols = serverconfigs.FindAllServerProtocols() + if len(params.Protocol) > 0 { + result := []maps.Map{} + for _, p := range protocols { + if p.GetString("code") == params.Protocol { + result = append(result, p) + } + } + protocols = result + } + this.Data["protocols"] = protocols + + this.Data["supportRange"] = params.SupportRange + + this.Show() +} + +func (this *AddPortPopupAction) RunPost(params struct { + SupportRange bool + + Protocol string + Address string + + Must *actions.Must +}) { + // 校验地址 + var addr = maps.Map{ + "protocol": params.Protocol, + "host": "", + "portRange": "", + "minPort": 0, + "maxPort": 0, + } + + var portRegexp = regexp.MustCompile(`^\d+$`) + if portRegexp.MatchString(params.Address) { // 单个端口 + addr["portRange"] = this.checkPort(params.Address) + } else if params.SupportRange && regexp.MustCompile(`^\d+\s*-\s*\d+$`).MatchString(params.Address) { // Port1-Port2 + addr["portRange"], addr["minPort"], addr["maxPort"] = this.checkPortRange(params.Address) + } else if strings.Contains(params.Address, ":") { // IP:Port + index := strings.LastIndex(params.Address, ":") + addr["host"] = strings.TrimSpace(params.Address[:index]) + port := strings.TrimSpace(params.Address[index+1:]) + if portRegexp.MatchString(port) { + addr["portRange"] = this.checkPort(port) + } else if params.SupportRange && regexp.MustCompile(`^\d+\s*-\s*\d+$`).MatchString(port) { // Port1-Port2 + addr["portRange"], addr["minPort"], addr["maxPort"] = this.checkPortRange(port) + } else { + this.FailField("address", "请输入正确的端口或者网络地址") + } + } else { + this.FailField("address", "请输入正确的端口或者网络地址") + } + + this.Data["address"] = addr + this.Success() +} + +func (this *AddPortPopupAction) checkPort(port string) (portRange string) { + var intPort = types.Int(port) + if intPort < 1 { + this.FailField("address", "端口号不能小于1") + } + if intPort > 65535 { + this.FailField("address", "端口号不能大于65535") + } + return port +} + +func (this *AddPortPopupAction) checkPortRange(port string) (portRange string, minPort int, maxPort int) { + var pieces = strings.Split(port, "-") + var piece1 = strings.TrimSpace(pieces[0]) + var piece2 = strings.TrimSpace(pieces[1]) + var port1 = types.Int(piece1) + var port2 = types.Int(piece2) + + if port1 < 1 { + this.FailField("address", "端口号不能小于1") + } + if port1 > 65535 { + this.FailField("address", "端口号不能大于65535") + } + + if port2 < 1 { + this.FailField("address", "端口号不能小于1") + } + if port2 > 65535 { + this.FailField("address", "端口号不能大于65535") + } + + if port1 > port2 { + port1, port2 = port2, port1 + } + + return types.String(port1) + "-" + types.String(port2), port1, port2 +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/app.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/app.go new file mode 100644 index 0000000..2d4a89b --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/app.go @@ -0,0 +1,26 @@ +package apps + +import ( + "strconv" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +) + +type AppAction struct { + actionutils.ParentAction +} + +func (this *AppAction) Init() { + this.Nav("httpdns", "app", "") +} + +func (this *AppAction) RunGet(params struct { + AppId int64 +}) { + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + this.RedirectURL("/httpdns/apps/domains?appId=" + strconv.FormatInt(app.GetInt64("id"), 10)) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/appSettings.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/appSettings.go new file mode 100644 index 0000000..e28aea8 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/appSettings.go @@ -0,0 +1,175 @@ +package apps + +import ( + "encoding/json" + "strconv" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" +) + +type AppSettingsAction struct { + actionutils.ParentAction +} + +func (this *AppSettingsAction) Init() { + this.Nav("httpdns", "app", "settings") +} + +func (this *AppSettingsAction) RunGet(params struct { + AppId int64 + Section string +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + + httpdnsutils.AddAppTabbar(this.Parent(), app.GetString("name"), app.GetInt64("id"), "settings") + + section := params.Section + if len(section) == 0 { + section = "basic" + } + this.Data["activeSection"] = section + + appIDStr := strconv.FormatInt(app.GetInt64("id"), 10) + this.Data["leftMenuItems"] = []maps.Map{ + { + "name": "基础配置", + "url": "/httpdns/apps/app/settings?appId=" + appIDStr + "§ion=basic", + "isActive": section == "basic", + }, + { + "name": "认证与密钥", + "url": "/httpdns/apps/app/settings?appId=" + appIDStr + "§ion=auth", + "isActive": section == "auth", + }, + } + + clusterResp, err := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.AdminContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + clusters := make([]maps.Map, 0, len(clusterResp.GetClusters())) + clusterApiAddressMap := map[int64]string{} + clusterNameMap := map[int64]string{} + for _, cluster := range clusterResp.GetClusters() { + clusterId := cluster.GetId() + clusterName := cluster.GetName() + + port := "443" + if rawTLS := cluster.GetTlsPolicyJSON(); len(rawTLS) > 0 { + var tlsConfig map[string]interface{} + if err := json.Unmarshal(rawTLS, &tlsConfig); err == nil { + if listenRaw, ok := tlsConfig["listen"]; ok && listenRaw != nil { + if data, err := json.Marshal(listenRaw); err == nil { + var listenAddresses []map[string]interface{} + if err := json.Unmarshal(data, &listenAddresses); err == nil { + if len(listenAddresses) > 0 { + if portRange, ok := listenAddresses[0]["portRange"].(string); ok && len(portRange) > 0 { + port = portRange + } + } + } + } + } + } + } + apiAddress := "https://" + cluster.GetServiceDomain() + ":" + port + + clusters = append(clusters, maps.Map{ + "id": clusterId, + "name": clusterName, + }) + clusterApiAddressMap[clusterId] = apiAddress + clusterNameMap[clusterId] = clusterName + } + + // 读取应用绑定的集群列表，取第一个作为当前选中。 + var selectedClusterId int64 + if raw := app.Get("clusterIds"); raw != nil { + if ids, ok := raw.([]int64); ok && len(ids) > 0 { + selectedClusterId = ids[0] + } + } + + // 构建服务地址列表。 + serviceAddresses := make([]maps.Map, 0) + if selectedClusterId > 0 { + addr := clusterApiAddressMap[selectedClusterId] + name := clusterNameMap[selectedClusterId] + if len(addr) > 0 { + serviceAddresses = append(serviceAddresses, maps.Map{ + "address": addr, + "clusterName": name, + }) + } + } + + settings := maps.Map{ + "appId": app.GetString("appId"), + "appStatus": app.GetBool("isOn"), + "selectedClusterId": selectedClusterId, + "serviceAddresses": serviceAddresses, + "signEnabled": app.GetBool("signEnabled"), + "signSecretPlain": app.GetString("signSecretPlain"), + "signSecretMasked": app.GetString("signSecretMasked"), + "signSecretUpdatedAt": app.GetString("signSecretUpdated"), + } + this.Data["app"] = app + this.Data["settings"] = settings + this.Data["clusters"] = clusters + this.Show() +} + +func (this *AppSettingsAction) RunPost(params struct { + AppId int64 + + AppStatus bool + ClusterId int64 + + Must *actions.Must + CSRF *actionutils.CSRF +}) { + params.Must.Field("appId", params.AppId).Gt(0, "请选择应用") + + appResp, err := this.RPC().HTTPDNSAppRPC().FindHTTPDNSApp(this.AdminContext(), &pb.FindHTTPDNSAppRequest{ + AppDbId: params.AppId, + }) + if err != nil { + this.ErrorPage(err) + return + } + if appResp.GetApp() == nil { + this.Fail("找不到对应的应用") + return + } + + var clusterIds []int64 + if params.ClusterId > 0 { + clusterIds = []int64{params.ClusterId} + } + clusterIdsJSON, _ := json.Marshal(clusterIds) + + _, err = this.RPC().HTTPDNSAppRPC().UpdateHTTPDNSApp(this.AdminContext(), &pb.UpdateHTTPDNSAppRequest{ + AppDbId: params.AppId, + Name: appResp.GetApp().GetName(), + ClusterIdsJSON: clusterIdsJSON, + IsOn: params.AppStatus, + UserId: appResp.GetApp().GetUserId(), + }) + if err != nil { + this.ErrorPage(err) + return + } + + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/appSettingsResetSignSecret.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/appSettingsResetSignSecret.go new file mode 100644 index 0000000..a282c5d --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/appSettingsResetSignSecret.go @@ -0,0 +1,29 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/actions" +) + +type AppSettingsResetSignSecretAction struct { + actionutils.ParentAction +} + +func (this *AppSettingsResetSignSecretAction) RunPost(params struct { + AppId int64 + + Must *actions.Must +}) { + params.Must.Field("appId", params.AppId).Gt(0, "请选择应用") + + _, err := this.RPC().HTTPDNSAppRPC().ResetHTTPDNSAppSignSecret(this.AdminContext(), &pb.ResetHTTPDNSAppSignSecretRequest{ + AppDbId: params.AppId, + }) + if err != nil { + this.ErrorPage(err) + return + } + + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/appSettingsToggleSignEnabled.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/appSettingsToggleSignEnabled.go new file mode 100644 index 0000000..57b9225 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/appSettingsToggleSignEnabled.go @@ -0,0 +1,31 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/actions" +) + +type AppSettingsToggleSignEnabledAction struct { + actionutils.ParentAction +} + +func (this *AppSettingsToggleSignEnabledAction) RunPost(params struct { + AppId int64 + IsOn int + + Must *actions.Must +}) { + params.Must.Field("appId", params.AppId).Gt(0, "请选择应用") + + _, err := this.RPC().HTTPDNSAppRPC().UpdateHTTPDNSAppSignEnabled(this.AdminContext(), &pb.UpdateHTTPDNSAppSignEnabledRequest{ + AppDbId: params.AppId, + SignEnabled: params.IsOn == 1, + }) + if err != nil { + this.ErrorPage(err) + return + } + + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/create.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/create.go new file mode 100644 index 0000000..0f57cc1 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/create.go @@ -0,0 +1,89 @@ +package apps + +import ( + "encoding/json" + "strconv" + "time" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" +) + +type CreateAction struct { + actionutils.ParentAction +} + +func (this *CreateAction) Init() { + this.Nav("", "", "create") +} + +func (this *CreateAction) RunGet(params struct{}) { + clusterResp, err := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.AdminContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + clusters := make([]maps.Map, 0, len(clusterResp.GetClusters())) + for _, cluster := range clusterResp.GetClusters() { + clusters = append(clusters, maps.Map{ + "id": cluster.GetId(), + "name": cluster.GetName(), + }) + } + this.Data["clusters"] = clusters + + usersResp, err := this.RPC().UserRPC().ListEnabledUsers(this.AdminContext(), &pb.ListEnabledUsersRequest{ + Offset: 0, + Size: 10_000, + }) + if err != nil { + this.ErrorPage(err) + return + } + users := make([]maps.Map, 0, len(usersResp.GetUsers())) + for _, user := range usersResp.GetUsers() { + users = append(users, maps.Map{ + "id": user.GetId(), + "fullname": user.GetFullname(), + "username": user.GetUsername(), + }) + } + this.Data["users"] = users + + this.Show() +} + +func (this *CreateAction) RunPost(params struct { + Name string + ClusterId int64 + UserId int64 + + Must *actions.Must + CSRF *actionutils.CSRF +}) { + params.Must.Field("name", params.Name).Require("请输入应用名称") + if params.ClusterId <= 0 { + this.FailField("clusterId", "请选择集群") + return + } + + clusterIdsJSON, _ := json.Marshal([]int64{params.ClusterId}) + + createResp, err := this.RPC().HTTPDNSAppRPC().CreateHTTPDNSApp(this.AdminContext(), &pb.CreateHTTPDNSAppRequest{ + Name: params.Name, + AppId: "app" + strconv.FormatInt(time.Now().UnixNano()%1_000_000_000_000, 36), + ClusterIdsJSON: clusterIdsJSON, + IsOn: true, + SignEnabled: true, + UserId: params.UserId, + }) + if err != nil { + this.ErrorPage(err) + return + } + + this.Data["appId"] = createResp.GetAppDbId() + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/customRecords.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/customRecords.go new file mode 100644 index 0000000..19a75bd --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/customRecords.go @@ -0,0 +1,56 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/iwind/TeaGo/maps" +) + +type CustomRecordsAction struct { + actionutils.ParentAction +} + +func (this *CustomRecordsAction) Init() { + this.Nav("httpdns", "app", "") +} + +func (this *CustomRecordsAction) RunGet(params struct { + AppId int64 + DomainId int64 +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + httpdnsutils.AddAppTabbar(this.Parent(), app.GetString("name"), app.GetInt64("id"), "domains") + + domains, err := listDomainMaps(this.Parent(), app.GetInt64("id"), "") + if err != nil { + this.ErrorPage(err) + return + } + domain := findDomainMap(domains, params.DomainId) + + records := make([]maps.Map, 0) + if domain.GetInt64("id") > 0 { + records, err = listCustomRuleMaps(this.Parent(), domain.GetInt64("id")) + if err != nil { + this.ErrorPage(err) + return + } + for _, record := range records { + record["domain"] = domain.GetString("name") + record["lineText"] = buildLineText(record) + record["recordValueText"] = buildRecordValueText(record) + } + } + + this.Data["app"] = app + this.Data["domain"] = domain + this.Data["records"] = records + this.Show() +} + diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/customRecordsCreatePopup.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/customRecordsCreatePopup.go new file mode 100644 index 0000000..567751b --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/customRecordsCreatePopup.go @@ -0,0 +1,263 @@ +package apps + +import ( + "encoding/json" + "fmt" + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" +) + +type CustomRecordsCreatePopupAction struct { + actionutils.ParentAction +} + +func (this *CustomRecordsCreatePopupAction) Init() { + this.Nav("", "", "") +} + +func (this *CustomRecordsCreatePopupAction) RunGet(params struct { + AppId int64 + DomainId int64 + RecordId int64 +}) { + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + + domains, err := listDomainMaps(this.Parent(), app.GetInt64("id"), "") + if err != nil { + this.ErrorPage(err) + return + } + domain := findDomainMap(domains, params.DomainId) + + record := maps.Map{ + "id": int64(0), + "domain": domain.GetString("name"), + "lineScope": "china", + "lineCarrier": "默认", + "lineRegion": "默认", + "lineProvince": "默认", + "lineContinent": "默认", + "lineCountry": "默认", + "ruleName": "", + "weightEnabled": false, + "ttl": 60, + "isOn": true, + "recordItemsJson": `[{"type":"A","value":"","weight":100}]`, + } + + if params.RecordId > 0 && domain.GetInt64("id") > 0 { + rules, err := listCustomRuleMaps(this.Parent(), domain.GetInt64("id")) + if err != nil { + this.ErrorPage(err) + return + } + for _, rule := range rules { + if rule.GetInt64("id") != params.RecordId { + continue + } + record["id"] = rule.GetInt64("id") + record["domain"] = domain.GetString("name") + record["lineScope"] = rule.GetString("lineScope") + record["lineCarrier"] = defaultLineField(rule.GetString("lineCarrier")) + record["lineRegion"] = defaultLineField(rule.GetString("lineRegion")) + record["lineProvince"] = defaultLineField(rule.GetString("lineProvince")) + record["lineContinent"] = defaultLineField(rule.GetString("lineContinent")) + record["lineCountry"] = defaultLineField(rule.GetString("lineCountry")) + record["ruleName"] = rule.GetString("ruleName") + record["weightEnabled"] = rule.GetBool("weightEnabled") + record["ttl"] = rule.GetInt("ttl") + record["isOn"] = rule.GetBool("isOn") + record["recordItemsJson"] = marshalJSON(rule["recordValues"], "[]") + break + } + } + + this.Data["app"] = app + this.Data["domain"] = domain + this.Data["record"] = record + this.Data["isEditing"] = params.RecordId > 0 + this.Show() +} + +func (this *CustomRecordsCreatePopupAction) RunPost(params struct { + AppId int64 + DomainId int64 + + RecordId int64 + Domain string + LineScope string + + LineCarrier string + LineRegion string + LineProvince string + LineContinent string + LineCountry string + + RuleName string + RecordItemsJSON string + WeightEnabled bool + Ttl int + IsOn bool + + Must *actions.Must + CSRF *actionutils.CSRF +}) { + params.Must.Field("appId", params.AppId).Gt(0, "请选择应用") + params.Must.Field("domainId", params.DomainId).Gt(0, "请选择所属域名") + + params.LineScope = strings.ToLower(strings.TrimSpace(params.LineScope)) + if params.LineScope != "china" && params.LineScope != "overseas" { + params.LineScope = "china" + } + params.RuleName = strings.TrimSpace(params.RuleName) + if len(params.RuleName) == 0 { + this.Fail("请输入规则名称") + return + } + if params.Ttl <= 0 || params.Ttl > 86400 { + this.Fail("TTL值必须在 1-86400 范围内") + return + } + + recordValues, err := parseRecordItemsJSON(params.RecordItemsJSON, params.WeightEnabled) + if err != nil { + this.Fail(err.Error()) + return + } + if len(recordValues) == 0 { + this.Fail("请输入解析记录值") + return + } + if len(recordValues) > 10 { + this.Fail("单个规则最多只能添加 10 条解析记录") + return + } + + lineCarrier := strings.TrimSpace(params.LineCarrier) + lineRegion := strings.TrimSpace(params.LineRegion) + lineProvince := strings.TrimSpace(params.LineProvince) + lineContinent := strings.TrimSpace(params.LineContinent) + lineCountry := strings.TrimSpace(params.LineCountry) + if len(lineCarrier) == 0 { + lineCarrier = "默认" + } + if len(lineRegion) == 0 { + lineRegion = "默认" + } + if len(lineProvince) == 0 { + lineProvince = "默认" + } + if len(lineContinent) == 0 { + lineContinent = "默认" + } + if len(lineCountry) == 0 { + lineCountry = "默认" + } + if params.LineScope == "overseas" { + lineCarrier = "" + lineRegion = "" + lineProvince = "" + } else { + lineContinent = "" + lineCountry = "" + } + + records := make([]*pb.HTTPDNSRuleRecord, 0, len(recordValues)) + for i, item := range recordValues { + records = append(records, &pb.HTTPDNSRuleRecord{ + Id: 0, + RuleId: 0, + RecordType: item.GetString("type"), + RecordValue: item.GetString("value"), + Weight: int32(item.GetInt("weight")), + Sort: int32(i + 1), + }) + } + + rule := &pb.HTTPDNSCustomRule{ + Id: params.RecordId, + AppId: params.AppId, + DomainId: params.DomainId, + RuleName: params.RuleName, + LineScope: params.LineScope, + LineCarrier: lineCarrier, + LineRegion: lineRegion, + LineProvince: lineProvince, + LineContinent: lineContinent, + LineCountry: lineCountry, + Ttl: int32(params.Ttl), + IsOn: params.IsOn, + Priority: 100, + Records: records, + } + + if params.RecordId > 0 { + err = updateCustomRule(this.Parent(), rule) + } else { + _, err = createCustomRule(this.Parent(), rule) + } + if err != nil { + this.ErrorPage(err) + return + } + + this.Success() +} + +func parseRecordItemsJSON(raw string, weightEnabled bool) ([]maps.Map, error) { + raw = strings.TrimSpace(raw) + if len(raw) == 0 { + return []maps.Map{}, nil + } + + list := []maps.Map{} + if err := json.Unmarshal([]byte(raw), &list); err != nil { + return nil, fmt.Errorf("解析记录格式不正确") + } + + result := make([]maps.Map, 0, len(list)) + for _, item := range list { + recordType := strings.ToUpper(strings.TrimSpace(item.GetString("type"))) + recordValue := strings.TrimSpace(item.GetString("value")) + if len(recordType) == 0 && len(recordValue) == 0 { + continue + } + if recordType != "A" && recordType != "AAAA" { + return nil, fmt.Errorf("记录类型只能是 A 或 AAAA") + } + if len(recordValue) == 0 { + return nil, fmt.Errorf("记录值不能为空") + } + + weight := item.GetInt("weight") + if !weightEnabled { + weight = 100 + } + if weight < 1 || weight > 100 { + return nil, fmt.Errorf("权重值必须在 1-100 之间") + } + + result = append(result, maps.Map{ + "type": recordType, + "value": recordValue, + "weight": weight, + }) + } + return result, nil +} + +func marshalJSON(v interface{}, fallback string) string { + b, err := json.Marshal(v) + if err != nil { + return fallback + } + return string(b) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/customRecordsDelete.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/customRecordsDelete.go new file mode 100644 index 0000000..27fed65 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/customRecordsDelete.go @@ -0,0 +1,21 @@ +package apps + +import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + +type CustomRecordsDeleteAction struct { + actionutils.ParentAction +} + +func (this *CustomRecordsDeleteAction) RunPost(params struct { + AppId int64 + RecordId int64 +}) { + if params.RecordId > 0 { + err := deleteCustomRule(this.Parent(), params.RecordId) + if err != nil { + this.ErrorPage(err) + return + } + } + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/customRecordsToggle.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/customRecordsToggle.go new file mode 100644 index 0000000..8504532 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/customRecordsToggle.go @@ -0,0 +1,22 @@ +package apps + +import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + +type CustomRecordsToggleAction struct { + actionutils.ParentAction +} + +func (this *CustomRecordsToggleAction) RunPost(params struct { + AppId int64 + RecordId int64 + IsOn bool +}) { + if params.RecordId > 0 { + err := toggleCustomRule(this.Parent(), params.RecordId, params.IsOn) + if err != nil { + this.ErrorPage(err) + return + } + } + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/delete.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/delete.go new file mode 100644 index 0000000..004fe45 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/delete.go @@ -0,0 +1,48 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" +) + +type DeleteAction struct { + actionutils.ParentAction +} + +func (this *DeleteAction) Init() { + this.Nav("httpdns", "app", "delete") +} + +func (this *DeleteAction) RunGet(params struct { + AppId int64 +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + httpdnsutils.AddAppTabbar(this.Parent(), app.GetString("name"), app.GetInt64("id"), "delete") + this.Data["app"] = app + domains, err := listDomainMaps(this.Parent(), app.GetInt64("id"), "") + if err != nil { + this.ErrorPage(err) + return + } + this.Data["domainCount"] = len(domains) + this.Show() +} + +func (this *DeleteAction) RunPost(params struct { + AppId int64 +}) { + if params.AppId > 0 { + err := deleteAppByID(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + } + + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/domains.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/domains.go new file mode 100644 index 0000000..576de1a --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/domains.go @@ -0,0 +1,38 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" +) + +type DomainsAction struct { + actionutils.ParentAction +} + +func (this *DomainsAction) Init() { + this.Nav("httpdns", "app", "domains") +} + +func (this *DomainsAction) RunGet(params struct { + AppId int64 +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + + // 构建顶部 tabbar + httpdnsutils.AddAppTabbar(this.Parent(), app.GetString("name"), params.AppId, "domains") + + domains, err := listDomainMaps(this.Parent(), app.GetInt64("id"), "") + if err != nil { + this.ErrorPage(err) + return + } + + this.Data["app"] = app + this.Data["domains"] = domains + this.Show() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/domainsCreatePopup.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/domainsCreatePopup.go new file mode 100644 index 0000000..44cc478 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/domainsCreatePopup.go @@ -0,0 +1,44 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/iwind/TeaGo/actions" +) + +type DomainsCreatePopupAction struct { + actionutils.ParentAction +} + +func (this *DomainsCreatePopupAction) Init() { + this.Nav("", "", "") +} + +func (this *DomainsCreatePopupAction) RunGet(params struct { + AppId int64 +}) { + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + this.Data["app"] = app + this.Show() +} + +func (this *DomainsCreatePopupAction) RunPost(params struct { + AppId int64 + Domain string + + Must *actions.Must + CSRF *actionutils.CSRF +}) { + params.Must.Field("appId", params.AppId).Gt(0, "请选择应用") + params.Must.Field("domain", params.Domain).Require("请输入域名") + + err := createDomain(this.Parent(), params.AppId, params.Domain) + if err != nil { + this.ErrorPage(err) + return + } + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/domainsDelete.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/domainsDelete.go new file mode 100644 index 0000000..67042c3 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/domainsDelete.go @@ -0,0 +1,20 @@ +package apps + +import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + +type DomainsDeleteAction struct { + actionutils.ParentAction +} + +func (this *DomainsDeleteAction) RunPost(params struct { + DomainId int64 +}) { + if params.DomainId > 0 { + err := deleteDomain(this.Parent(), params.DomainId) + if err != nil { + this.ErrorPage(err) + return + } + } + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/formatters.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/formatters.go new file mode 100644 index 0000000..5c52256 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/formatters.go @@ -0,0 +1,92 @@ +package apps + +import ( + "strconv" + "strings" + + "github.com/iwind/TeaGo/maps" +) + +func maskSecret(secret string) string { + secret = strings.TrimSpace(secret) + if len(secret) < 4 { + return "******" + } + + prefix := "" + for i := 0; i < len(secret); i++ { + if secret[i] == '_' { + prefix = secret[:i+1] + break + } + } + if len(prefix) == 0 { + prefix = secret[:2] + } + + if len(secret) <= 8 { + return prefix + "xxxx" + } + return prefix + "xxxxxxxx" + secret[len(secret)-4:] +} + +func buildLineText(record maps.Map) string { + parts := []string{} + if strings.TrimSpace(record.GetString("lineScope")) == "overseas" { + parts = append(parts, + strings.TrimSpace(record.GetString("lineContinent")), + strings.TrimSpace(record.GetString("lineCountry")), + ) + } else { + parts = append(parts, + strings.TrimSpace(record.GetString("lineCarrier")), + strings.TrimSpace(record.GetString("lineRegion")), + strings.TrimSpace(record.GetString("lineProvince")), + ) + } + + finalParts := make([]string, 0, len(parts)) + for _, part := range parts { + if len(part) == 0 || part == "默认" { + continue + } + finalParts = append(finalParts, part) + } + if len(finalParts) == 0 { + return "默认" + } + return strings.Join(finalParts, " / ") +} + +func buildRecordValueText(record maps.Map) string { + values, ok := record["recordValues"].([]maps.Map) + if !ok || len(values) == 0 { + return "-" + } + + weightEnabled := record.GetBool("weightEnabled") + defaultType := strings.ToUpper(strings.TrimSpace(record.GetString("recordType"))) + parts := make([]string, 0, len(values)) + for _, item := range values { + value := strings.TrimSpace(item.GetString("value")) + if len(value) == 0 { + continue + } + recordType := strings.ToUpper(strings.TrimSpace(item.GetString("type"))) + if len(recordType) == 0 { + recordType = defaultType + } + if recordType != "A" && recordType != "AAAA" { + recordType = "A" + } + part := recordType + " " + value + if weightEnabled { + part += "(" + strconv.Itoa(item.GetInt("weight")) + ")" + } + parts = append(parts, part) + } + if len(parts) == 0 { + return "-" + } + return strings.Join(parts, ", ") +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/index.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/index.go new file mode 100644 index 0000000..2a2f742 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/index.go @@ -0,0 +1,29 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" +) + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) Init() { + this.Nav("httpdns", "app", "") +} + +func (this *IndexAction) RunGet(params struct { + Keyword string +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + this.Data["keyword"] = params.Keyword + apps, err := listAppMaps(this.Parent(), params.Keyword) + if err != nil { + this.ErrorPage(err) + return + } + this.Data["apps"] = apps + this.Data["page"] = "" + this.Show() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/init.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/init.go new file mode 100644 index 0000000..fdc2e25 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/init.go @@ -0,0 +1,38 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/iwind/TeaGo" +) + +func init() { + TeaGo.BeforeStart(func(server *TeaGo.Server) { + server. + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeHttpDNS)). + Data("teaMenu", "httpdns"). + Data("teaSubMenu", "app"). + Prefix("/httpdns/apps"). + Get("", new(IndexAction)). + Get("/app", new(AppAction)). + Get("/sdk", new(SdkAction)). + GetPost("/sdk/upload", new(SdkUploadAction)). + Post("/sdk/upload/delete", new(SdkUploadDeleteAction)). + Get("/sdk/check", new(SdkCheckAction)). + Get("/sdk/download", new(SdkDownloadAction)). + Get("/sdk/doc", new(SdkDocAction)). + GetPost("/app/settings", new(AppSettingsAction)). + Post("/app/settings/toggleSignEnabled", new(AppSettingsToggleSignEnabledAction)). + Post("/app/settings/resetSignSecret", new(AppSettingsResetSignSecretAction)). + Get("/domains", new(DomainsAction)). + Get("/customRecords", new(CustomRecordsAction)). + GetPost("/create", new(CreateAction)). + GetPost("/delete", new(DeleteAction)). + GetPost("/domains/createPopup", new(DomainsCreatePopupAction)). + Post("/domains/delete", new(DomainsDeleteAction)). + GetPost("/customRecords/createPopup", new(CustomRecordsCreatePopupAction)). + Post("/customRecords/delete", new(CustomRecordsDeleteAction)). + Post("/customRecords/toggle", new(CustomRecordsToggleAction)). + EndAll() + }) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/rpc_helpers.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/rpc_helpers.go new file mode 100644 index 0000000..d8832af --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/rpc_helpers.go @@ -0,0 +1,396 @@ +package apps + +import ( + "encoding/json" + "strconv" + "strings" + "time" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/maps" + timeutil "github.com/iwind/TeaGo/utils/time" +) + +func listAppMaps(parent *actionutils.ParentAction, keyword string) ([]maps.Map, error) { + clusterNameMap, err := loadHTTPDNSClusterNameMap(parent) + if err != nil { + return nil, err + } + userMapByID, err := loadHTTPDNSUserMap(parent) + if err != nil { + return nil, err + } + + resp, err := parent.RPC().HTTPDNSAppRPC().ListHTTPDNSApps(parent.AdminContext(), &pb.ListHTTPDNSAppsRequest{ + Offset: 0, + Size: 10_000, + Keyword: strings.TrimSpace(keyword), + }) + if err != nil { + return nil, err + } + + result := make([]maps.Map, 0, len(resp.GetApps())) + for _, app := range resp.GetApps() { + domainResp, err := parent.RPC().HTTPDNSDomainRPC().ListHTTPDNSDomainsWithAppId(parent.AdminContext(), &pb.ListHTTPDNSDomainsWithAppIdRequest{ + AppDbId: app.GetId(), + }) + if err != nil { + return nil, err + } + + result = append(result, appPBToMap(app, int64(len(domainResp.GetDomains())), clusterNameMap, userMapByID)) + } + + return result, nil +} + +func findAppMap(parent *actionutils.ParentAction, appDbId int64) (maps.Map, error) { + clusterNameMap, err := loadHTTPDNSClusterNameMap(parent) + if err != nil { + return nil, err + } + userMapByID, err := loadHTTPDNSUserMap(parent) + if err != nil { + return nil, err + } + + if appDbId > 0 { + resp, err := parent.RPC().HTTPDNSAppRPC().FindHTTPDNSApp(parent.AdminContext(), &pb.FindHTTPDNSAppRequest{ + AppDbId: appDbId, + }) + if err != nil { + return nil, err + } + if resp.GetApp() != nil { + domainResp, err := parent.RPC().HTTPDNSDomainRPC().ListHTTPDNSDomainsWithAppId(parent.AdminContext(), &pb.ListHTTPDNSDomainsWithAppIdRequest{ + AppDbId: appDbId, + }) + if err != nil { + return nil, err + } + return appPBToMap(resp.GetApp(), int64(len(domainResp.GetDomains())), clusterNameMap, userMapByID), nil + } + } + + apps, err := listAppMaps(parent, "") + if err != nil { + return nil, err + } + if len(apps) == 0 { + return maps.Map{ + "id": int64(0), + "name": "", + "appId": "", + }, nil + } + return apps[0], nil +} + +func createApp(parent *actionutils.ParentAction, name string, clusterIdsJSON []byte) (int64, error) { + newAppId := "app" + strconv.FormatInt(time.Now().UnixNano()%1_000_000_000_000, 36) + resp, err := parent.RPC().HTTPDNSAppRPC().CreateHTTPDNSApp(parent.AdminContext(), &pb.CreateHTTPDNSAppRequest{ + Name: strings.TrimSpace(name), + AppId: newAppId, + ClusterIdsJSON: clusterIdsJSON, + IsOn: true, + SignEnabled: true, + }) + if err != nil { + return 0, err + } + return resp.GetAppDbId(), nil +} + +func deleteAppByID(parent *actionutils.ParentAction, appDbId int64) error { + _, err := parent.RPC().HTTPDNSAppRPC().DeleteHTTPDNSApp(parent.AdminContext(), &pb.DeleteHTTPDNSAppRequest{ + AppDbId: appDbId, + }) + return err +} + +func updateAppSettings(parent *actionutils.ParentAction, appDbId int64, name string, clusterIdsJSON []byte, isOn bool, userId int64) error { + _, err := parent.RPC().HTTPDNSAppRPC().UpdateHTTPDNSApp(parent.AdminContext(), &pb.UpdateHTTPDNSAppRequest{ + AppDbId: appDbId, + Name: strings.TrimSpace(name), + ClusterIdsJSON: clusterIdsJSON, + IsOn: isOn, + UserId: userId, + }) + return err +} + +func updateAppSignEnabled(parent *actionutils.ParentAction, appDbId int64, signEnabled bool) error { + _, err := parent.RPC().HTTPDNSAppRPC().UpdateHTTPDNSAppSignEnabled(parent.AdminContext(), &pb.UpdateHTTPDNSAppSignEnabledRequest{ + AppDbId: appDbId, + SignEnabled: signEnabled, + }) + return err +} + +func resetAppSignSecret(parent *actionutils.ParentAction, appDbId int64) (*pb.ResetHTTPDNSAppSignSecretResponse, error) { + return parent.RPC().HTTPDNSAppRPC().ResetHTTPDNSAppSignSecret(parent.AdminContext(), &pb.ResetHTTPDNSAppSignSecretRequest{ + AppDbId: appDbId, + }) +} + +func listDomainMaps(parent *actionutils.ParentAction, appDbId int64, keyword string) ([]maps.Map, error) { + resp, err := parent.RPC().HTTPDNSDomainRPC().ListHTTPDNSDomainsWithAppId(parent.AdminContext(), &pb.ListHTTPDNSDomainsWithAppIdRequest{ + AppDbId: appDbId, + Keyword: strings.TrimSpace(keyword), + }) + if err != nil { + return nil, err + } + + result := make([]maps.Map, 0, len(resp.GetDomains())) + for _, domain := range resp.GetDomains() { + result = append(result, maps.Map{ + "id": domain.GetId(), + "name": domain.GetDomain(), + "isOn": domain.GetIsOn(), + "customRecordCount": domain.GetRuleCount(), + }) + } + return result, nil +} + +func createDomain(parent *actionutils.ParentAction, appDbId int64, domain string) error { + _, err := parent.RPC().HTTPDNSDomainRPC().CreateHTTPDNSDomain(parent.AdminContext(), &pb.CreateHTTPDNSDomainRequest{ + AppDbId: appDbId, + Domain: strings.TrimSpace(domain), + IsOn: true, + }) + return err +} + +func deleteDomain(parent *actionutils.ParentAction, domainId int64) error { + _, err := parent.RPC().HTTPDNSDomainRPC().DeleteHTTPDNSDomain(parent.AdminContext(), &pb.DeleteHTTPDNSDomainRequest{ + DomainId: domainId, + }) + return err +} + +func findDomainMap(domains []maps.Map, domainID int64) maps.Map { + if len(domains) == 0 { + return maps.Map{} + } + if domainID <= 0 { + return domains[0] + } + for _, domain := range domains { + if domain.GetInt64("id") == domainID { + return domain + } + } + return domains[0] +} + +func listCustomRuleMaps(parent *actionutils.ParentAction, domainId int64) ([]maps.Map, error) { + resp, err := parent.RPC().HTTPDNSRuleRPC().ListHTTPDNSCustomRulesWithDomainId(parent.AdminContext(), &pb.ListHTTPDNSCustomRulesWithDomainIdRequest{ + DomainId: domainId, + }) + if err != nil { + return nil, err + } + + result := make([]maps.Map, 0, len(resp.GetRules())) + for _, rule := range resp.GetRules() { + recordValues := make([]maps.Map, 0, len(rule.GetRecords())) + recordType := "A" + weightEnabled := false + for _, record := range rule.GetRecords() { + if len(recordType) == 0 { + recordType = strings.ToUpper(strings.TrimSpace(record.GetRecordType())) + } + if record.GetWeight() > 0 && record.GetWeight() != 100 { + weightEnabled = true + } + recordValues = append(recordValues, maps.Map{ + "type": strings.ToUpper(strings.TrimSpace(record.GetRecordType())), + "value": record.GetRecordValue(), + "weight": record.GetWeight(), + }) + } + if len(recordValues) == 0 { + recordValues = append(recordValues, maps.Map{ + "type": "A", + "value": "", + "weight": 100, + }) + } + + item := maps.Map{ + "id": rule.GetId(), + "lineScope": rule.GetLineScope(), + "lineCarrier": defaultLineField(rule.GetLineCarrier()), + "lineRegion": defaultLineField(rule.GetLineRegion()), + "lineProvince": defaultLineField(rule.GetLineProvince()), + "lineContinent": defaultLineField(rule.GetLineContinent()), + "lineCountry": defaultLineField(rule.GetLineCountry()), + "ruleName": rule.GetRuleName(), + "recordType": recordType, + "recordValues": recordValues, + "weightEnabled": weightEnabled, + "ttl": rule.GetTtl(), + "isOn": rule.GetIsOn(), + "updatedAt": formatDateTime(rule.GetUpdatedAt()), + } + item["lineText"] = buildLineText(item) + item["recordValueText"] = buildRecordValueText(item) + result = append(result, item) + } + return result, nil +} + +func createCustomRule(parent *actionutils.ParentAction, rule *pb.HTTPDNSCustomRule) (int64, error) { + resp, err := parent.RPC().HTTPDNSRuleRPC().CreateHTTPDNSCustomRule(parent.AdminContext(), &pb.CreateHTTPDNSCustomRuleRequest{ + Rule: rule, + }) + if err != nil { + return 0, err + } + return resp.GetRuleId(), nil +} + +func updateCustomRule(parent *actionutils.ParentAction, rule *pb.HTTPDNSCustomRule) error { + _, err := parent.RPC().HTTPDNSRuleRPC().UpdateHTTPDNSCustomRule(parent.AdminContext(), &pb.UpdateHTTPDNSCustomRuleRequest{ + Rule: rule, + }) + return err +} + +func deleteCustomRule(parent *actionutils.ParentAction, ruleId int64) error { + _, err := parent.RPC().HTTPDNSRuleRPC().DeleteHTTPDNSCustomRule(parent.AdminContext(), &pb.DeleteHTTPDNSCustomRuleRequest{ + RuleId: ruleId, + }) + return err +} + +func toggleCustomRule(parent *actionutils.ParentAction, ruleId int64, isOn bool) error { + _, err := parent.RPC().HTTPDNSRuleRPC().UpdateHTTPDNSCustomRuleStatus(parent.AdminContext(), &pb.UpdateHTTPDNSCustomRuleStatusRequest{ + RuleId: ruleId, + IsOn: isOn, + }) + return err +} + +func appPBToMap(app *pb.HTTPDNSApp, domainCount int64, clusterMapByID map[int64]maps.Map, userMapByID map[int64]maps.Map) maps.Map { + signSecret := app.GetSignSecret() + + // 读取集群 ID 列表 + var clusterIds []int64 + if len(app.GetClusterIdsJSON()) > 0 { + _ = json.Unmarshal(app.GetClusterIdsJSON(), &clusterIds) + } + + // 构建集群映射列表 + var clusterMaps []maps.Map + for _, cid := range clusterIds { + cm := clusterMapByID[cid] + if cm == nil { + cm = maps.Map{"id": cid, "name": "", "apiAddress": ""} + } + clusterMaps = append(clusterMaps, cm) + } + + var userMap maps.Map + if app.GetUserId() > 0 { + userMap = userMapByID[app.GetUserId()] + if userMap == nil { + userMap = maps.Map{ + "id": app.GetUserId(), + "fullname": "用户#" + strconv.FormatInt(app.GetUserId(), 10), + "username": "-", + } + } + } + + return maps.Map{ + "id": app.GetId(), + "name": app.GetName(), + "appId": app.GetAppId(), + "clusterIds": clusterIds, + "clusters": clusterMaps, + "userId": app.GetUserId(), + "user": userMap, + "isOn": app.GetIsOn(), + "domainCount": domainCount, + "sniPolicyText": "隐匿 SNI", + "signEnabled": app.GetSignEnabled(), + "signSecretPlain": signSecret, + "signSecretMasked": maskSecret(signSecret), + "signSecretUpdated": formatDateTime(app.GetSignUpdatedAt()), + } +} + +func loadHTTPDNSClusterNameMap(parent *actionutils.ParentAction) (map[int64]maps.Map, error) { + resp, err := parent.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(parent.AdminContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if err != nil { + return nil, err + } + + result := map[int64]maps.Map{} + for _, cluster := range resp.GetClusters() { + port := "443" + if rawTLS := cluster.GetTlsPolicyJSON(); len(rawTLS) > 0 { + tlsConfig := maps.Map{} + if err := json.Unmarshal(rawTLS, &tlsConfig); err == nil { + if listenRaw := tlsConfig.Get("listen"); listenRaw != nil { + var listenAddresses []maps.Map + if data, err := json.Marshal(listenRaw); err == nil { + if err := json.Unmarshal(data, &listenAddresses); err == nil { + if len(listenAddresses) > 0 && len(listenAddresses[0].GetString("portRange")) > 0 { + port = listenAddresses[0].GetString("portRange") + } + } + } + } + } + } + apiAddress := "https://" + cluster.GetServiceDomain() + ":" + port + + result[cluster.GetId()] = maps.Map{ + "id": cluster.GetId(), + "name": cluster.GetName(), + "apiAddress": apiAddress, + } + } + return result, nil +} + +func loadHTTPDNSUserMap(parent *actionutils.ParentAction) (map[int64]maps.Map, error) { + resp, err := parent.RPC().UserRPC().ListEnabledUsers(parent.AdminContext(), &pb.ListEnabledUsersRequest{ + Offset: 0, + Size: 10_000, + }) + if err != nil { + return nil, err + } + + result := map[int64]maps.Map{} + for _, user := range resp.GetUsers() { + result[user.GetId()] = maps.Map{ + "id": user.GetId(), + "fullname": user.GetFullname(), + "username": user.GetUsername(), + } + } + return result, nil +} + +func defaultLineField(value string) string { + value = strings.TrimSpace(value) + if len(value) == 0 { + return "默认" + } + return value +} + +func formatDateTime(ts int64) string { + if ts <= 0 { + return "" + } + return timeutil.FormatTime("Y-m-d H:i:s", ts) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk.go new file mode 100644 index 0000000..95a2509 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk.go @@ -0,0 +1,30 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" +) + +type SdkAction struct { + actionutils.ParentAction +} + +func (this *SdkAction) Init() { + this.Nav("httpdns", "app", "sdk") +} + +func (this *SdkAction) RunGet(params struct { + AppId int64 +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + + httpdnsutils.AddAppTabbar(this.Parent(), app.GetString("name"), params.AppId, "sdk") + this.Data["app"] = app + this.Show() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_check.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_check.go new file mode 100644 index 0000000..a8f2a3c --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_check.go @@ -0,0 +1,68 @@ +package apps + +import ( + "net/url" + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +) + +type SdkCheckAction struct { + actionutils.ParentAction +} + +func (this *SdkCheckAction) Init() { + this.Nav("", "", "") +} + +func (this *SdkCheckAction) RunGet(params struct { + Platform string + Version string + Type string +}) { + platform, _, _, filename, err := resolveSDKPlatform(params.Platform) + if err != nil { + this.Data["exists"] = false + this.Data["message"] = err.Error() + this.Success() + return + } + + version := strings.TrimSpace(params.Version) + t := strings.ToLower(strings.TrimSpace(params.Type)) + if t == "doc" { + docPath := findUploadedSDKDocPath(platform, version) + if len(docPath) == 0 { + this.Data["exists"] = false + this.Data["message"] = "当前平台/版本尚未上传集成文档" + this.Success() + return + } + + downloadURL := "/httpdns/apps/sdk/doc?platform=" + url.QueryEscape(platform) + if len(version) > 0 { + downloadURL += "&version=" + url.QueryEscape(version) + } + this.Data["exists"] = true + this.Data["url"] = downloadURL + this.Success() + return + } + + archivePath := findSDKArchivePath(filename, version) + if len(archivePath) == 0 { + this.Data["exists"] = false + this.Data["message"] = "当前平台/版本尚未上传 SDK 安装包" + this.Success() + return + } + + downloadURL := "/httpdns/apps/sdk/download?platform=" + url.QueryEscape(platform) + if len(version) > 0 { + downloadURL += "&version=" + url.QueryEscape(version) + } + downloadURL += "&raw=1" + this.Data["exists"] = true + this.Data["url"] = downloadURL + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_doc.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_doc.go new file mode 100644 index 0000000..31b8ab1 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_doc.go @@ -0,0 +1,55 @@ +package apps + +import ( + "net/url" + "os" + "path/filepath" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +) + +type SdkDocAction struct { + actionutils.ParentAction +} + +func (this *SdkDocAction) Init() { + this.Nav("", "", "") +} + +func (this *SdkDocAction) RunGet(params struct { + Platform string + Version string +}) { + platform, _, _, _, err := resolveSDKPlatform(params.Platform) + if err != nil { + this.Data["exists"] = false + this.Data["message"] = err.Error() + this.Success() + return + } + + docPath := findUploadedSDKDocPath(platform, params.Version) + if len(docPath) == 0 { + this.Data["exists"] = false + this.Data["message"] = "当前平台/版本尚未上传集成文档" + this.Success() + return + } + + data, err := os.ReadFile(docPath) + if err != nil || len(data) == 0 { + this.Data["exists"] = false + this.Data["message"] = "读取集成文档失败" + this.Success() + return + } + + downloadName := filepath.Base(docPath) + if len(downloadName) == 0 || downloadName == "." || downloadName == string(filepath.Separator) { + downloadName = "sdk-doc.md" + } + + this.AddHeader("Content-Type", "text/markdown; charset=utf-8") + this.AddHeader("Content-Disposition", "attachment; filename=\"sdk-doc.md\"; filename*=UTF-8''"+url.PathEscape(downloadName)) + _, _ = this.ResponseWriter.Write(data) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_download.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_download.go new file mode 100644 index 0000000..b6d19e1 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_download.go @@ -0,0 +1,66 @@ +package apps + +import ( + "io" + "net/url" + "os" + "path/filepath" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +) + +type SdkDownloadAction struct { + actionutils.ParentAction +} + +func (this *SdkDownloadAction) Init() { + this.Nav("", "", "") +} + +func (this *SdkDownloadAction) RunGet(params struct { + Platform string + Version string + Raw int +}) { + _, _, _, filename, err := resolveSDKPlatform(params.Platform) + if err != nil { + this.Data["exists"] = false + this.Data["message"] = err.Error() + this.Success() + return + } + + archivePath := findSDKArchivePath(filename, params.Version) + if len(archivePath) == 0 { + this.Data["exists"] = false + this.Data["message"] = "当前平台/版本尚未上传 SDK 安装包" + this.Success() + return + } + + fp, err := os.Open(archivePath) + if err != nil { + this.Data["exists"] = false + this.Data["message"] = "打开 SDK 安装包失败: " + err.Error() + this.Success() + return + } + defer func() { + _ = fp.Close() + }() + + downloadName := filepath.Base(archivePath) + if len(downloadName) == 0 || downloadName == "." || downloadName == string(filepath.Separator) { + downloadName = filename + } + + if params.Raw == 1 { + this.AddHeader("Content-Type", "application/octet-stream") + this.AddHeader("X-SDK-Filename", downloadName) + } else { + this.AddHeader("Content-Type", "application/zip") + this.AddHeader("Content-Disposition", "attachment; filename=\"sdk-download\"; filename*=UTF-8''"+url.PathEscape(downloadName)) + } + this.AddHeader("X-Accel-Buffering", "no") + _, _ = io.Copy(this.ResponseWriter, fp) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_helpers.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_helpers.go new file mode 100644 index 0000000..236d5c9 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_helpers.go @@ -0,0 +1,262 @@ +package apps + +import ( + "encoding/json" + "errors" + "os" + "path/filepath" + "strings" + "time" + + "github.com/iwind/TeaGo/Tea" +) + +type sdkUploadMeta struct { + Platform string `json:"platform"` + Version string `json:"version"` + FileType string `json:"fileType"` // sdk | doc + Filename string `json:"filename"` + UpdatedAt int64 `json:"updatedAt"` +} + +type sdkUploadMetaRecord struct { + Meta sdkUploadMeta + Dir string + FilePath string +} + +func sdkUploadMetaFilename(platform string, version string, fileType string) string { + platform = strings.ToLower(strings.TrimSpace(platform)) + version = strings.TrimSpace(version) + fileType = strings.ToLower(strings.TrimSpace(fileType)) + return ".httpdns-sdk-meta-" + platform + "-v" + version + "-" + fileType + ".json" +} + +func isSDKUploadMetaFile(name string) bool { + name = strings.ToLower(strings.TrimSpace(name)) + return strings.HasPrefix(name, ".httpdns-sdk-meta-") && strings.HasSuffix(name, ".json") +} + +func parseSDKPlatformFromDownloadFilename(downloadFilename string) string { + name := strings.ToLower(strings.TrimSpace(downloadFilename)) + if !strings.HasPrefix(name, "httpdns-sdk-") || !strings.HasSuffix(name, ".zip") { + return "" + } + + platform := strings.TrimSuffix(strings.TrimPrefix(name, "httpdns-sdk-"), ".zip") + switch platform { + case "android", "ios", "flutter": + return platform + default: + return "" + } +} + +func listSDKUploadMetaRecords() []sdkUploadMetaRecord { + type wrapped struct { + record sdkUploadMetaRecord + modTime time.Time + } + + byKey := map[string]wrapped{} + for _, dir := range sdkUploadSearchDirs() { + entries, err := os.ReadDir(dir) + if err != nil { + continue + } + + for _, entry := range entries { + if entry.IsDir() { + continue + } + + name := entry.Name() + if !isSDKUploadMetaFile(name) { + continue + } + + metaPath := filepath.Join(dir, name) + data, err := os.ReadFile(metaPath) + if err != nil || len(data) == 0 { + continue + } + + var meta sdkUploadMeta + if err = json.Unmarshal(data, &meta); err != nil { + continue + } + + meta.Platform = strings.ToLower(strings.TrimSpace(meta.Platform)) + meta.Version = strings.TrimSpace(meta.Version) + meta.FileType = strings.ToLower(strings.TrimSpace(meta.FileType)) + meta.Filename = filepath.Base(strings.TrimSpace(meta.Filename)) + if len(meta.Platform) == 0 || len(meta.Version) == 0 || len(meta.Filename) == 0 { + continue + } + if meta.FileType != "sdk" && meta.FileType != "doc" { + continue + } + if strings.Contains(meta.Filename, "..") || strings.Contains(meta.Filename, "/") || strings.Contains(meta.Filename, "\\") { + continue + } + + filePath := filepath.Join(dir, meta.Filename) + fileStat, err := os.Stat(filePath) + if err != nil || fileStat.IsDir() || fileStat.Size() <= 0 { + continue + } + + metaStat, err := os.Stat(metaPath) + if err != nil { + continue + } + if meta.UpdatedAt <= 0 { + meta.UpdatedAt = metaStat.ModTime().Unix() + } + + key := meta.Platform + "|" + meta.Version + "|" + meta.FileType + current := wrapped{ + record: sdkUploadMetaRecord{ + Meta: meta, + Dir: dir, + FilePath: filePath, + }, + modTime: metaStat.ModTime(), + } + old, ok := byKey[key] + if !ok || + current.record.Meta.UpdatedAt > old.record.Meta.UpdatedAt || + (current.record.Meta.UpdatedAt == old.record.Meta.UpdatedAt && current.modTime.After(old.modTime)) || + (current.record.Meta.UpdatedAt == old.record.Meta.UpdatedAt && current.modTime.Equal(old.modTime) && current.record.FilePath > old.record.FilePath) { + byKey[key] = current + } + } + } + + result := make([]sdkUploadMetaRecord, 0, len(byKey)) + for _, item := range byKey { + result = append(result, item.record) + } + return result +} + +func findSDKUploadFileByMeta(platform string, version string, fileType string) string { + platform = strings.ToLower(strings.TrimSpace(platform)) + version = strings.TrimSpace(version) + fileType = strings.ToLower(strings.TrimSpace(fileType)) + if len(platform) == 0 || len(version) == 0 { + return "" + } + + for _, record := range listSDKUploadMetaRecords() { + if record.Meta.Platform == platform && record.Meta.Version == version && record.Meta.FileType == fileType { + return record.FilePath + } + } + return "" +} + +func findNewestSDKUploadFileByMeta(platform string, fileType string) string { + platform = strings.ToLower(strings.TrimSpace(platform)) + fileType = strings.ToLower(strings.TrimSpace(fileType)) + if len(platform) == 0 { + return "" + } + + var foundPath string + var foundUpdatedAt int64 + for _, record := range listSDKUploadMetaRecords() { + if record.Meta.Platform != platform || record.Meta.FileType != fileType { + continue + } + + if len(foundPath) == 0 || record.Meta.UpdatedAt > foundUpdatedAt || (record.Meta.UpdatedAt == foundUpdatedAt && record.FilePath > foundPath) { + foundPath = record.FilePath + foundUpdatedAt = record.Meta.UpdatedAt + } + } + return foundPath +} + +func sdkUploadDir() string { + dirs := sdkUploadDirs() + if len(dirs) > 0 { + return dirs[0] + } + return filepath.Clean(Tea.Root + "/data/httpdns/sdk") +} + +func sdkUploadDirs() []string { + candidates := []string{ + filepath.Clean(Tea.Root + "/../data/httpdns/sdk"), + filepath.Clean(Tea.Root + "/data/httpdns/sdk"), + filepath.Clean(Tea.Root + "/../edge-admin/data/httpdns/sdk"), + filepath.Clean(Tea.Root + "/../edge-user/data/httpdns/sdk"), + filepath.Clean(Tea.Root + "/../../data/httpdns/sdk"), + } + + results := make([]string, 0, len(candidates)) + seen := map[string]bool{} + for _, dir := range candidates { + if len(dir) == 0 || seen[dir] { + continue + } + seen[dir] = true + results = append(results, dir) + } + return results +} + +func sdkUploadSearchDirs() []string { + dirs := sdkUploadDirs() + results := make([]string, 0, len(dirs)) + for _, dir := range dirs { + stat, err := os.Stat(dir) + if err == nil && stat.IsDir() { + results = append(results, dir) + } + } + if len(results) == 0 { + results = append(results, sdkUploadDir()) + } + return results +} + +func resolveSDKPlatform(platform string) (key string, relativeDir string, readmeRelativePath string, downloadFilename string, err error) { + switch strings.ToLower(strings.TrimSpace(platform)) { + case "android": + return "android", "android", "android/README.md", "httpdns-sdk-android.zip", nil + case "ios": + return "ios", "ios", "ios/README.md", "httpdns-sdk-ios.zip", nil + case "flutter": + return "flutter", "flutter/new_httpdns", "flutter/new_httpdns/README.md", "httpdns-sdk-flutter.zip", nil + default: + return "", "", "", "", errors.New("不支持的平台，可选值：android、ios、flutter") + } +} + +func findSDKArchivePath(downloadFilename string, version string) string { + platform := parseSDKPlatformFromDownloadFilename(downloadFilename) + if len(platform) == 0 { + return "" + } + + normalizedVersion := strings.TrimSpace(version) + if len(normalizedVersion) > 0 { + return findSDKUploadFileByMeta(platform, normalizedVersion, "sdk") + } + return findNewestSDKUploadFileByMeta(platform, "sdk") +} + +func findUploadedSDKDocPath(platform string, version string) string { + platform = strings.ToLower(strings.TrimSpace(platform)) + if len(platform) == 0 { + return "" + } + + normalizedVersion := strings.TrimSpace(version) + if len(normalizedVersion) > 0 { + return findSDKUploadFileByMeta(platform, normalizedVersion, "doc") + } + return findNewestSDKUploadFileByMeta(platform, "doc") +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_upload.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_upload.go new file mode 100644 index 0000000..df5f2cb --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_upload.go @@ -0,0 +1,287 @@ +package apps + +import ( + "encoding/json" + "errors" + "os" + "path/filepath" + "sort" + "strconv" + "strings" + "time" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/iwind/TeaGo/actions" +) + +const sdkUploadMaxFileSize = 20 * 1024 * 1024 // 20MB + +type SdkUploadAction struct { + actionutils.ParentAction +} + +func (this *SdkUploadAction) Init() { + this.Nav("httpdns", "app", "sdk") +} + +func (this *SdkUploadAction) RunGet(params struct { + AppId int64 +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + + httpdnsutils.AddAppTabbar(this.Parent(), app.GetString("name"), params.AppId, "sdk") + + this.Data["app"] = app + this.Data["defaultVersion"] = "1.0.0" + this.Data["uploadedFiles"] = listUploadedSDKFiles() + this.Show() +} + +func (this *SdkUploadAction) RunPost(params struct { + AppId int64 + Platform string + Version string + SdkFile *actions.File + DocFile *actions.File + + Must *actions.Must +}) { + params.Must.Field("appId", params.AppId).Gt(0, "请选择应用") + + platform, _, _, _, err := resolveSDKPlatform(params.Platform) + if err != nil { + this.Fail(err.Error()) + return + } + + version, err := normalizeSDKVersion(params.Version) + if err != nil { + this.Fail(err.Error()) + return + } + + if params.SdkFile == nil && params.DocFile == nil { + this.Fail("请至少上传一个文件") + return + } + + uploadDir := sdkUploadDir() + if err = os.MkdirAll(uploadDir, 0755); err != nil { + this.Fail("创建上传目录失败: " + err.Error()) + return + } + + if params.SdkFile != nil { + if err = this.saveUploadedItem(uploadDir, platform, version, "sdk", params.SdkFile); err != nil { + this.Fail(err.Error()) + return + } + } + + if params.DocFile != nil { + if err = this.saveUploadedItem(uploadDir, platform, version, "doc", params.DocFile); err != nil { + this.Fail(err.Error()) + return + } + } + + this.Success() +} + +func (this *SdkUploadAction) saveUploadedItem(uploadDir string, platform string, version string, fileType string, file *actions.File) error { + expectedExt := ".md" + displayType := "集成文档" + if fileType == "sdk" { + expectedExt = ".zip" + displayType = "SDK 包" + } + + filename, err := normalizeUploadedFilename(file.Filename, expectedExt) + if err != nil { + return err + } + + if file.Size > sdkUploadMaxFileSize { + return errors.New(displayType + "文件不能超过 20MB") + } + + data, err := file.Read() + if err != nil { + return errors.New("读取" + displayType + "失败: " + err.Error()) + } + if len(data) == 0 { + return errors.New(displayType + "文件为空，请重新上传") + } + if len(data) > sdkUploadMaxFileSize { + return errors.New(displayType + "文件不能超过 20MB") + } + + if err = saveSDKUploadFile(uploadDir, filename, data); err != nil { + return errors.New("保存" + displayType + "失败: " + err.Error()) + } + + err = saveSDKUploadMetaRecord(uploadDir, sdkUploadMeta{ + Platform: platform, + Version: version, + FileType: fileType, + Filename: filename, + UpdatedAt: time.Now().Unix(), + }) + if err != nil { + return errors.New("保存上传元信息失败: " + err.Error()) + } + + return nil +} + +func normalizeSDKVersion(version string) (string, error) { + version = strings.TrimSpace(version) + if len(version) == 0 { + version = "1.0.0" + } + for _, c := range version { + if (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '.' || c == '_' || c == '-' { + continue + } + return "", errors.New("版本号格式不正确") + } + return version, nil +} + +func normalizeUploadedFilename(raw string, expectedExt string) (string, error) { + filename := filepath.Base(strings.TrimSpace(raw)) + if len(filename) == 0 || filename == "." || filename == string(filepath.Separator) { + return "", errors.New("文件名不能为空") + } + if strings.Contains(filename, "/") || strings.Contains(filename, "\\") || strings.Contains(filename, "..") { + return "", errors.New("文件名不合法") + } + + actualExt := strings.ToLower(filepath.Ext(filename)) + if actualExt != strings.ToLower(expectedExt) { + if expectedExt == ".zip" { + return "", errors.New("SDK 包仅支持 .zip 文件") + } + return "", errors.New("集成文档仅支持 .md 文件") + } + + return filename, nil +} + +func saveSDKUploadFile(baseDir string, filename string, data []byte) error { + targetPath := filepath.Join(baseDir, filename) + tmpPath := targetPath + ".tmp" + err := os.WriteFile(tmpPath, data, 0644) + if err != nil { + return err + } + return os.Rename(tmpPath, targetPath) +} + +func saveSDKUploadMetaRecord(baseDir string, meta sdkUploadMeta) error { + meta.Platform = strings.ToLower(strings.TrimSpace(meta.Platform)) + meta.Version = strings.TrimSpace(meta.Version) + meta.FileType = strings.ToLower(strings.TrimSpace(meta.FileType)) + meta.Filename = filepath.Base(strings.TrimSpace(meta.Filename)) + if len(meta.Platform) == 0 || len(meta.Version) == 0 || len(meta.FileType) == 0 || len(meta.Filename) == 0 { + return errors.New("上传元信息不完整") + } + + metaFilename := sdkUploadMetaFilename(meta.Platform, meta.Version, meta.FileType) + metaPath := filepath.Join(baseDir, metaFilename) + if data, err := os.ReadFile(metaPath); err == nil && len(data) > 0 { + var oldMeta sdkUploadMeta + if json.Unmarshal(data, &oldMeta) == nil { + oldFile := filepath.Base(strings.TrimSpace(oldMeta.Filename)) + if len(oldFile) > 0 && oldFile != meta.Filename { + _ = os.Remove(filepath.Join(baseDir, oldFile)) + } + } + } + + data, err := json.Marshal(meta) + if err != nil { + return err + } + + return saveSDKUploadFile(baseDir, metaFilename, data) +} + +func listUploadedSDKFiles() []map[string]interface{} { + type item struct { + Name string + Platform string + FileType string + Version string + SizeBytes int64 + UpdatedAt int64 + } + + items := make([]item, 0) + for _, record := range listSDKUploadMetaRecords() { + stat, err := os.Stat(record.FilePath) + if err != nil || stat.IsDir() { + continue + } + + fileType := "SDK 包" + if record.Meta.FileType == "doc" { + fileType = "集成文档" + } + + items = append(items, item{ + Name: filepath.Base(record.FilePath), + Platform: record.Meta.Platform, + FileType: fileType, + Version: record.Meta.Version, + SizeBytes: stat.Size(), + UpdatedAt: stat.ModTime().Unix(), + }) + } + + sort.Slice(items, func(i, j int) bool { + if items[i].UpdatedAt == items[j].UpdatedAt { + return items[i].Name > items[j].Name + } + return items[i].UpdatedAt > items[j].UpdatedAt + }) + + result := make([]map[string]interface{}, 0, len(items)) + for _, it := range items { + result = append(result, map[string]interface{}{ + "name": it.Name, + "platform": it.Platform, + "fileType": it.FileType, + "version": it.Version, + "sizeText": formatSDKFileSize(it.SizeBytes), + "updatedAt": time.Unix(it.UpdatedAt, 0).Format("2006-01-02 15:04:05"), + }) + } + return result +} + +func formatSDKFileSize(size int64) string { + if size < 1024 { + return strconv.FormatInt(size, 10) + " B" + } + + sizeKB := float64(size) / 1024 + if sizeKB < 1024 { + return strconv.FormatFloat(sizeKB, 'f', 1, 64) + " KB" + } + + sizeMB := sizeKB / 1024 + if sizeMB < 1024 { + return strconv.FormatFloat(sizeMB, 'f', 1, 64) + " MB" + } + + sizeGB := sizeMB / 1024 + return strconv.FormatFloat(sizeGB, 'f', 1, 64) + " GB" +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_upload_delete.go b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_upload_delete.go new file mode 100644 index 0000000..4809474 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/apps/sdk_upload_delete.go @@ -0,0 +1,90 @@ +package apps + +import ( + "encoding/json" + "os" + "path/filepath" + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +) + +type SdkUploadDeleteAction struct { + actionutils.ParentAction +} + +func (this *SdkUploadDeleteAction) Init() { + this.Nav("httpdns", "app", "sdk") +} + +func (this *SdkUploadDeleteAction) RunPost(params struct { + AppId int64 + Filename string +}) { + if params.AppId <= 0 { + this.Fail("请选择应用") + return + } + + filename := strings.TrimSpace(params.Filename) + if len(filename) == 0 { + this.Fail("文件名不能为空") + return + } + if strings.Contains(filename, "/") || strings.Contains(filename, "\\") || strings.Contains(filename, "..") { + this.Fail("文件名不合法") + return + } + lowName := strings.ToLower(filename) + if !strings.HasSuffix(lowName, ".zip") && !strings.HasSuffix(lowName, ".md") { + this.Fail("仅允许删除 .zip 或 .md 文件") + return + } + + for _, dir := range sdkUploadDirs() { + fullPath := filepath.Join(dir, filename) + stat, err := os.Stat(fullPath) + if err != nil || stat.IsDir() { + continue + } + if err = os.Remove(fullPath); err != nil { + this.Fail("删除失败: " + err.Error()) + return + } + } + + // 删除引用该文件的元数据 + for _, dir := range sdkUploadDirs() { + entries, err := os.ReadDir(dir) + if err != nil { + continue + } + + for _, entry := range entries { + if entry.IsDir() { + continue + } + if !isSDKUploadMetaFile(entry.Name()) { + continue + } + + metaPath := filepath.Join(dir, entry.Name()) + data, err := os.ReadFile(metaPath) + if err != nil || len(data) == 0 { + continue + } + + var meta sdkUploadMeta + if err = json.Unmarshal(data, &meta); err != nil { + continue + } + if filepath.Base(strings.TrimSpace(meta.Filename)) != filename { + continue + } + + _ = os.Remove(metaPath) + } + } + + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/certs.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/certs.go new file mode 100644 index 0000000..f0d80ca --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/certs.go @@ -0,0 +1,17 @@ +package clusters + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +) + +type CertsAction struct { + actionutils.ParentAction +} + +func (this *CertsAction) Init() { + this.Nav("httpdns", "cluster", "certs") +} + +func (this *CertsAction) RunGet(params struct{}) { + this.RedirectURL("/httpdns/clusters") +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/checkPorts.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/checkPorts.go new file mode 100644 index 0000000..63edfa2 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/checkPorts.go @@ -0,0 +1,10 @@ +package clusters +import ( +"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +"github.com/iwind/TeaGo/maps" +) +type CheckPortsAction struct { actionutils.ParentAction } +func (this *CheckPortsAction) RunPost(params struct{ NodeId int64 }) { +this.Data["results"] = []maps.Map{} +this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster.go new file mode 100644 index 0000000..03dbd64 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster.go @@ -0,0 +1,97 @@ +package clusters + +import ( + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/iwind/TeaGo/maps" +) + +type ClusterAction struct { + actionutils.ParentAction +} + +func (this *ClusterAction) Init() { + this.Nav("httpdns", "cluster", "index") +} + +func (this *ClusterAction) RunGet(params struct { + ClusterId int64 + InstalledState int + ActiveState int + Keyword string +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + cluster, err := findClusterMap(this.Parent(), params.ClusterId) + if err != nil { + this.ErrorPage(err) + return + } + + httpdnsutils.AddClusterTabbar(this.Parent(), cluster.GetString("name"), params.ClusterId, "node") + + nodes, err := listNodeMaps(this.Parent(), params.ClusterId) + if err != nil { + this.ErrorPage(err) + return + } + nodes = filterClusterNodes(nodes, params.InstalledState, params.ActiveState, params.Keyword) + + this.Data["clusterId"] = params.ClusterId + this.Data["cluster"] = cluster + this.Data["installState"] = params.InstalledState + this.Data["activeState"] = params.ActiveState + this.Data["keyword"] = params.Keyword + this.Data["nodes"] = nodes + this.Data["hasNodes"] = len(nodes) > 0 + this.Data["page"] = "" + this.Show() +} + +func filterClusterNodes(nodes []maps.Map, installedState int, activeState int, keyword string) []maps.Map { + keyword = strings.ToLower(strings.TrimSpace(keyword)) + + result := make([]maps.Map, 0, len(nodes)) + for _, node := range nodes { + isInstalled := node.GetBool("isInstalled") + if installedState == 1 && !isInstalled { + continue + } + if installedState == 2 && isInstalled { + continue + } + + status := node.GetMap("status") + isOnline := node.GetBool("isOn") && node.GetBool("isUp") && status.GetBool("isActive") + if activeState == 1 && !isOnline { + continue + } + if activeState == 2 && isOnline { + continue + } + + if len(keyword) > 0 { + hit := strings.Contains(strings.ToLower(node.GetString("name")), keyword) + if !hit { + ipAddresses, ok := node["ipAddresses"].([]maps.Map) + if ok { + for _, ipAddr := range ipAddresses { + if strings.Contains(strings.ToLower(ipAddr.GetString("ip")), keyword) { + hit = true + break + } + } + } + } + if !hit { + continue + } + } + + result = append(result, node) + } + + return result +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/index.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/index.go new file mode 100644 index 0000000..d34840b --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/index.go @@ -0,0 +1,73 @@ +package node + +import ( + "strings" + "time" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + timeutil "github.com/iwind/TeaGo/utils/time" +) + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) Init() { + this.Nav("", "node", "node") + this.SecondMenu("nodes") +} + +func (this *IndexAction) RunGet(params struct { + ClusterId int64 + NodeId int64 +}) { + node, err := findHTTPDNSNodeMap(this.Parent(), params.NodeId) + if err != nil { + this.ErrorPage(err) + return + } + cluster, err := findHTTPDNSClusterMap(this.Parent(), params.ClusterId) + if err != nil { + this.ErrorPage(err) + return + } + + this.Data["clusterId"] = params.ClusterId + this.Data["nodeId"] = params.NodeId + this.Data["node"] = node + this.Data["currentCluster"] = cluster + + status := node.GetMap("status") + updatedAt := status.GetInt64("updatedAt") + nodeDatetime := "" + nodeTimeDiff := int64(0) + if updatedAt > 0 { + nodeDatetime = timeutil.FormatTime("Y-m-d H:i:s", updatedAt) + nodeTimeDiff = time.Now().Unix() - updatedAt + if nodeTimeDiff < 0 { + nodeTimeDiff = -nodeTimeDiff + } + } + this.Data["nodeDatetime"] = nodeDatetime + this.Data["nodeTimeDiff"] = nodeTimeDiff + + osName := strings.TrimSpace(status.GetString("os")) + if len(osName) > 0 { + checkVersionResp, err := this.RPC().HTTPDNSNodeRPC().CheckHTTPDNSNodeLatestVersion(this.AdminContext(), &pb.CheckHTTPDNSNodeLatestVersionRequest{ + Os: osName, + Arch: strings.TrimSpace(status.GetString("arch")), + CurrentVersion: strings.TrimSpace(status.GetString("buildVersion")), + }) + if err != nil { + this.ErrorPage(err) + return + } + this.Data["shouldUpgrade"] = checkVersionResp.GetHasNewVersion() + this.Data["newVersion"] = checkVersionResp.GetNewVersion() + } else { + this.Data["shouldUpgrade"] = false + this.Data["newVersion"] = "" + } + this.Show() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/install.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/install.go new file mode 100644 index 0000000..8da9713 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/install.go @@ -0,0 +1,122 @@ +package node + +import ( + "encoding/json" + "fmt" + "strings" + "time" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/maps" +) + +type InstallAction struct { + actionutils.ParentAction +} + +func (this *InstallAction) Init() { + this.Nav("", "node", "install") + this.SecondMenu("nodes") +} + +func (this *InstallAction) RunGet(params struct { + ClusterId int64 + NodeId int64 +}) { + node, err := findHTTPDNSNodeMap(this.Parent(), params.NodeId) + if err != nil { + this.ErrorPage(err) + return + } + cluster, err := findHTTPDNSClusterMap(this.Parent(), params.ClusterId) + if err != nil { + this.ErrorPage(err) + return + } + + this.Data["clusterId"] = params.ClusterId + this.Data["nodeId"] = params.NodeId + this.Data["currentCluster"] = cluster + this.Data["node"] = node + this.Data["installStatus"] = node.GetMap("installStatus") + + apiNodesResp, err := this.RPC().APINodeRPC().FindAllEnabledAPINodes(this.AdminContext(), &pb.FindAllEnabledAPINodesRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + apiEndpoints := make([]string, 0, 8) + for _, apiNode := range apiNodesResp.GetApiNodes() { + if !apiNode.GetIsOn() { + continue + } + apiEndpoints = append(apiEndpoints, apiNode.GetAccessAddrs()...) + } + if len(apiEndpoints) == 0 { + apiEndpoints = []string{"http://127.0.0.1:7788"} + } + this.Data["apiEndpoints"] = "\"" + strings.Join(apiEndpoints, "\", \"") + "\"" + // 从 NodeLogin 中提取 SSH 地址 + this.Data["sshAddr"] = "" + loginMap, _ := node.Get("login").(maps.Map) + if loginMap != nil { + paramsMap, _ := loginMap.Get("params").(maps.Map) + if paramsMap != nil { + host := paramsMap.GetString("host") + if len(host) > 0 { + port := paramsMap.GetInt("port") + if port <= 0 { + port = 22 + } + this.Data["sshAddr"] = fmt.Sprintf("%s:%d", configutils.QuoteIP(host), port) + } + } + } + this.Show() +} + +func (this *InstallAction) RunPost(params struct { + NodeId int64 +}) { + nodeResp, err := this.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(this.AdminContext(), &pb.FindHTTPDNSNodeRequest{ + NodeId: params.NodeId, + }) + if err != nil { + this.ErrorPage(err) + return + } + node := nodeResp.GetNode() + if node == nil { + this.Fail("节点不存在") + return + } + + existingStatus := map[string]interface{}{} + if len(node.GetInstallStatusJSON()) > 0 { + _ = json.Unmarshal(node.GetInstallStatusJSON(), &existingStatus) + } + + existingStatus["isRunning"] = true + existingStatus["isFinished"] = false + existingStatus["isOk"] = false + existingStatus["error"] = "" + existingStatus["errorCode"] = "" + existingStatus["updatedAt"] = time.Now().Unix() + + installStatusJSON, _ := json.Marshal(existingStatus) + _, err = this.RPC().HTTPDNSNodeRPC().UpdateHTTPDNSNodeStatus(this.AdminContext(), &pb.UpdateHTTPDNSNodeStatusRequest{ + NodeId: params.NodeId, + IsUp: node.GetIsUp(), + IsInstalled: false, + IsActive: node.GetIsActive(), + StatusJSON: node.GetStatusJSON(), + InstallStatusJSON: installStatusJSON, + }) + if err != nil { + this.ErrorPage(err) + return + } + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/logs.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/logs.go new file mode 100644 index 0000000..35e4168 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/logs.go @@ -0,0 +1,82 @@ +package node + +import ( + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + timeutil "github.com/iwind/TeaGo/utils/time" + "github.com/iwind/TeaGo/maps" +) + +type LogsAction struct { + actionutils.ParentAction +} + +func (this *LogsAction) Init() { + this.Nav("", "node", "log") + this.SecondMenu("nodes") +} + +func (this *LogsAction) RunGet(params struct { + ClusterId int64 + NodeId int64 + DayFrom string + DayTo string + Level string + Keyword string +}) { + node, err := findHTTPDNSNodeMap(this.Parent(), params.NodeId) + if err != nil { + this.ErrorPage(err) + return + } + cluster, err := findHTTPDNSClusterMap(this.Parent(), params.ClusterId) + if err != nil { + this.ErrorPage(err) + return + } + + this.Data["clusterId"] = params.ClusterId + this.Data["nodeId"] = params.NodeId + this.Data["currentCluster"] = cluster + this.Data["node"] = node + this.Data["dayFrom"] = params.DayFrom + this.Data["dayTo"] = params.DayTo + this.Data["level"] = params.Level + this.Data["keyword"] = params.Keyword + + day := strings.TrimSpace(params.DayFrom) + if len(day) == 0 { + day = strings.TrimSpace(params.DayTo) + } + + resp, err := this.RPC().HTTPDNSRuntimeLogRPC().ListHTTPDNSRuntimeLogs(this.AdminContext(), &pb.ListHTTPDNSRuntimeLogsRequest{ + Day: day, + ClusterId: params.ClusterId, + NodeId: params.NodeId, + Level: strings.TrimSpace(params.Level), + Keyword: strings.TrimSpace(params.Keyword), + Offset: 0, + Size: 100, + }) + if err != nil { + this.ErrorPage(err) + return + } + + logs := make([]maps.Map, 0, len(resp.GetLogs())) + for _, item := range resp.GetLogs() { + logs = append(logs, maps.Map{ + "level": item.GetLevel(), + "tag": item.GetType(), + "description": item.GetDescription(), + "createdAt": item.GetCreatedAt(), + "createdTime": timeutil.FormatTime("Y-m-d H:i:s", item.GetCreatedAt()), + "count": item.GetCount(), + }) + } + this.Data["logs"] = logs + this.Data["page"] = "" + this.Show() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/rpc_helpers.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/rpc_helpers.go new file mode 100644 index 0000000..2694746 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/rpc_helpers.go @@ -0,0 +1,204 @@ +package node + +import ( + "encoding/json" + "fmt" + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/maps" +) + +func findHTTPDNSClusterMap(parent *actionutils.ParentAction, clusterID int64) (maps.Map, error) { + resp, err := parent.RPC().HTTPDNSClusterRPC().FindHTTPDNSCluster(parent.AdminContext(), &pb.FindHTTPDNSClusterRequest{ + ClusterId: clusterID, + }) + if err != nil { + return nil, err + } + if resp.GetCluster() == nil { + return maps.Map{ + "id": clusterID, + "name": "", + "installDir": "/root/edge-httpdns", + }, nil + } + + cluster := resp.GetCluster() + installDir := strings.TrimSpace(cluster.GetInstallDir()) + if len(installDir) == 0 { + installDir = "/root/edge-httpdns" + } + return maps.Map{ + "id": cluster.GetId(), + "name": cluster.GetName(), + "installDir": installDir, + }, nil +} + +func findHTTPDNSNodeMap(parent *actionutils.ParentAction, nodeID int64) (maps.Map, error) { + resp, err := parent.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(parent.AdminContext(), &pb.FindHTTPDNSNodeRequest{ + NodeId: nodeID, + }) + if err != nil { + return nil, err + } + if resp.GetNode() == nil { + return maps.Map{}, nil + } + + node := resp.GetNode() + statusMap := decodeNodeStatus(node.GetStatusJSON()) + installStatusMap := decodeInstallStatus(node.GetInstallStatusJSON()) + + var ipAddresses = []maps.Map{} + if installStatusMap.Has("ipAddresses") { + for _, addr := range installStatusMap.GetSlice("ipAddresses") { + if addrMap, ok := addr.(map[string]interface{}); ok { + m := maps.Map(addrMap) + // 确保必要字段存在，防止前端组件报错 + if !m.Has("name") { + m["name"] = "" + } + if !m.Has("canAccess") { + m["canAccess"] = true + } + if !m.Has("isOn") { + m["isOn"] = true + } + if !m.Has("isUp") { + m["isUp"] = true + } + ipAddresses = append(ipAddresses, m) + } + } + } else { + ip := node.GetName() + if savedIP := strings.TrimSpace(installStatusMap.GetString("ipAddr")); len(savedIP) > 0 { + ip = savedIP + } else if hostIP := strings.TrimSpace(statusMap.GetString("hostIP")); len(hostIP) > 0 { + ip = hostIP + } + ipAddresses = append(ipAddresses, maps.Map{ + "id": node.GetId(), + "name": "Public IP", + "ip": ip, + "canAccess": true, + "isOn": node.GetIsOn(), + "isUp": node.GetIsUp(), + }) + } + + installDir := strings.TrimSpace(node.GetInstallDir()) + if len(installDir) == 0 { + installDir = "/root/edge-httpdns" + } + + clusterMap, err := findHTTPDNSClusterMap(parent, node.GetClusterId()) + if err != nil { + return nil, err + } + + // 构造 node.login 用于 index.html 展示 SSH 信息（从 NodeLogin 读取） + var loginMap maps.Map = nil + if node.GetNodeLogin() != nil { + nodeLogin := node.GetNodeLogin() + sshLoginParams := maps.Map{} + if len(nodeLogin.Params) > 0 { + _ = json.Unmarshal(nodeLogin.Params, &sshLoginParams) + } + + grantId := sshLoginParams.GetInt64("grantId") + var grantMap maps.Map = nil + if grantId > 0 { + grantResp, grantErr := parent.RPC().NodeGrantRPC().FindEnabledNodeGrant(parent.AdminContext(), &pb.FindEnabledNodeGrantRequest{ + NodeGrantId: grantId, + }) + if grantErr == nil && grantResp.GetNodeGrant() != nil { + g := grantResp.GetNodeGrant() + grantMap = maps.Map{ + "id": g.Id, + "name": g.Name, + "methodName": g.Method, + "username": g.Username, + } + } + } + + loginMap = maps.Map{ + "params": maps.Map{ + "host": sshLoginParams.GetString("host"), + "port": sshLoginParams.GetInt("port"), + }, + "grant": grantMap, + } + } + + return maps.Map{ + "id": node.GetId(), + "clusterId": node.GetClusterId(), + "name": node.GetName(), + "isOn": node.GetIsOn(), + "isUp": node.GetIsUp(), + "isInstalled": node.GetIsInstalled(), + "isActive": node.GetIsActive(), + "uniqueId": node.GetUniqueId(), + "secret": node.GetSecret(), + "installDir": installDir, + "status": statusMap, + "installStatus": installStatusMap, + "cluster": clusterMap, + "login": loginMap, + "apiNodeAddrs": []string{}, + "ipAddresses": ipAddresses, + }, nil +} + +func decodeNodeStatus(raw []byte) maps.Map { + status := &nodeconfigs.NodeStatus{} + if len(raw) > 0 { + _ = json.Unmarshal(raw, status) + } + cpuText := fmt.Sprintf("%.2f%%", status.CPUUsage*100) + memText := fmt.Sprintf("%.2f%%", status.MemoryUsage*100) + + return maps.Map{ + "isActive": status.IsActive, + "updatedAt": status.UpdatedAt, + "os": status.OS, + "arch": status.Arch, + "hostname": status.Hostname, + "hostIP": status.HostIP, + "cpuUsage": status.CPUUsage, + "cpuUsageText": cpuText, + "memUsage": status.MemoryUsage, + "memUsageText": memText, + "load1m": status.Load1m, + "load5m": status.Load5m, + "load15m": status.Load15m, + "buildVersion": status.BuildVersion, + "cpuPhysicalCount": status.CPUPhysicalCount, + "cpuLogicalCount": status.CPULogicalCount, + "exePath": status.ExePath, + "apiSuccessPercent": status.APISuccessPercent, + "apiAvgCostSeconds": status.APIAvgCostSeconds, + } +} + +func decodeInstallStatus(raw []byte) maps.Map { + result := maps.Map{ + "isRunning": false, + "isFinished": false, + "isOk": false, + "error": "", + "errorCode": "", + } + if len(raw) == 0 { + return result + } + + _ = json.Unmarshal(raw, &result) + return result +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/start.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/start.go new file mode 100644 index 0000000..55fa5c8 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/start.go @@ -0,0 +1,41 @@ +package node + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" +) + +type StartAction struct { + actionutils.ParentAction +} + +func (this *StartAction) RunPost(params struct { + NodeId int64 +}) { + resp, err := this.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(this.AdminContext(), &pb.FindHTTPDNSNodeRequest{ + NodeId: params.NodeId, + }) + if err != nil { + this.ErrorPage(err) + return + } + node := resp.GetNode() + if node == nil { + this.Fail("节点不存在") + return + } + + _, err = this.RPC().HTTPDNSNodeRPC().UpdateHTTPDNSNodeStatus(this.AdminContext(), &pb.UpdateHTTPDNSNodeStatusRequest{ + NodeId: params.NodeId, + IsUp: true, + IsInstalled: node.GetIsInstalled(), + IsActive: true, + StatusJSON: node.GetStatusJSON(), + InstallStatusJSON: node.GetInstallStatusJSON(), + }) + if err != nil { + this.ErrorPage(err) + return + } + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/status.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/status.go new file mode 100644 index 0000000..cc48d5c --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/status.go @@ -0,0 +1,41 @@ +package node + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" +) + +type StatusAction struct { + actionutils.ParentAction +} + +func (this *StatusAction) Init() { + this.Nav("", "node", "status") + this.SecondMenu("nodes") +} + +func (this *StatusAction) RunPost(params struct { + NodeId int64 +}) { + resp, err := this.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(this.AdminContext(), &pb.FindHTTPDNSNodeRequest{ + NodeId: params.NodeId, + }) + if err != nil { + this.ErrorPage(err) + return + } + if resp.GetNode() == nil { + this.Fail("节点不存在") + return + } + + nodeMap, err := findHTTPDNSNodeMap(this.Parent(), params.NodeId) + if err != nil { + this.ErrorPage(err) + return + } + + this.Data["installStatus"] = nodeMap.GetMap("installStatus") + this.Data["isInstalled"] = nodeMap.GetBool("isInstalled") + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/stop.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/stop.go new file mode 100644 index 0000000..3865b20 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/stop.go @@ -0,0 +1,41 @@ +package node + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" +) + +type StopAction struct { + actionutils.ParentAction +} + +func (this *StopAction) RunPost(params struct { + NodeId int64 +}) { + resp, err := this.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(this.AdminContext(), &pb.FindHTTPDNSNodeRequest{ + NodeId: params.NodeId, + }) + if err != nil { + this.ErrorPage(err) + return + } + node := resp.GetNode() + if node == nil { + this.Fail("节点不存在") + return + } + + _, err = this.RPC().HTTPDNSNodeRPC().UpdateHTTPDNSNodeStatus(this.AdminContext(), &pb.UpdateHTTPDNSNodeStatusRequest{ + NodeId: params.NodeId, + IsUp: node.GetIsUp(), + IsInstalled: node.GetIsInstalled(), + IsActive: false, + StatusJSON: node.GetStatusJSON(), + InstallStatusJSON: node.GetInstallStatusJSON(), + }) + if err != nil { + this.ErrorPage(err) + return + } + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/update.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/update.go new file mode 100644 index 0000000..43ad6b0 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/update.go @@ -0,0 +1,268 @@ +package node + +import ( + "encoding/json" + "net" + "regexp" + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" +) + +type UpdateAction struct { + actionutils.ParentAction +} + +func (this *UpdateAction) Init() { + this.Nav("", "node", "update") + this.SecondMenu("nodes") +} + +func (this *UpdateAction) RunGet(params struct { + ClusterId int64 + NodeId int64 +}) { + node, err := findHTTPDNSNodeMap(this.Parent(), params.NodeId) + if err != nil { + this.ErrorPage(err) + return + } + cluster, err := findHTTPDNSClusterMap(this.Parent(), params.ClusterId) + if err != nil { + this.ErrorPage(err) + return + } + + this.Data["clusterId"] = params.ClusterId + this.Data["nodeId"] = params.NodeId + this.Data["currentCluster"] = cluster + this.Data["clusters"] = []maps.Map{cluster} + this.Data["apiNodeAddrs"] = []string{} + this.Data["node"] = node + + sshHost := "" + sshPort := 22 + ipAddresses := []maps.Map{} + var grantId int64 + var loginId int64 + this.Data["grant"] = nil + + resp, err := this.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(this.AdminContext(), &pb.FindHTTPDNSNodeRequest{ + NodeId: params.NodeId, + }) + if err == nil && resp.GetNode() != nil { + // 从 NodeLogin 读取 SSH 信息 + if resp.GetNode().GetNodeLogin() != nil { + nodeLogin := resp.GetNode().GetNodeLogin() + loginId = nodeLogin.Id + if len(nodeLogin.Params) > 0 { + sshLoginParams := maps.Map{} + _ = json.Unmarshal(nodeLogin.Params, &sshLoginParams) + if h := strings.TrimSpace(sshLoginParams.GetString("host")); len(h) > 0 { + sshHost = h + } + if p := sshLoginParams.GetInt("port"); p > 0 { + sshPort = p + } + grantId = sshLoginParams.GetInt64("grantId") + } + } + + // IP 地址仍从 installStatus 读取 + if len(resp.GetNode().GetInstallStatusJSON()) > 0 { + installStatus := maps.Map{} + _ = json.Unmarshal(resp.GetNode().GetInstallStatusJSON(), &installStatus) + + if installStatus.Has("ipAddresses") { + for _, addr := range installStatus.GetSlice("ipAddresses") { + if addrMap, ok := addr.(map[string]interface{}); ok { + m := maps.Map(addrMap) + // 确保必要字段存在，防止前端组件报错 + if !m.Has("name") { + m["name"] = "" + } + if !m.Has("canAccess") { + m["canAccess"] = true + } + if !m.Has("isOn") { + m["isOn"] = true + } + if !m.Has("isUp") { + m["isUp"] = true + } + ipAddresses = append(ipAddresses, m) + } + } + } else if ip := strings.TrimSpace(installStatus.GetString("ipAddr")); len(ip) > 0 { + ipAddresses = append(ipAddresses, maps.Map{ + "ip": ip, + "name": "", + "canAccess": true, + "isOn": true, + "isUp": true, + }) + } + } + } + + this.Data["sshHost"] = sshHost + this.Data["sshPort"] = sshPort + this.Data["loginId"] = loginId + this.Data["ipAddresses"] = ipAddresses + + if grantId > 0 { + grantResp, grantErr := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{ + NodeGrantId: grantId, + }) + if grantErr == nil && grantResp.GetNodeGrant() != nil { + g := grantResp.GetNodeGrant() + this.Data["grant"] = maps.Map{ + "id": g.Id, + "name": g.Name, + "methodName": g.Method, + } + } + } + + this.Show() +} + +func (this *UpdateAction) RunPost(params struct { + NodeId int64 + Name string + ClusterId int64 + IsOn bool + LoginId int64 + SshHost string + SshPort int + GrantId int64 + IpAddressesJSON []byte + + Must *actions.Must +}) { + params.Name = strings.TrimSpace(params.Name) + params.Must.Field("name", params.Name).Require("请输入节点名称") + + params.SshHost = strings.TrimSpace(params.SshHost) + hasSSHUpdate := len(params.SshHost) > 0 || params.SshPort > 0 || params.GrantId > 0 + if hasSSHUpdate { + if len(params.SshHost) == 0 { + this.Fail("请输入 SSH 主机地址") + } + if params.SshPort <= 0 || params.SshPort > 65535 { + this.Fail("SSH 端口范围必须在 1-65535 之间") + } + if params.GrantId <= 0 { + this.Fail("请选择 SSH 登录认证") + } + + if regexp.MustCompile(`^\d+\.\d+\.\d+\.\d+$`).MatchString(params.SshHost) && net.ParseIP(params.SshHost) == nil { + this.Fail("SSH 主机地址格式错误") + } + } + + ipAddresses := []maps.Map{} + if len(params.IpAddressesJSON) > 0 { + err := json.Unmarshal(params.IpAddressesJSON, &ipAddresses) + if err != nil { + this.ErrorPage(err) + return + } + } + + for _, addr := range ipAddresses { + ip := addr.GetString("ip") + if net.ParseIP(ip) == nil { + this.Fail("IP地址格式错误: " + ip) + } + } + + resp, err := this.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(this.AdminContext(), &pb.FindHTTPDNSNodeRequest{ + NodeId: params.NodeId, + }) + if err != nil { + this.ErrorPage(err) + return + } + if resp.GetNode() == nil { + this.Fail("节点不存在") + return + } + node := resp.GetNode() + + installDir := strings.TrimSpace(node.GetInstallDir()) + if len(installDir) == 0 { + installDir = "/root/edge-httpdns" + } + + _, err = this.RPC().HTTPDNSNodeRPC().UpdateHTTPDNSNode(this.AdminContext(), &pb.UpdateHTTPDNSNodeRequest{ + NodeId: params.NodeId, + Name: params.Name, + InstallDir: installDir, + IsOn: params.IsOn, + }) + if err != nil { + this.ErrorPage(err) + return + } + + // SSH 保存到 NodeLogin + if hasSSHUpdate { + login := &pb.NodeLogin{ + Id: params.LoginId, + Name: "SSH", + Type: "ssh", + Params: maps.Map{ + "grantId": params.GrantId, + "host": params.SshHost, + "port": params.SshPort, + }.AsJSON(), + } + + _, err = this.RPC().HTTPDNSNodeRPC().UpdateHTTPDNSNodeLogin(this.AdminContext(), &pb.UpdateHTTPDNSNodeLoginRequest{ + NodeId: params.NodeId, + NodeLogin: login, + }) + if err != nil { + this.ErrorPage(err) + return + } + } + + // IP 地址仍保存在 installStatus 中 + if len(ipAddresses) > 0 { + installStatus := maps.Map{ + "isRunning": false, + "isFinished": true, + "isOk": node.GetIsInstalled(), + "error": "", + "errorCode": "", + } + if len(node.GetInstallStatusJSON()) > 0 { + _ = json.Unmarshal(node.GetInstallStatusJSON(), &installStatus) + } + installStatus["ipAddresses"] = ipAddresses + // 清理旧的 ssh 字段 + delete(installStatus, "ssh") + delete(installStatus, "ipAddr") + + installStatusJSON, _ := json.Marshal(installStatus) + _, err = this.RPC().HTTPDNSNodeRPC().UpdateHTTPDNSNodeStatus(this.AdminContext(), &pb.UpdateHTTPDNSNodeStatusRequest{ + NodeId: params.NodeId, + IsUp: node.GetIsUp(), + IsInstalled: node.GetIsInstalled(), + IsActive: node.GetIsActive(), + StatusJSON: node.GetStatusJSON(), + InstallStatusJSON: installStatusJSON, + }) + if err != nil { + this.ErrorPage(err) + return + } + } + + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/updateInstallStatus.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/updateInstallStatus.go new file mode 100644 index 0000000..73e94f0 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/updateInstallStatus.go @@ -0,0 +1,58 @@ +package node + +import ( + "encoding/json" + "time" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" +) + +type UpdateInstallStatusAction struct { + actionutils.ParentAction +} + +func (this *UpdateInstallStatusAction) RunPost(params struct { + NodeId int64 + IsInstalled bool +}) { + resp, err := this.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(this.AdminContext(), &pb.FindHTTPDNSNodeRequest{ + NodeId: params.NodeId, + }) + if err != nil { + this.ErrorPage(err) + return + } + node := resp.GetNode() + if node == nil { + this.Fail("节点不存在") + return + } + + installStatus := map[string]interface{}{} + if len(node.GetInstallStatusJSON()) > 0 { + _ = json.Unmarshal(node.GetInstallStatusJSON(), &installStatus) + } + installStatus["isRunning"] = false + installStatus["isFinished"] = params.IsInstalled // 标记为未安装时重置为"未开始"状态 + installStatus["isOk"] = params.IsInstalled + installStatus["error"] = "" + installStatus["errorCode"] = "" + installStatus["updatedAt"] = time.Now().Unix() + + installStatusJSON, _ := json.Marshal(installStatus) + + _, err = this.RPC().HTTPDNSNodeRPC().UpdateHTTPDNSNodeStatus(this.AdminContext(), &pb.UpdateHTTPDNSNodeStatusRequest{ + NodeId: params.NodeId, + IsUp: node.GetIsUp(), + IsInstalled: params.IsInstalled, + IsActive: node.GetIsActive(), + StatusJSON: node.GetStatusJSON(), + InstallStatusJSON: installStatusJSON, + }) + if err != nil { + this.ErrorPage(err) + return + } + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/clusterSettings.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/clusterSettings.go new file mode 100644 index 0000000..29acd26 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/clusterSettings.go @@ -0,0 +1,242 @@ +package clusters + +import ( + "encoding/json" + "fmt" + "strconv" + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" + "google.golang.org/grpc/metadata" +) + +type ClusterSettingsAction struct { + actionutils.ParentAction +} + +func (this *ClusterSettingsAction) Init() { + this.Nav("httpdns", "cluster", "settings") +} + +func (this *ClusterSettingsAction) RunGet(params struct { + ClusterId int64 + Section string +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + cluster, err := findClusterMap(this.Parent(), params.ClusterId) + if err != nil { + this.ErrorPage(err) + return + } + httpdnsutils.AddClusterTabbar(this.Parent(), cluster.GetString("name"), params.ClusterId, "setting") + + section := strings.TrimSpace(params.Section) + if len(section) == 0 { + section = "basic" + } + + settings := maps.Map{ + "name": cluster.GetString("name"), + "gatewayDomain": cluster.GetString("gatewayDomain"), + "cacheTtl": cluster.GetInt("defaultTTL"), + "fallbackTimeout": cluster.GetInt("fallbackTimeout"), + "installDir": cluster.GetString("installDir"), + "isOn": cluster.GetBool("isOn"), + "autoRemoteStart": cluster.GetBool("autoRemoteStart"), + "accessLogIsOn": cluster.GetBool("accessLogIsOn"), + "timeZone": cluster.GetString("timeZone"), + } + if settings.GetInt("cacheTtl") <= 0 { + settings["cacheTtl"] = 60 + } + if settings.GetInt("fallbackTimeout") <= 0 { + settings["fallbackTimeout"] = 300 + } + if len(settings.GetString("installDir")) == 0 { + settings["installDir"] = "/root/edge-httpdns" + } + if len(settings.GetString("timeZone")) == 0 { + settings["timeZone"] = "Asia/Shanghai" + } + + listenAddresses := []*serverconfigs.NetworkAddressConfig{ + { + Protocol: serverconfigs.ProtocolTLS, + Host: "", + PortRange: "443", + }, + } + sslPolicy := &sslconfigs.SSLPolicy{ + IsOn: true, + MinVersion: "TLS 1.1", + } + + if rawTLS := strings.TrimSpace(cluster.GetString("tlsPolicyJSON")); len(rawTLS) > 0 { + tlsConfig := maps.Map{} + if err := json.Unmarshal([]byte(rawTLS), &tlsConfig); err == nil { + if listenRaw := tlsConfig.Get("listen"); listenRaw != nil { + if data, err := json.Marshal(listenRaw); err == nil { + _ = json.Unmarshal(data, &listenAddresses) + } + } + if sslRaw := tlsConfig.Get("sslPolicy"); sslRaw != nil { + if data, err := json.Marshal(sslRaw); err == nil { + _ = json.Unmarshal(data, sslPolicy) + } + } + } + } + + this.Data["activeSection"] = section + cid := strconv.FormatInt(params.ClusterId, 10) + this.Data["leftMenuItems"] = []map[string]interface{}{ + {"name": "基础设置", "url": "/httpdns/clusters/cluster/settings?clusterId=" + cid + "§ion=basic", "isActive": section == "basic"}, + {"name": "TLS", "url": "/httpdns/clusters/cluster/settings?clusterId=" + cid + "§ion=tls", "isActive": section == "tls"}, + } + this.Data["cluster"] = cluster + this.Data["settings"] = settings + this.Data["tlsConfig"] = maps.Map{ + "isOn": true, + "listen": listenAddresses, + "sslPolicy": sslPolicy, + } + + this.Data["timeZoneGroups"] = nodeconfigs.FindAllTimeZoneGroups() + this.Data["timeZoneLocations"] = nodeconfigs.FindAllTimeZoneLocations() + timeZoneStr := settings.GetString("timeZone") + if len(timeZoneStr) == 0 { + timeZoneStr = nodeconfigs.DefaultTimeZoneLocation + } + this.Data["timeZoneLocation"] = nodeconfigs.FindTimeZoneLocation(timeZoneStr) + + this.Show() +} + +func (this *ClusterSettingsAction) RunPost(params struct { + ClusterId int64 + Name string + GatewayDomain string + CacheTtl int32 + FallbackTimeout int32 + InstallDir string + IsOn bool + AutoRemoteStart bool + AccessLogIsOn bool + TimeZone string + + Addresses []byte + SslPolicyJSON []byte + + Must *actions.Must + CSRF *actionutils.CSRF +}) { + params.Name = strings.TrimSpace(params.Name) + params.GatewayDomain = strings.TrimSpace(params.GatewayDomain) + params.InstallDir = strings.TrimSpace(params.InstallDir) + + params.Must.Field("clusterId", params.ClusterId).Gt(0, "请选择集群") + params.Must.Field("name", params.Name).Require("请输入集群名称") + params.Must.Field("gatewayDomain", params.GatewayDomain).Require("请输入服务域名") + + cluster, err := findClusterMap(this.Parent(), params.ClusterId) + if err != nil { + this.ErrorPage(err) + return + } + + // 开关项按请求值强制覆盖：未提交/空值都视为 false，支持取消勾选 + autoRemoteStartRaw := strings.ToLower(strings.TrimSpace(this.ParamString("autoRemoteStart"))) + params.AutoRemoteStart = autoRemoteStartRaw == "1" || autoRemoteStartRaw == "true" || autoRemoteStartRaw == "on" || autoRemoteStartRaw == "yes" || autoRemoteStartRaw == "enabled" + + accessLogIsOnRaw := strings.ToLower(strings.TrimSpace(this.ParamString("accessLogIsOn"))) + params.AccessLogIsOn = accessLogIsOnRaw == "1" || accessLogIsOnRaw == "true" || accessLogIsOnRaw == "on" || accessLogIsOnRaw == "yes" || accessLogIsOnRaw == "enabled" + + isOnRaw := strings.ToLower(strings.TrimSpace(this.ParamString("isOn"))) + params.IsOn = isOnRaw == "1" || isOnRaw == "true" || isOnRaw == "on" || isOnRaw == "yes" || isOnRaw == "enabled" + + // 时区为空时继承当前值，再兜底默认值 + params.TimeZone = strings.TrimSpace(this.ParamString("timeZone")) + if len(params.TimeZone) == 0 { + params.TimeZone = strings.TrimSpace(cluster.GetString("timeZone")) + } + if len(params.TimeZone) == 0 { + params.TimeZone = "Asia/Shanghai" + } + + if params.CacheTtl <= 0 { + params.CacheTtl = 60 + } + if params.FallbackTimeout <= 0 { + params.FallbackTimeout = 300 + } + if len(params.InstallDir) == 0 { + params.InstallDir = "/root/edge-httpdns" + } + + tlsConfig := maps.Map{} + if rawTLS := strings.TrimSpace(cluster.GetString("tlsPolicyJSON")); len(rawTLS) > 0 { + _ = json.Unmarshal([]byte(rawTLS), &tlsConfig) + } + if len(params.Addresses) > 0 { + var addresses []*serverconfigs.NetworkAddressConfig + if err := json.Unmarshal(params.Addresses, &addresses); err != nil { + this.Fail("监听端口配置格式不正确") + return + } + tlsConfig["listen"] = addresses + } + if len(params.SslPolicyJSON) > 0 { + sslPolicy := &sslconfigs.SSLPolicy{} + if err := json.Unmarshal(params.SslPolicyJSON, sslPolicy); err != nil { + this.Fail("TLS 配置格式不正确") + return + } + tlsConfig["sslPolicy"] = sslPolicy + } + + var tlsPolicyJSON []byte + if len(tlsConfig) > 0 { + tlsPolicyJSON, err = json.Marshal(tlsConfig) + if err != nil { + this.ErrorPage(err) + return + } + } + + updateReq := &pb.UpdateHTTPDNSClusterRequest{ + ClusterId: params.ClusterId, + Name: params.Name, + ServiceDomain: params.GatewayDomain, + DefaultTTL: params.CacheTtl, + FallbackTimeoutMs: params.FallbackTimeout, + InstallDir: params.InstallDir, + TlsPolicyJSON: tlsPolicyJSON, + IsOn: params.IsOn, + IsDefault: false, + AutoRemoteStart: params.AutoRemoteStart, + AccessLogIsOn: params.AccessLogIsOn, + TimeZone: params.TimeZone, + } + updateCtx := metadata.AppendToOutgoingContext( + this.AdminContext(), + "x-httpdns-auto-remote-start", fmt.Sprintf("%t", updateReq.GetAutoRemoteStart()), + "x-httpdns-access-log-is-on", fmt.Sprintf("%t", updateReq.GetAccessLogIsOn()), + "x-httpdns-time-zone", updateReq.GetTimeZone(), + ) + + _, err = this.RPC().HTTPDNSClusterRPC().UpdateHTTPDNSCluster(updateCtx, updateReq) + if err != nil { + this.ErrorPage(err) + return + } + + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/create.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/create.go new file mode 100644 index 0000000..23bcd22 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/create.go @@ -0,0 +1,78 @@ +package clusters + +import ( + "strconv" + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/actions" +) + +type CreateAction struct { + actionutils.ParentAction +} + +func (this *CreateAction) Init() { + this.Nav("httpdns", "cluster", "") +} + +func (this *CreateAction) RunGet(params struct{}) { + httpdnsutils.AddLeftMenu(this.Parent()) + this.Show() +} + +func (this *CreateAction) RunPost(params struct { + Name string + GatewayDomain string + CacheTtl int32 + FallbackTimeout int32 + InstallDir string + IsOn bool + + Must *actions.Must +}) { + params.Name = strings.TrimSpace(params.Name) + params.GatewayDomain = strings.TrimSpace(params.GatewayDomain) + params.InstallDir = strings.TrimSpace(params.InstallDir) + if len(params.InstallDir) == 0 { + params.InstallDir = "/root/edge-httpdns" + } + if params.CacheTtl <= 0 { + params.CacheTtl = 60 + } + if params.FallbackTimeout <= 0 { + params.FallbackTimeout = 300 + } + + params.Must.Field("name", params.Name).Require("请输入集群名称") + params.Must.Field("gatewayDomain", params.GatewayDomain).Require("请输入服务域名") + + resp, err := this.RPC().HTTPDNSClusterRPC().CreateHTTPDNSCluster(this.AdminContext(), &pb.CreateHTTPDNSClusterRequest{ + Name: params.Name, + ServiceDomain: params.GatewayDomain, + DefaultTTL: params.CacheTtl, + FallbackTimeoutMs: params.FallbackTimeout, + InstallDir: params.InstallDir, + IsOn: params.IsOn, + IsDefault: false, + AutoRemoteStart: true, + AccessLogIsOn: true, + TimeZone: "Asia/Shanghai", + }) + if err != nil { + this.ErrorPage(err) + return + } + + this.Data["clusterId"] = resp.GetClusterId() + + // fallback: if frontend JS doesn't intercept form submit, redirect instead of showing raw JSON + if len(this.Request.Header.Get("X-Requested-With")) == 0 { + this.RedirectURL("/httpdns/clusters/cluster?clusterId=" + strconv.FormatInt(resp.GetClusterId(), 10)) + return + } + + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/createNode.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/createNode.go new file mode 100644 index 0000000..9b57ca4 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/createNode.go @@ -0,0 +1,63 @@ +package clusters + +import ( + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/iwind/TeaGo/actions" +) + +type CreateNodeAction struct { + actionutils.ParentAction +} + +func (this *CreateNodeAction) Init() { + this.Nav("httpdns", "cluster", "createNode") +} + +func (this *CreateNodeAction) RunGet(params struct { + ClusterId int64 +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + cluster, err := findClusterMap(this.Parent(), params.ClusterId) + if err != nil { + this.ErrorPage(err) + return + } + + httpdnsutils.AddClusterTabbar(this.Parent(), cluster.GetString("name"), params.ClusterId, "node") + this.Data["clusterId"] = params.ClusterId + this.Data["cluster"] = cluster + this.Show() +} + +func (this *CreateNodeAction) RunPost(params struct { + ClusterId int64 + Name string + InstallDir string + + Must *actions.Must +}) { + params.Name = strings.TrimSpace(params.Name) + params.InstallDir = strings.TrimSpace(params.InstallDir) + params.Must.Field("clusterId", params.ClusterId).Gt(0, "请选择集群") + params.Must.Field("name", params.Name).Require("请输入节点名称") + + if len(params.InstallDir) == 0 { + cluster, err := findClusterMap(this.Parent(), params.ClusterId) + if err == nil { + params.InstallDir = strings.TrimSpace(cluster.GetString("installDir")) + } + if len(params.InstallDir) == 0 { + params.InstallDir = "/root/edge-httpdns" + } + } + + if err := createNode(this.Parent(), params.ClusterId, params.Name, params.InstallDir); err != nil { + this.ErrorPage(err) + return + } + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/delete.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/delete.go new file mode 100644 index 0000000..4b624b9 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/delete.go @@ -0,0 +1,44 @@ +package clusters + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" +) + +type DeleteAction struct { + actionutils.ParentAction +} + +func (this *DeleteAction) Init() { + this.Nav("httpdns", "cluster", "delete") +} + +func (this *DeleteAction) RunGet(params struct { + ClusterId int64 +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + cluster, err := findClusterMap(this.Parent(), params.ClusterId) + if err != nil { + this.ErrorPage(err) + return + } + + httpdnsutils.AddClusterTabbar(this.Parent(), cluster.GetString("name"), params.ClusterId, "delete") + this.Data["cluster"] = cluster + this.Show() +} + +func (this *DeleteAction) RunPost(params struct { + ClusterId int64 +}) { + _, err := this.RPC().HTTPDNSClusterRPC().DeleteHTTPDNSCluster(this.AdminContext(), &pb.DeleteHTTPDNSClusterRequest{ + ClusterId: params.ClusterId, + }) + if err != nil { + this.ErrorPage(err) + return + } + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/deleteNode.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/deleteNode.go new file mode 100644 index 0000000..eecc635 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/deleteNode.go @@ -0,0 +1,18 @@ +package clusters + +import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + +type DeleteNodeAction struct { + actionutils.ParentAction +} + +func (this *DeleteNodeAction) RunPost(params struct { + ClusterId int64 + NodeId int64 +}) { + if err := deleteNode(this.Parent(), params.NodeId); err != nil { + this.ErrorPage(err) + return + } + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/index.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/index.go new file mode 100644 index 0000000..9f2e27b --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/index.go @@ -0,0 +1,39 @@ +package clusters + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" +) + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) Init() { + this.Nav("httpdns", "cluster", "") +} + +func (this *IndexAction) RunGet(params struct { + Keyword string +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + this.Data["keyword"] = params.Keyword + + clusters, err := listClusterMaps(this.Parent(), params.Keyword) + if err != nil { + this.ErrorPage(err) + return + } + this.Data["clusters"] = clusters + + hasErrorLogs := false + for _, cluster := range clusters { + if cluster.GetInt("countAllNodes") > cluster.GetInt("countActiveNodes") { + hasErrorLogs = true + break + } + } + this.Data["hasErrorLogs"] = hasErrorLogs + this.Data["page"] = "" + this.Show() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/init.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/init.go new file mode 100644 index 0000000..3c61885 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/init.go @@ -0,0 +1,43 @@ +package clusters + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/iwind/TeaGo" +) + +func init() { + TeaGo.BeforeStart(func(server *TeaGo.Server) { + server. + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeHttpDNS)). + Data("teaMenu", "httpdns"). + Data("teaSubMenu", "cluster"). + Prefix("/httpdns/clusters"). + Get("", new(IndexAction)). + GetPost("/create", new(CreateAction)). + Get("/cluster", new(ClusterAction)). + GetPost("/cluster/settings", new(ClusterSettingsAction)). + GetPost("/delete", new(DeleteAction)). + // Node level + GetPost("/createNode", new(CreateNodeAction)). + Post("/deleteNode", new(DeleteNodeAction)). + GetPost("/cluster/upgradeRemote", new(UpgradeRemoteAction)). + GetPost("/upgradeRemote", new(UpgradeRemoteAction)). + Post("/upgradeStatus", new(UpgradeStatusAction)). + GetPost("/updateNodeSSH", new(UpdateNodeSSHAction)). + Post("/checkPorts", new(CheckPortsAction)). + + // Node internal pages + Prefix("/httpdns/clusters/cluster/node"). + Get("", new(node.IndexAction)). + Get("/logs", new(node.LogsAction)). + GetPost("/update", new(node.UpdateAction)). + GetPost("/install", new(node.InstallAction)). + Post("/status", new(node.StatusAction)). + Post("/updateInstallStatus", new(node.UpdateInstallStatusAction)). + Post("/start", new(node.StartAction)). + Post("/stop", new(node.StopAction)). + EndAll() + }) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/rpc_helpers.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/rpc_helpers.go new file mode 100644 index 0000000..8a6013d --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/rpc_helpers.go @@ -0,0 +1,347 @@ +package clusters + +import ( + "encoding/json" + "fmt" + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/maps" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/metadata" + "google.golang.org/grpc/status" +) + +func listClusterMaps(parent *actionutils.ParentAction, keyword string) ([]maps.Map, error) { + resp, err := parent.RPC().HTTPDNSClusterRPC().ListHTTPDNSClusters(parent.AdminContext(), &pb.ListHTTPDNSClustersRequest{ + Offset: 0, + Size: 10_000, + Keyword: strings.TrimSpace(keyword), + }) + if err != nil { + return nil, err + } + + result := make([]maps.Map, 0, len(resp.GetClusters())) + for _, cluster := range resp.GetClusters() { + nodesResp, err := parent.RPC().HTTPDNSNodeRPC().ListHTTPDNSNodes(parent.AdminContext(), &pb.ListHTTPDNSNodesRequest{ + ClusterId: cluster.GetId(), + }) + if err != nil { + return nil, err + } + countAllNodes := len(nodesResp.GetNodes()) + countActiveNodes := 0 + for _, node := range nodesResp.GetNodes() { + if node.GetIsOn() && node.GetIsUp() && node.GetIsActive() { + countActiveNodes++ + } + } + + countUpgradeNodes, err := countUpgradeHTTPDNSNodes(parent, cluster.GetId()) + if err != nil { + return nil, err + } + + port := "443" + if rawTLS := cluster.GetTlsPolicyJSON(); len(rawTLS) > 0 { + tlsConfig := maps.Map{} + if err := json.Unmarshal(rawTLS, &tlsConfig); err == nil { + if listenRaw := tlsConfig.Get("listen"); listenRaw != nil { + var listenAddresses []maps.Map + if data, err := json.Marshal(listenRaw); err == nil { + if err := json.Unmarshal(data, &listenAddresses); err == nil { + if len(listenAddresses) > 0 && len(listenAddresses[0].GetString("portRange")) > 0 { + port = listenAddresses[0].GetString("portRange") + } + } + } + } + } + } + apiAddress := "https://" + cluster.GetServiceDomain() + ":" + port + + result = append(result, maps.Map{ + "id": cluster.GetId(), + "name": cluster.GetName(), + "gatewayDomain": cluster.GetServiceDomain(), + "apiAddress": apiAddress, + "defaultTTL": cluster.GetDefaultTTL(), + "fallbackTimeout": cluster.GetFallbackTimeoutMs(), + "installDir": cluster.GetInstallDir(), + "timeZone": cluster.GetTimeZone(), + "isOn": cluster.GetIsOn(), + "isDefault": cluster.GetIsDefault(), + "autoRemoteStart": cluster.GetAutoRemoteStart(), + "accessLogIsOn": cluster.GetAccessLogIsOn(), + "tlsPolicyJSON": cluster.GetTlsPolicyJSON(), + "countAllNodes": countAllNodes, + "countActiveNodes": countActiveNodes, + "countUpgradeNodes": countUpgradeNodes, + }) + } + return result, nil +} + +func countUpgradeHTTPDNSNodes(parent *actionutils.ParentAction, clusterID int64) (int64, error) { + countResp, err := parent.RPC().HTTPDNSNodeRPC().CountAllUpgradeHTTPDNSNodesWithClusterId(parent.AdminContext(), &pb.CountAllUpgradeHTTPDNSNodesWithClusterIdRequest{ + ClusterId: clusterID, + }) + if err == nil { + return countResp.GetCount(), nil + } + + grpcStatus, ok := status.FromError(err) + if !ok || grpcStatus.Code() != codes.Unimplemented { + return 0, err + } + + // Compatibility fallback: old edge-api may not implement countAllUpgradeHTTPDNSNodesWithClusterId yet. + listResp, listErr := parent.RPC().HTTPDNSNodeRPC().FindAllUpgradeHTTPDNSNodesWithClusterId(parent.AdminContext(), &pb.FindAllUpgradeHTTPDNSNodesWithClusterIdRequest{ + ClusterId: clusterID, + }) + if listErr == nil { + return int64(len(listResp.GetNodes())), nil + } + + listStatus, ok := status.FromError(listErr) + if ok && listStatus.Code() == codes.Unimplemented { + // Compatibility fallback: both methods missing on old edge-api, don't block page rendering. + return 0, nil + } + + return 0, listErr +} + +func findClusterMap(parent *actionutils.ParentAction, clusterID int64) (maps.Map, error) { + if clusterID > 0 { + var headerMD metadata.MD + resp, err := parent.RPC().HTTPDNSClusterRPC().FindHTTPDNSCluster(parent.AdminContext(), &pb.FindHTTPDNSClusterRequest{ + ClusterId: clusterID, + }, grpc.Header(&headerMD)) + if err != nil { + return nil, err + } + if resp.GetCluster() != nil { + cluster := resp.GetCluster() + autoRemoteStart := cluster.GetAutoRemoteStart() + accessLogIsOn := cluster.GetAccessLogIsOn() + timeZone := cluster.GetTimeZone() + + // Compatibility fallback: + // Some deployed admin binaries may decode newly-added protobuf fields incorrectly. + // Read values from grpc response headers as a source of truth. + if values := headerMD.Get("x-httpdns-auto-remote-start"); len(values) > 0 { + autoRemoteStart = parseBoolLike(values[0], autoRemoteStart) + } + if values := headerMD.Get("x-httpdns-access-log-is-on"); len(values) > 0 { + accessLogIsOn = parseBoolLike(values[0], accessLogIsOn) + } + if values := headerMD.Get("x-httpdns-time-zone"); len(values) > 0 { + if tz := strings.TrimSpace(values[0]); len(tz) > 0 { + timeZone = tz + } + } + + return maps.Map{ + "id": cluster.GetId(), + "name": cluster.GetName(), + "gatewayDomain": cluster.GetServiceDomain(), + "defaultTTL": cluster.GetDefaultTTL(), + "fallbackTimeout": cluster.GetFallbackTimeoutMs(), + "installDir": cluster.GetInstallDir(), + "isOn": cluster.GetIsOn(), + "isDefault": cluster.GetIsDefault(), + "tlsPolicyJSON": cluster.GetTlsPolicyJSON(), + "autoRemoteStart": autoRemoteStart, + "accessLogIsOn": accessLogIsOn, + "timeZone": timeZone, + }, nil + } + } + + clusters, err := listClusterMaps(parent, "") + if err != nil { + return nil, err + } + if len(clusters) == 0 { + return maps.Map{ + "id": int64(0), + "name": "", + "gatewayDomain": "", + "defaultTTL": 60, + "fallbackTimeout": 300, + "installDir": "/root/edge-httpdns", + "timeZone": "Asia/Shanghai", + }, nil + } + return clusters[0], nil +} + +func parseBoolLike(raw string, defaultValue bool) bool { + s := strings.ToLower(strings.TrimSpace(raw)) + switch s { + case "1", "true", "on", "yes", "enabled": + return true + case "0", "false", "off", "no", "disabled": + return false + default: + return defaultValue + } +} + +func listNodeMaps(parent *actionutils.ParentAction, clusterID int64) ([]maps.Map, error) { + resp, err := parent.RPC().HTTPDNSNodeRPC().ListHTTPDNSNodes(parent.AdminContext(), &pb.ListHTTPDNSNodesRequest{ + ClusterId: clusterID, + }) + if err != nil { + return nil, err + } + + result := make([]maps.Map, 0, len(resp.GetNodes())) + for _, node := range resp.GetNodes() { + statusMap := decodeNodeStatus(node.GetStatusJSON()) + installStatusMap := decodeInstallStatus(node.GetInstallStatusJSON()) + ip := node.GetName() + if parsed := strings.TrimSpace(statusMap.GetString("hostIP")); len(parsed) > 0 { + ip = parsed + } + nodeMap := maps.Map{ + "id": node.GetId(), + "clusterId": node.GetClusterId(), + "name": node.GetName(), + "isOn": node.GetIsOn(), + "isUp": node.GetIsUp(), + "isInstalled": node.GetIsInstalled(), + "isActive": node.GetIsActive(), + "installDir": node.GetInstallDir(), + "uniqueId": node.GetUniqueId(), + "secret": node.GetSecret(), + "status": statusMap, + "installStatus": installStatusMap, + "region": nil, + "login": nil, + "apiNodeAddrs": []string{}, + "cluster": maps.Map{ + "id": node.GetClusterId(), + "installDir": node.GetInstallDir(), + }, + "ipAddresses": []maps.Map{ + { + "id": node.GetId(), + "name": "Public IP", + "ip": ip, + "canAccess": true, + "isOn": node.GetIsOn(), + "isUp": node.GetIsUp(), + }, + }, + } + result = append(result, nodeMap) + } + return result, nil +} + +func findNodeMap(parent *actionutils.ParentAction, nodeID int64) (maps.Map, error) { + resp, err := parent.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(parent.AdminContext(), &pb.FindHTTPDNSNodeRequest{ + NodeId: nodeID, + }) + if err != nil { + return nil, err + } + if resp.GetNode() == nil { + return maps.Map{}, nil + } + nodes, err := listNodeMaps(parent, resp.GetNode().GetClusterId()) + if err != nil { + return nil, err + } + for _, node := range nodes { + if node.GetInt64("id") == nodeID { + return node, nil + } + } + return maps.Map{ + "id": resp.GetNode().GetId(), + "name": resp.GetNode().GetName(), + }, nil +} + +func createNode(parent *actionutils.ParentAction, clusterID int64, name string, installDir string) error { + _, err := parent.RPC().HTTPDNSNodeRPC().CreateHTTPDNSNode(parent.AdminContext(), &pb.CreateHTTPDNSNodeRequest{ + ClusterId: clusterID, + Name: strings.TrimSpace(name), + InstallDir: strings.TrimSpace(installDir), + IsOn: true, + }) + return err +} + +func updateNode(parent *actionutils.ParentAction, nodeID int64, name string, installDir string, isOn bool) error { + _, err := parent.RPC().HTTPDNSNodeRPC().UpdateHTTPDNSNode(parent.AdminContext(), &pb.UpdateHTTPDNSNodeRequest{ + NodeId: nodeID, + Name: strings.TrimSpace(name), + InstallDir: strings.TrimSpace(installDir), + IsOn: isOn, + }) + return err +} + +func deleteNode(parent *actionutils.ParentAction, nodeID int64) error { + _, err := parent.RPC().HTTPDNSNodeRPC().DeleteHTTPDNSNode(parent.AdminContext(), &pb.DeleteHTTPDNSNodeRequest{ + NodeId: nodeID, + }) + return err +} + +func decodeNodeStatus(raw []byte) maps.Map { + status := &nodeconfigs.NodeStatus{} + if len(raw) > 0 { + _ = json.Unmarshal(raw, status) + } + cpuText := fmt.Sprintf("%.2f%%", status.CPUUsage*100) + memText := fmt.Sprintf("%.2f%%", status.MemoryUsage*100) + return maps.Map{ + "isActive": status.IsActive, + "updatedAt": status.UpdatedAt, + "hostname": status.Hostname, + "hostIP": status.HostIP, + "cpuUsage": status.CPUUsage, + "cpuUsageText": cpuText, + "memUsage": status.MemoryUsage, + "memUsageText": memText, + "load1m": status.Load1m, + "load5m": status.Load5m, + "load15m": status.Load15m, + "buildVersion": status.BuildVersion, + "cpuPhysicalCount": status.CPUPhysicalCount, + "cpuLogicalCount": status.CPULogicalCount, + "exePath": status.ExePath, + } +} + +func decodeInstallStatus(raw []byte) maps.Map { + if len(raw) == 0 { + return maps.Map{ + "isRunning": false, + "isFinished": true, + "isOk": true, + "error": "", + "errorCode": "", + } + } + result := maps.Map{} + if err := json.Unmarshal(raw, &result); err != nil { + return maps.Map{ + "isRunning": false, + "isFinished": true, + "isOk": true, + "error": "", + "errorCode": "", + } + } + return result +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/updateNodeSSH.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/updateNodeSSH.go new file mode 100644 index 0000000..778b573 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/updateNodeSSH.go @@ -0,0 +1,128 @@ +package clusters + +import ( + "encoding/json" + "net" + "regexp" + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" +) + +type UpdateNodeSSHAction struct { + actionutils.ParentAction +} + +func (this *UpdateNodeSSHAction) RunGet(params struct { + NodeId int64 +}) { + resp, err := this.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(this.AdminContext(), &pb.FindHTTPDNSNodeRequest{ + NodeId: params.NodeId, + }) + if err != nil { + this.ErrorPage(err) + return + } + + clusterId := int64(0) + nodeName := "" + if resp.GetNode() != nil { + clusterId = resp.GetNode().GetClusterId() + nodeName = resp.GetNode().GetName() + } + + this.Data["nodeId"] = params.NodeId + this.Data["clusterId"] = clusterId + this.Data["node"] = maps.Map{ + "id": params.NodeId, + "name": nodeName, + } + loginParams := maps.Map{ + "host": "", + "port": 22, + "grantId": 0, + } + this.Data["loginId"] = 0 + + // 从 NodeLogin 读取 SSH 信息 + if resp.GetNode() != nil && resp.GetNode().GetNodeLogin() != nil { + nodeLogin := resp.GetNode().GetNodeLogin() + this.Data["loginId"] = nodeLogin.Id + if len(nodeLogin.Params) > 0 { + _ = json.Unmarshal(nodeLogin.Params, &loginParams) + } + } + + this.Data["params"] = loginParams + + // 认证信息 + grantId := loginParams.GetInt64("grantId") + var grantMap maps.Map = nil + if grantId > 0 { + grantResp, grantErr := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{ + NodeGrantId: grantId, + }) + if grantErr == nil && grantResp.GetNodeGrant() != nil { + g := grantResp.GetNodeGrant() + grantMap = maps.Map{ + "id": g.Id, + "name": g.Name, + "method": g.Method, + "methodName": g.Method, + } + } + } + this.Data["grant"] = grantMap + + this.Show() +} + +func (this *UpdateNodeSSHAction) RunPost(params struct { + NodeId int64 + LoginId int64 + SshHost string + SshPort int + GrantId int64 + + Must *actions.Must +}) { + params.SshHost = strings.TrimSpace(params.SshHost) + params.Must. + Field("sshHost", params.SshHost). + Require("请输入 SSH 主机地址"). + Field("sshPort", params.SshPort). + Gt(0, "SSH 端口必须大于 0"). + Lt(65535, "SSH 端口必须小于 65535") + if params.GrantId <= 0 { + this.Fail("请选择节点登录认证信息") + } + + if regexp.MustCompile(`^\d+\.\d+\.\d+\.\d+$`).MatchString(params.SshHost) && net.ParseIP(params.SshHost) == nil { + this.Fail("SSH 主机地址 IP 格式错误") + } + + login := &pb.NodeLogin{ + Id: params.LoginId, + Name: "SSH", + Type: "ssh", + Params: maps.Map{ + "grantId": params.GrantId, + "host": params.SshHost, + "port": params.SshPort, + }.AsJSON(), + } + + _, err := this.RPC().HTTPDNSNodeRPC().UpdateHTTPDNSNodeLogin(this.AdminContext(), &pb.UpdateHTTPDNSNodeLoginRequest{ + NodeId: params.NodeId, + NodeLogin: login, + }) + if err != nil { + this.Fail("保存SSH登录信息失败: " + err.Error()) + return + } + + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/upgradeRemote.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/upgradeRemote.go new file mode 100644 index 0000000..846151f --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/upgradeRemote.go @@ -0,0 +1,108 @@ +package clusters + +import ( + "encoding/json" + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" +) + +type UpgradeRemoteAction struct { + actionutils.ParentAction +} + +func (this *UpgradeRemoteAction) Init() { + this.Nav("httpdns", "cluster", "index") +} + +func (this *UpgradeRemoteAction) RunGet(params struct { + NodeId int64 + ClusterId int64 +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + cluster, err := findClusterMap(this.Parent(), params.ClusterId) + if err != nil { + this.ErrorPage(err) + return + } + httpdnsutils.AddClusterTabbar(this.Parent(), cluster.GetString("name"), params.ClusterId, "node") + + this.Data["clusterId"] = params.ClusterId + this.Data["cluster"] = cluster + + resp, err := this.RPC().HTTPDNSNodeRPC().FindAllUpgradeHTTPDNSNodesWithClusterId(this.AdminContext(), &pb.FindAllUpgradeHTTPDNSNodesWithClusterIdRequest{ + ClusterId: params.ClusterId, + }) + if err != nil { + this.ErrorPage(err) + return + } + + nodes := make([]maps.Map, 0, len(resp.GetNodes())) + for _, upgradeNode := range resp.GetNodes() { + node := upgradeNode.Node + if node == nil { + continue + } + + loginParams := maps.Map{} + if node.GetNodeLogin() != nil && len(node.GetNodeLogin().GetParams()) > 0 { + _ = json.Unmarshal(node.GetNodeLogin().GetParams(), &loginParams) + } + + status := decodeNodeStatus(node.GetStatusJSON()) + accessIP := strings.TrimSpace(status.GetString("hostIP")) + if len(accessIP) == 0 { + accessIP = strings.TrimSpace(node.GetName()) + } + + nodes = append(nodes, maps.Map{ + "id": node.GetId(), + "name": node.GetName(), + "accessIP": accessIP, + "oldVersion": upgradeNode.OldVersion, + "newVersion": upgradeNode.NewVersion, + "login": node.GetNodeLogin(), + "loginParams": loginParams, + "installStatus": decodeUpgradeInstallStatus(node.GetInstallStatusJSON()), + }) + } + this.Data["nodes"] = nodes + this.Show() +} + +func (this *UpgradeRemoteAction) RunPost(params struct { + NodeId int64 + + Must *actions.Must +}) { + _, err := this.RPC().HTTPDNSNodeRPC().UpgradeHTTPDNSNode(this.AdminContext(), &pb.UpgradeHTTPDNSNodeRequest{ + NodeId: params.NodeId, + }) + if err != nil { + this.ErrorPage(err) + return + } + this.Success() +} + +func decodeUpgradeInstallStatus(raw []byte) maps.Map { + result := maps.Map{ + "isRunning": false, + "isFinished": false, + "isOk": false, + "error": "", + "errorCode": "", + } + if len(raw) == 0 { + return result + } + + _ = json.Unmarshal(raw, &result) + return result +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/clusters/upgradeStatus.go b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/upgradeStatus.go new file mode 100644 index 0000000..5635d2e --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/clusters/upgradeStatus.go @@ -0,0 +1,48 @@ +package clusters + +import ( + "encoding/json" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" +) + +type UpgradeStatusAction struct { + actionutils.ParentAction +} + +func (this *UpgradeStatusAction) RunPost(params struct { + NodeId int64 +}) { + resp, err := this.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(this.AdminContext(), &pb.FindHTTPDNSNodeRequest{ + NodeId: params.NodeId, + }) + if err != nil { + this.ErrorPage(err) + return + } + if resp.GetNode() == nil { + this.Data["status"] = nil + this.Success() + return + } + + this.Data["status"] = decodeUpgradeInstallStatusMap(resp.GetNode().GetInstallStatusJSON()) + this.Success() +} + +func decodeUpgradeInstallStatusMap(raw []byte) map[string]interface{} { + result := map[string]interface{}{ + "isRunning": false, + "isFinished": false, + "isOk": false, + "error": "", + "errorCode": "", + } + if len(raw) == 0 { + return result + } + + _ = json.Unmarshal(raw, &result) + return result +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/ech/audit.go b/EdgeAdmin/internal/web/actions/default/httpdns/ech/audit.go new file mode 100644 index 0000000..a9d8c2b --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/ech/audit.go @@ -0,0 +1,15 @@ +package ech + +import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + +type AuditAction struct { + actionutils.ParentAction +} + +func (this *AuditAction) Init() { + this.Nav("httpdns", "ech", "") +} + +func (this *AuditAction) RunGet(params struct{}) { + this.RedirectURL("/httpdns/apps") +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/ech/index.go b/EdgeAdmin/internal/web/actions/default/httpdns/ech/index.go new file mode 100644 index 0000000..76b9832 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/ech/index.go @@ -0,0 +1,15 @@ +package ech + +import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) Init() { + this.Nav("httpdns", "ech", "") +} + +func (this *IndexAction) RunGet(params struct{}) { + this.RedirectURL("/httpdns/apps") +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/ech/init.go b/EdgeAdmin/internal/web/actions/default/httpdns/ech/init.go new file mode 100644 index 0000000..b4564e9 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/ech/init.go @@ -0,0 +1,21 @@ +package ech + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/iwind/TeaGo" +) + +func init() { + TeaGo.BeforeStart(func(server *TeaGo.Server) { + server. + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeHttpDNS)). + Data("teaMenu", "httpdns"). + Data("teaSubMenu", "ech"). + Prefix("/httpdns/ech"). + Get("", new(IndexAction)). + Get("/audit", new(AuditAction)). + GetPost("/rollbackMfaPopup", new(RollbackMfaPopupAction)). + EndAll() + }) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/ech/rollbackMfaPopup.go b/EdgeAdmin/internal/web/actions/default/httpdns/ech/rollbackMfaPopup.go new file mode 100644 index 0000000..18c35c5 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/ech/rollbackMfaPopup.go @@ -0,0 +1,32 @@ +package ech + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/iwind/TeaGo/actions" +) + +type RollbackMfaPopupAction struct { + actionutils.ParentAction +} + +func (this *RollbackMfaPopupAction) Init() { + this.Nav("", "", "") +} + +func (this *RollbackMfaPopupAction) RunGet(params struct { + LogId int64 +}) { + this.RedirectURL("/httpdns/apps") +} + +func (this *RollbackMfaPopupAction) RunPost(params struct { + LogId int64 + Reason string + OtpCode1 string + OtpCode2 string + + Must *actions.Must + CSRF *actionutils.CSRF +}) { + this.Fail("feature removed") +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils/helper.go b/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils/helper.go new file mode 100644 index 0000000..dc0b27d --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils/helper.go @@ -0,0 +1,67 @@ +package httpdnsutils + +import ( + "strconv" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/iwind/TeaGo/maps" +) + +func AddLeftMenu(action *actionutils.ParentAction) { + tab := action.Data.GetString("mainTab") + action.Data["teaMenu"] = "httpdns" + action.Data["teaSubMenu"] = tab + action.Data["leftMenuItems"] = []maps.Map{ + { + "name": "\u96c6\u7fa4\u7ba1\u7406", + "url": "/httpdns/clusters", + "isActive": tab == "cluster", + }, + { + "name": "\u5e94\u7528\u7ba1\u7406", + "url": "/httpdns/apps", + "isActive": tab == "app", + }, + { + "name": "\u8bbf\u95ee\u65e5\u5fd7", + "url": "/httpdns/resolveLogs", + "isActive": tab == "resolveLogs", + }, + { + "name": "\u8fd0\u884c\u65e5\u5fd7", + "url": "/httpdns/runtimeLogs", + "isActive": tab == "runtimeLogs", + }, + { + "name": "\u89e3\u6790\u6d4b\u8bd5", + "url": "/httpdns/sandbox", + "isActive": tab == "sandbox", + }, + } +} + +// AddClusterTabbar builds the top tabbar on cluster pages. +func AddClusterTabbar(action *actionutils.ParentAction, clusterName string, clusterId int64, selectedTab string) { + cid := strconv.FormatInt(clusterId, 10) + tabbar := actionutils.NewTabbar() + tabbar.Add("", "", "/httpdns/clusters", "arrow left", false) + titleItem := tabbar.Add(clusterName, "", "/httpdns/clusters/cluster?clusterId="+cid, "angle right", true) + titleItem.IsTitle = true + tabbar.Add("\u8282\u70b9\u5217\u8868", "", "/httpdns/clusters/cluster?clusterId="+cid, "server", selectedTab == "node") + tabbar.Add("\u96c6\u7fa4\u8bbe\u7f6e", "", "/httpdns/clusters/cluster/settings?clusterId="+cid, "setting", selectedTab == "setting") + tabbar.Add("\u5220\u9664\u96c6\u7fa4", "", "/httpdns/clusters/delete?clusterId="+cid, "trash", selectedTab == "delete") + actionutils.SetTabbar(action, tabbar) +} + +// AddAppTabbar builds the top tabbar on app pages. +func AddAppTabbar(action *actionutils.ParentAction, appName string, appId int64, selectedTab string) { + aid := strconv.FormatInt(appId, 10) + tabbar := actionutils.NewTabbar() + tabbar.Add("", "", "/httpdns/apps", "arrow left", false) + titleItem := tabbar.Add(appName, "", "/httpdns/apps/domains?appId="+aid, "angle right", true) + titleItem.IsTitle = true + tabbar.Add("\u57df\u540d\u5217\u8868", "", "/httpdns/apps/domains?appId="+aid, "list", selectedTab == "domains") + tabbar.Add("\u5e94\u7528\u8bbe\u7f6e", "", "/httpdns/apps/app/settings?appId="+aid, "setting", selectedTab == "settings") + tabbar.Add("\u5220\u9664\u5e94\u7528", "", "/httpdns/apps/delete?appId="+aid, "trash", selectedTab == "delete") + actionutils.SetTabbar(action, tabbar) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/index.go b/EdgeAdmin/internal/web/actions/default/httpdns/index.go new file mode 100644 index 0000000..df37453 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/index.go @@ -0,0 +1,11 @@ +package httpdns + +import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) RunGet(params struct{}) { + this.RedirectURL("/httpdns/clusters") +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/init.go b/EdgeAdmin/internal/web/actions/default/httpdns/init.go new file mode 100644 index 0000000..78dc22b --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/init.go @@ -0,0 +1,20 @@ +package httpdns + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/iwind/TeaGo" +) + +func init() { + TeaGo.BeforeStart(func(server *TeaGo.Server) { + server. + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeHttpDNS)). + Data("teaMenu", "httpdns"). + Data("teaSubMenu", "cluster"). + Prefix("/httpdns"). + Get("", new(IndexAction)). + GetPost("/addPortPopup", new(AddPortPopupAction)). + EndAll() + }) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/resolveLogs/index.go b/EdgeAdmin/internal/web/actions/default/httpdns/resolveLogs/index.go new file mode 100644 index 0000000..2dbf574 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/resolveLogs/index.go @@ -0,0 +1,129 @@ +package resolveLogs + +import ( + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + timeutil "github.com/iwind/TeaGo/utils/time" +) + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) Init() { + this.Nav("httpdns", "resolveLogs", "") +} + +func (this *IndexAction) RunGet(params struct { + ClusterId int64 + NodeId int64 + AppId string + Domain string + Status string + Keyword string +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + if params.ClusterId > 0 { + this.Data["clusterId"] = params.ClusterId + } else { + this.Data["clusterId"] = "" + } + if params.NodeId > 0 { + this.Data["nodeId"] = params.NodeId + } else { + this.Data["nodeId"] = "" + } + this.Data["appId"] = params.AppId + this.Data["domain"] = params.Domain + this.Data["status"] = params.Status + this.Data["keyword"] = params.Keyword + + clusterResp, err := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.AdminContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + clusters := make([]map[string]interface{}, 0, len(clusterResp.GetClusters())) + nodes := make([]map[string]interface{}, 0) + for _, cluster := range clusterResp.GetClusters() { + clusters = append(clusters, map[string]interface{}{ + "id": cluster.GetId(), + "name": cluster.GetName(), + }) + nodeResp, err := this.RPC().HTTPDNSNodeRPC().ListHTTPDNSNodes(this.AdminContext(), &pb.ListHTTPDNSNodesRequest{ + ClusterId: cluster.GetId(), + }) + if err != nil { + this.ErrorPage(err) + return + } + for _, node := range nodeResp.GetNodes() { + nodes = append(nodes, map[string]interface{}{ + "id": node.GetId(), + "clusterId": node.GetClusterId(), + "name": node.GetName(), + }) + } + } + this.Data["clusters"] = clusters + this.Data["nodes"] = nodes + + logResp, err := this.RPC().HTTPDNSAccessLogRPC().ListHTTPDNSAccessLogs(this.AdminContext(), &pb.ListHTTPDNSAccessLogsRequest{ + Day: "", + ClusterId: params.ClusterId, + NodeId: params.NodeId, + AppId: strings.TrimSpace(params.AppId), + Domain: strings.TrimSpace(params.Domain), + Status: strings.TrimSpace(params.Status), + Keyword: strings.TrimSpace(params.Keyword), + Offset: 0, + Size: 100, + }) + if err != nil { + this.ErrorPage(err) + return + } + + logs := make([]map[string]interface{}, 0, len(logResp.GetLogs())) + for _, item := range logResp.GetLogs() { + createdTime := "" + if item.GetCreatedAt() > 0 { + createdTime = timeutil.FormatTime("Y-m-d H:i:s", item.GetCreatedAt()) + } + status := item.GetStatus() + if len(status) == 0 { + status = "failed" + } + errorCode := item.GetErrorCode() + if len(errorCode) == 0 { + errorCode = "none" + } + + logs = append(logs, map[string]interface{}{ + "time": createdTime, + "clusterId": item.GetClusterId(), + "clusterName": item.GetClusterName(), + "nodeId": item.GetNodeId(), + "nodeName": item.GetNodeName(), + "appName": item.GetAppName(), + "appId": item.GetAppId(), + "domain": item.GetDomain(), + "query": item.GetQtype(), + "clientIp": item.GetClientIP(), + "os": item.GetOs(), + "sdkVersion": item.GetSdkVersion(), + "ips": item.GetResultIPs(), + "status": status, + "errorCode": errorCode, + "costMs": item.GetCostMs(), + }) + } + + this.Data["resolveLogs"] = logs + this.Show() +} + diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/resolveLogs/init.go b/EdgeAdmin/internal/web/actions/default/httpdns/resolveLogs/init.go new file mode 100644 index 0000000..da6afb4 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/resolveLogs/init.go @@ -0,0 +1,19 @@ +package resolveLogs + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/iwind/TeaGo" +) + +func init() { + TeaGo.BeforeStart(func(server *TeaGo.Server) { + server. + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeHttpDNS)). + Data("teaMenu", "httpdns"). + Data("teaSubMenu", "resolveLogs"). + Prefix("/httpdns/resolveLogs"). + Get("", new(IndexAction)). + EndAll() + }) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/runtimeLogs/index.go b/EdgeAdmin/internal/web/actions/default/httpdns/runtimeLogs/index.go new file mode 100644 index 0000000..6d2071e --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/runtimeLogs/index.go @@ -0,0 +1,116 @@ +package runtimeLogs + +import ( + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + timeutil "github.com/iwind/TeaGo/utils/time" +) + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) Init() { + this.Nav("httpdns", "runtimeLogs", "") +} + +func (this *IndexAction) RunGet(params struct { + ClusterId int64 + NodeId int64 + DayFrom string + DayTo string + Level string + Keyword string +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + if params.ClusterId > 0 { + this.Data["clusterId"] = params.ClusterId + } else { + this.Data["clusterId"] = "" + } + if params.NodeId > 0 { + this.Data["nodeId"] = params.NodeId + } else { + this.Data["nodeId"] = "" + } + this.Data["dayFrom"] = params.DayFrom + this.Data["dayTo"] = params.DayTo + this.Data["level"] = params.Level + this.Data["keyword"] = params.Keyword + + clusterResp, err := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.AdminContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + clusters := make([]map[string]interface{}, 0, len(clusterResp.GetClusters())) + nodes := make([]map[string]interface{}, 0) + for _, cluster := range clusterResp.GetClusters() { + clusters = append(clusters, map[string]interface{}{ + "id": cluster.GetId(), + "name": cluster.GetName(), + }) + nodeResp, err := this.RPC().HTTPDNSNodeRPC().ListHTTPDNSNodes(this.AdminContext(), &pb.ListHTTPDNSNodesRequest{ + ClusterId: cluster.GetId(), + }) + if err != nil { + this.ErrorPage(err) + return + } + for _, node := range nodeResp.GetNodes() { + nodes = append(nodes, map[string]interface{}{ + "id": node.GetId(), + "clusterId": node.GetClusterId(), + "name": node.GetName(), + }) + } + } + this.Data["clusters"] = clusters + this.Data["nodes"] = nodes + + day := strings.TrimSpace(params.DayFrom) + if len(day) == 0 { + day = strings.TrimSpace(params.DayTo) + } + logResp, err := this.RPC().HTTPDNSRuntimeLogRPC().ListHTTPDNSRuntimeLogs(this.AdminContext(), &pb.ListHTTPDNSRuntimeLogsRequest{ + Day: day, + ClusterId: params.ClusterId, + NodeId: params.NodeId, + Level: strings.TrimSpace(params.Level), + Keyword: strings.TrimSpace(params.Keyword), + Offset: 0, + Size: 100, + }) + if err != nil { + this.ErrorPage(err) + return + } + + runtimeLogs := make([]map[string]interface{}, 0, len(logResp.GetLogs())) + for _, item := range logResp.GetLogs() { + createdTime := "" + if item.GetCreatedAt() > 0 { + createdTime = timeutil.FormatTime("Y-m-d H:i:s", item.GetCreatedAt()) + } + runtimeLogs = append(runtimeLogs, map[string]interface{}{ + "createdTime": createdTime, + "clusterId": item.GetClusterId(), + "clusterName": item.GetClusterName(), + "nodeId": item.GetNodeId(), + "nodeName": item.GetNodeName(), + "level": item.GetLevel(), + "tag": item.GetType(), + "module": item.GetModule(), + "description": item.GetDescription(), + "count": item.GetCount(), + "requestId": item.GetRequestId(), + }) + } + this.Data["runtimeLogs"] = runtimeLogs + this.Show() +} + diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/runtimeLogs/init.go b/EdgeAdmin/internal/web/actions/default/httpdns/runtimeLogs/init.go new file mode 100644 index 0000000..0816d7b --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/runtimeLogs/init.go @@ -0,0 +1,19 @@ +package runtimeLogs + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/iwind/TeaGo" +) + +func init() { + TeaGo.BeforeStart(func(server *TeaGo.Server) { + server. + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeHttpDNS)). + Data("teaMenu", "httpdns"). + Data("teaSubMenu", "runtimeLogs"). + Prefix("/httpdns/runtimeLogs"). + Get("", new(IndexAction)). + EndAll() + }) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/sandbox/index.go b/EdgeAdmin/internal/web/actions/default/httpdns/sandbox/index.go new file mode 100644 index 0000000..11f640b --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/sandbox/index.go @@ -0,0 +1,100 @@ +package sandbox + +import ( + "encoding/json" + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/maps" +) + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) Init() { + this.Nav("httpdns", "sandbox", "") +} + +func (this *IndexAction) RunGet(params struct{}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + clusterResp, err := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.AdminContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + clusters := make([]maps.Map, 0, len(clusterResp.GetClusters())) + for _, cluster := range clusterResp.GetClusters() { + serviceDomain := strings.TrimSpace(cluster.GetServiceDomain()) + + port := "443" + if rawTLS := cluster.GetTlsPolicyJSON(); len(rawTLS) > 0 { + var tlsConfig map[string]interface{} + if err := json.Unmarshal(rawTLS, &tlsConfig); err == nil { + if listenRaw, ok := tlsConfig["listen"]; ok && listenRaw != nil { + if data, err := json.Marshal(listenRaw); err == nil { + var listenAddresses []map[string]interface{} + if err := json.Unmarshal(data, &listenAddresses); err == nil { + if len(listenAddresses) > 0 { + if portRange, ok := listenAddresses[0]["portRange"].(string); ok && len(portRange) > 0 { + port = portRange + } + } + } + } + } + } + } + apiAddress := "https://" + serviceDomain + ":" + port + + displayName := apiAddress + if len(serviceDomain) == 0 { + displayName = cluster.GetName() + } + clusters = append(clusters, maps.Map{ + "id": cluster.GetId(), + "name": cluster.GetName(), + "serviceDomain": serviceDomain, + "displayName": displayName, + }) + } + this.Data["clusters"] = clusters + + appResp, err := this.RPC().HTTPDNSAppRPC().FindAllHTTPDNSApps(this.AdminContext(), &pb.FindAllHTTPDNSAppsRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + apps := make([]maps.Map, 0, len(appResp.GetApps())) + for _, app := range appResp.GetApps() { + domainResp, err := this.RPC().HTTPDNSDomainRPC().ListHTTPDNSDomainsWithAppId(this.AdminContext(), &pb.ListHTTPDNSDomainsWithAppIdRequest{ + AppDbId: app.GetId(), + }) + if err != nil { + this.ErrorPage(err) + return + } + domains := make([]string, 0, len(domainResp.GetDomains())) + for _, domain := range domainResp.GetDomains() { + domains = append(domains, domain.GetDomain()) + } + // 解析集群ID列表 + var clusterIds []int64 + if len(app.GetClusterIdsJSON()) > 0 { + _ = json.Unmarshal(app.GetClusterIdsJSON(), &clusterIds) + } + + apps = append(apps, maps.Map{ + "id": app.GetId(), + "name": app.GetName(), + "appId": app.GetAppId(), + "clusterIds": clusterIds, + "domains": domains, + }) + } + this.Data["apps"] = apps + this.Show() +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/sandbox/init.go b/EdgeAdmin/internal/web/actions/default/httpdns/sandbox/init.go new file mode 100644 index 0000000..9a68b4e --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/sandbox/init.go @@ -0,0 +1,20 @@ +package sandbox + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/iwind/TeaGo" +) + +func init() { + TeaGo.BeforeStart(func(server *TeaGo.Server) { + server. + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeHttpDNS)). + Data("teaMenu", "httpdns"). + Data("teaSubMenu", "sandbox"). + Prefix("/httpdns/sandbox"). + Get("", new(IndexAction)). + Post("/test", new(TestAction)). + EndAll() + }) +} diff --git a/EdgeAdmin/internal/web/actions/default/httpdns/sandbox/test.go b/EdgeAdmin/internal/web/actions/default/httpdns/sandbox/test.go new file mode 100644 index 0000000..5a66eae --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/httpdns/sandbox/test.go @@ -0,0 +1,170 @@ +package sandbox + +import ( + "crypto/hmac" + "crypto/sha256" + "encoding/hex" + "encoding/json" + "net/url" + "strconv" + "strings" + "time" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/index/loginutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/maps" + "github.com/iwind/TeaGo/rands" +) + +type TestAction struct { + actionutils.ParentAction +} + +func (this *TestAction) RunPost(params struct { + AppId string + ClusterId int64 + Domain string + ClientIp string + Qtype string +}) { + clientIP := strings.TrimSpace(params.ClientIp) + if len(clientIP) == 0 { + clientIP = strings.TrimSpace(loginutils.RemoteIP(&this.ActionObject)) + } + qtype := strings.ToUpper(strings.TrimSpace(params.Qtype)) + if len(qtype) == 0 { + qtype = "A" + } + + resp, err := this.RPC().HTTPDNSSandboxRPC().TestHTTPDNSResolve(this.AdminContext(), &pb.TestHTTPDNSResolveRequest{ + ClusterId: params.ClusterId, + AppId: strings.TrimSpace(params.AppId), + Domain: strings.TrimSpace(params.Domain), + Qtype: qtype, + ClientIP: clientIP, + Sid: "", + SdkVersion: "", + Os: "", + }) + if err != nil { + this.ErrorPage(err) + return + } + + clusterDomain := "" + port := "443" + if params.ClusterId > 0 { + clusterResp, findErr := this.RPC().HTTPDNSClusterRPC().FindHTTPDNSCluster(this.AdminContext(), &pb.FindHTTPDNSClusterRequest{ + ClusterId: params.ClusterId, + }) + if findErr == nil && clusterResp.GetCluster() != nil { + clusterDomain = strings.TrimSpace(clusterResp.GetCluster().GetServiceDomain()) + if rawTLS := clusterResp.GetCluster().GetTlsPolicyJSON(); len(rawTLS) > 0 { + var tlsConfig map[string]interface{} + if err := json.Unmarshal(rawTLS, &tlsConfig); err == nil { + if listenRaw, ok := tlsConfig["listen"]; ok && listenRaw != nil { + if data, err := json.Marshal(listenRaw); err == nil { + var listenAddresses []map[string]interface{} + if err := json.Unmarshal(data, &listenAddresses); err == nil { + if len(listenAddresses) > 0 { + if portRange, ok := listenAddresses[0]["portRange"].(string); ok && len(portRange) > 0 { + port = portRange + } + } + } + } + } + } + } + } + } + if len(clusterDomain) == 0 { + clusterDomain = "httpdns.example.com" + } + query := url.Values{} + query.Set("appId", params.AppId) + query.Set("dn", params.Domain) + query.Set("qtype", qtype) + if len(clientIP) > 0 { + query.Set("cip", clientIP) + } + + signEnabled, signSecret := this.findAppSignConfig(params.AppId) + if signEnabled && len(signSecret) > 0 { + exp := strconv.FormatInt(time.Now().Unix()+300, 10) + nonce := "sandbox-" + rands.HexString(16) + sign := buildSandboxResolveSign(signSecret, params.AppId, params.Domain, qtype, exp, nonce) + query.Set("exp", exp) + query.Set("nonce", nonce) + query.Set("sign", sign) + } + requestURL := "https://" + clusterDomain + ":" + port + "/resolve?" + query.Encode() + + resultCode := 1 + if strings.EqualFold(resp.GetCode(), "SUCCESS") { + resultCode = 0 + } + rows := make([]maps.Map, 0, len(resp.GetRecords())) + ips := make([]string, 0, len(resp.GetRecords())) + lineName := strings.TrimSpace(resp.GetClientCarrier()) + if len(lineName) == 0 { + lineName = "-" + } + for _, record := range resp.GetRecords() { + ips = append(ips, record.GetIp()) + if lineName == "-" && len(record.GetLine()) > 0 { + lineName = record.GetLine() + } + rows = append(rows, maps.Map{ + "domain": resp.GetDomain(), + "type": record.GetType(), + "ip": record.GetIp(), + "ttl": record.GetTtl(), + "region": record.GetRegion(), + "line": record.GetLine(), + }) + } + + this.Data["result"] = maps.Map{ + "code": resultCode, + "message": resp.GetMessage(), + "requestId": resp.GetRequestId(), + "data": maps.Map{ + "request_url": requestURL, + "client_ip": resp.GetClientIP(), + "client_region": resp.GetClientRegion(), + "line_name": lineName, + "ips": ips, + "records": rows, + "ttl": resp.GetTtl(), + }, + } + this.Success() +} + +func (this *TestAction) findAppSignConfig(appId string) (bool, string) { + appId = strings.TrimSpace(appId) + if len(appId) == 0 { + return false, "" + } + + resp, err := this.RPC().HTTPDNSAppRPC().FindAllHTTPDNSApps(this.AdminContext(), &pb.FindAllHTTPDNSAppsRequest{}) + if err != nil { + return false, "" + } + + for _, app := range resp.GetApps() { + if strings.EqualFold(strings.TrimSpace(app.GetAppId()), appId) { + return app.GetSignEnabled(), strings.TrimSpace(app.GetSignSecret()) + } + } + return false, "" +} + +func buildSandboxResolveSign(signSecret string, appID string, domain string, qtype string, exp string, nonce string) string { + raw := strings.TrimSpace(appID) + "|" + strings.ToLower(strings.TrimSpace(domain)) + "|" + strings.ToUpper(strings.TrimSpace(qtype)) + "|" + strings.TrimSpace(exp) + "|" + strings.TrimSpace(nonce) + mac := hmac.New(sha256.New, []byte(strings.TrimSpace(signSecret))) + _, _ = mac.Write([]byte(raw)) + return hex.EncodeToString(mac.Sum(nil)) +} diff --git a/EdgeAdmin/internal/web/actions/default/settings/settingutils/helper.go b/EdgeAdmin/internal/web/actions/default/settings/settingutils/helper.go index be3299c..083fae6 100644 --- a/EdgeAdmin/internal/web/actions/default/settings/settingutils/helper.go +++ b/EdgeAdmin/internal/web/actions/default/settings/settingutils/helper.go @@ -39,6 +39,7 @@ func (this *Helper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool) if configloaders.AllowModule(adminId, configloaders.AdminModuleCodeSetting) { tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabAdminServer), "", "/settings/server", "", this.tab == "server") tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabAdminUI), "", "/settings/ui", "", this.tab == "ui") + tabbar.Add("升级设置", "", "/settings/upgrade", "", this.tab == "upgrade") tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabAdminSecuritySettings), "", "/settings/security", "", this.tab == "security") if teaconst.IsPlus { tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabIPLibrary), "", "/settings/ip-library", "", this.tab == "ipLibrary") diff --git a/EdgeAdmin/internal/web/actions/default/settings/settingutils/helper_plus.go b/EdgeAdmin/internal/web/actions/default/settings/settingutils/helper_plus.go index 5f10787..131a55a 100644 --- a/EdgeAdmin/internal/web/actions/default/settings/settingutils/helper_plus.go +++ b/EdgeAdmin/internal/web/actions/default/settings/settingutils/helper_plus.go @@ -42,6 +42,7 @@ func (this *Helper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool) if teaconst.IsPlus { tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabUserUI), "", "/settings/user-ui", "", this.tab == "userUI") } + tabbar.Add("升级设置", "", "/settings/upgrade", "", this.tab == "upgrade") tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabAdminSecuritySettings), "", "/settings/security", "", this.tab == "security") tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabIPLibrary), "", "/settings/ip-library", "", this.tab == "ipLibrary") } diff --git a/EdgeAdmin/internal/web/actions/default/settings/ui/index.go b/EdgeAdmin/internal/web/actions/default/settings/ui/index.go index d2de556..f178c8a 100644 --- a/EdgeAdmin/internal/web/actions/default/settings/ui/index.go +++ b/EdgeAdmin/internal/web/actions/default/settings/ui/index.go @@ -56,9 +56,6 @@ func (this *IndexAction) RunPost(params struct { TimeZone string DnsResolverType string - SupportModuleCDN bool - SupportModuleNS bool - Must *actions.Must CSRF *actionutils.CSRF }) { @@ -93,13 +90,7 @@ func (this *IndexAction) RunPost(params struct { config.DefaultPageSize = 10 } - config.Modules = []userconfigs.UserModule{} - if params.SupportModuleCDN { - config.Modules = append(config.Modules, userconfigs.UserModuleCDN) - } - if params.SupportModuleNS { - config.Modules = append(config.Modules, userconfigs.UserModuleNS) - } + config.Modules = []userconfigs.UserModule{userconfigs.UserModuleCDN, userconfigs.UserModuleNS} // 上传Favicon文件 if params.FaviconFile != nil { diff --git a/EdgeAdmin/internal/web/actions/default/settings/upgrade/dns_helper_default.go b/EdgeAdmin/internal/web/actions/default/settings/upgrade/dns_helper_default.go new file mode 100644 index 0000000..9e0c41a --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/settings/upgrade/dns_helper_default.go @@ -0,0 +1,23 @@ +//go:build !plus + +package upgrade + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/iwind/TeaGo/maps" +) + +// loadDNSUpgradeModules 非Plus版本不支持DNS模块 +func loadDNSUpgradeModules(parent *actionutils.ParentAction) []maps.Map { + return nil +} + +// upgradeDNSNode 非Plus版本不支持DNS节点升级 +func upgradeDNSNode(parent *actionutils.ParentAction, nodeId int64) error { + return nil +} + +// loadDNSNodeStatus 非Plus版本不支持DNS节点状态查询 +func loadDNSNodeStatus(parent *actionutils.ParentAction, nodeIds []int64) []maps.Map { + return nil +} diff --git a/EdgeAdmin/internal/web/actions/default/settings/upgrade/dns_helper_plus.go b/EdgeAdmin/internal/web/actions/default/settings/upgrade/dns_helper_plus.go new file mode 100644 index 0000000..653a840 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/settings/upgrade/dns_helper_plus.go @@ -0,0 +1,100 @@ +//go:build plus + +package upgrade + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/maps" +) + +// loadDNSUpgradeModules 加载DNS模块的待升级节点信息 +func loadDNSUpgradeModules(parent *actionutils.ParentAction) []maps.Map { + clustersResp, err := parent.RPC().NSClusterRPC().ListNSClusters(parent.AdminContext(), &pb.ListNSClustersRequest{ + Offset: 0, + Size: 10000, + }) + if err != nil { + return nil + } + + var clusterMaps []maps.Map + for _, cluster := range clustersResp.NsClusters { + nodesResp, err := parent.RPC().NSNodeRPC().FindAllUpgradeNSNodesWithNSClusterId(parent.AdminContext(), &pb.FindAllUpgradeNSNodesWithNSClusterIdRequest{ + NsClusterId: cluster.Id, + }) + if err != nil { + continue + } + var nodeMaps []maps.Map + for _, nodeUpgrade := range nodesResp.Nodes { + if nodeUpgrade.NsNode == nil { + continue + } + installStatusMap := decodeInstallStatusFromPB(nodeUpgrade.NsNode.InstallStatus) + accessIP, login, loginParams := decodeNodeAccessInfo(nodeUpgrade.NsNode.StatusJSON, nodeUpgrade.NsNode.NodeLogin, nodeUpgrade.NsNode.Name) + + nodeMaps = append(nodeMaps, maps.Map{ + "id": nodeUpgrade.NsNode.Id, + "name": nodeUpgrade.NsNode.Name, + "os": nodeUpgrade.Os, + "arch": nodeUpgrade.Arch, + "oldVersion": nodeUpgrade.OldVersion, + "newVersion": nodeUpgrade.NewVersion, + "isOn": nodeUpgrade.NsNode.IsOn, + "isUp": nodeUpgrade.NsNode.IsUp, + "accessIP": accessIP, + "login": login, + "loginParams": loginParams, + "installStatus": installStatusMap, + }) + } + if len(nodeMaps) == 0 { + continue + } + clusterMaps = append(clusterMaps, maps.Map{ + "id": cluster.Id, + "name": cluster.Name, + "nodes": nodeMaps, + "count": len(nodeMaps), + }) + } + return clusterMaps +} + +// upgradeDNSNode 升级DNS节点 +func upgradeDNSNode(parent *actionutils.ParentAction, nodeId int64) error { + _, err := parent.RPC().NSNodeRPC().UpgradeNSNode(parent.AdminContext(), &pb.UpgradeNSNodeRequest{ + NsNodeId: nodeId, + }) + return err +} + +// loadDNSNodeStatus 加载DNS节点安装状态 +func loadDNSNodeStatus(parent *actionutils.ParentAction, nodeIds []int64) []maps.Map { + var result []maps.Map + for _, nodeId := range nodeIds { + resp, err := parent.RPC().NSNodeRPC().FindNSNode(parent.AdminContext(), &pb.FindNSNodeRequest{ + NsNodeId: nodeId, + }) + if err != nil || resp.NsNode == nil { + continue + } + var installStatusMap maps.Map + if resp.NsNode.InstallStatus != nil { + installStatusMap = maps.Map{ + "isRunning": resp.NsNode.InstallStatus.IsRunning, + "isFinished": resp.NsNode.InstallStatus.IsFinished, + "isOk": resp.NsNode.InstallStatus.IsOk, + "error": resp.NsNode.InstallStatus.Error, + "errorCode": resp.NsNode.InstallStatus.ErrorCode, + "updatedAt": resp.NsNode.InstallStatus.UpdatedAt, + } + } + result = append(result, maps.Map{ + "id": nodeId, + "installStatus": installStatusMap, + }) + } + return result +} diff --git a/EdgeAdmin/internal/web/actions/default/settings/upgrade/index.go b/EdgeAdmin/internal/web/actions/default/settings/upgrade/index.go index 66ca047..6997fc8 100644 --- a/EdgeAdmin/internal/web/actions/default/settings/upgrade/index.go +++ b/EdgeAdmin/internal/web/actions/default/settings/upgrade/index.go @@ -1,6 +1,15 @@ package upgrade -import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( + "encoding/json" + "strings" + + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/maps" +) type IndexAction struct { actionutils.ParentAction @@ -11,5 +20,264 @@ func (this *IndexAction) Init() { } func (this *IndexAction) RunGet(params struct{}) { + // 加载升级配置 + config, err := configloaders.LoadUpgradeConfig() + if err != nil { + this.ErrorPage(err) + return + } + this.Data["config"] = config + + // 模块列表 + modules := []maps.Map{} + + // 1. 边缘节点 (EdgeNode) + nodeModule := this.loadEdgeNodeModule() + if nodeModule != nil { + modules = append(modules, nodeModule) + } + + // 2. DNS节点 (EdgeDNS) — 仅Plus版本 + if teaconst.IsPlus { + dnsClusters := loadDNSUpgradeModules(&this.ParentAction) + if len(dnsClusters) > 0 { + totalCount := 0 + for _, c := range dnsClusters { + totalCount += c.GetInt("count") + } + modules = append(modules, maps.Map{ + "name": "DNS节点", + "code": "dns", + "clusters": dnsClusters, + "count": totalCount, + }) + } + } + + // 3. HTTPDNS节点 + httpdnsModule := this.loadHTTPDNSModule() + if httpdnsModule != nil { + modules = append(modules, httpdnsModule) + } + + this.Data["modules"] = modules + this.Show() } + +func (this *IndexAction) RunPost(params struct { + AutoUpgrade bool +}) { + config, err := configloaders.LoadUpgradeConfig() + if err != nil { + this.ErrorPage(err) + return + } + + config.AutoUpgrade = params.AutoUpgrade + + err = configloaders.UpdateUpgradeConfig(config) + if err != nil { + this.ErrorPage(err) + return + } + + this.Success() +} + +// loadEdgeNodeModule 加载边缘节点模块的待升级信息 +func (this *IndexAction) loadEdgeNodeModule() maps.Map { + // 获取所有集群 + clustersResp, err := this.RPC().NodeClusterRPC().ListEnabledNodeClusters(this.AdminContext(), &pb.ListEnabledNodeClustersRequest{ + Offset: 0, + Size: 10000, + }) + if err != nil { + return nil + } + + var clusterMaps []maps.Map + totalCount := 0 + for _, cluster := range clustersResp.NodeClusters { + resp, err := this.RPC().NodeRPC().FindAllUpgradeNodesWithNodeClusterId(this.AdminContext(), &pb.FindAllUpgradeNodesWithNodeClusterIdRequest{ + NodeClusterId: cluster.Id, + }) + if err != nil { + continue + } + if len(resp.Nodes) == 0 { + continue + } + + var nodeMaps []maps.Map + for _, nodeUpgrade := range resp.Nodes { + if nodeUpgrade.Node == nil { + continue + } + installStatusMap := decodeInstallStatusFromPB(nodeUpgrade.Node.InstallStatus) + accessIP, login, loginParams := decodeNodeAccessInfo(nodeUpgrade.Node.StatusJSON, nodeUpgrade.Node.NodeLogin, nodeUpgrade.Node.Name) + + nodeMaps = append(nodeMaps, maps.Map{ + "id": nodeUpgrade.Node.Id, + "name": nodeUpgrade.Node.Name, + "os": nodeUpgrade.Os, + "arch": nodeUpgrade.Arch, + "oldVersion": nodeUpgrade.OldVersion, + "newVersion": nodeUpgrade.NewVersion, + "isOn": nodeUpgrade.Node.IsOn, + "isUp": nodeUpgrade.Node.IsUp, + "accessIP": accessIP, + "login": login, + "loginParams": loginParams, + "installStatus": installStatusMap, + }) + } + totalCount += len(nodeMaps) + clusterMaps = append(clusterMaps, maps.Map{ + "id": cluster.Id, + "name": cluster.Name, + "nodes": nodeMaps, + "count": len(nodeMaps), + }) + } + + if len(clusterMaps) == 0 { + return nil + } + + return maps.Map{ + "name": "边缘节点", + "code": "node", + "clusters": clusterMaps, + "count": totalCount, + } +} + +// loadHTTPDNSModule 加载HTTPDNS模块的待升级信息 +func (this *IndexAction) loadHTTPDNSModule() maps.Map { + clustersResp, err := this.RPC().HTTPDNSClusterRPC().ListHTTPDNSClusters(this.AdminContext(), &pb.ListHTTPDNSClustersRequest{ + Offset: 0, + Size: 10000, + }) + if err != nil { + return nil + } + + var clusterMaps []maps.Map + totalCount := 0 + for _, cluster := range clustersResp.Clusters { + resp, err := this.RPC().HTTPDNSNodeRPC().FindAllUpgradeHTTPDNSNodesWithClusterId(this.AdminContext(), &pb.FindAllUpgradeHTTPDNSNodesWithClusterIdRequest{ + ClusterId: cluster.Id, + }) + if err != nil { + continue + } + if len(resp.Nodes) == 0 { + continue + } + + var nodeMaps []maps.Map + for _, nodeUpgrade := range resp.Nodes { + if nodeUpgrade.Node == nil { + continue + } + installStatusMap := decodeInstallStatusFromJSON(nodeUpgrade.Node.InstallStatusJSON) + accessIP, login, loginParams := decodeNodeAccessInfo(nodeUpgrade.Node.StatusJSON, nodeUpgrade.Node.NodeLogin, nodeUpgrade.Node.Name) + + nodeMaps = append(nodeMaps, maps.Map{ + "id": nodeUpgrade.Node.Id, + "name": nodeUpgrade.Node.Name, + "os": nodeUpgrade.Os, + "arch": nodeUpgrade.Arch, + "oldVersion": nodeUpgrade.OldVersion, + "newVersion": nodeUpgrade.NewVersion, + "isOn": nodeUpgrade.Node.IsOn, + "isUp": nodeUpgrade.Node.IsUp, + "accessIP": accessIP, + "login": login, + "loginParams": loginParams, + "installStatus": installStatusMap, + }) + } + totalCount += len(nodeMaps) + clusterMaps = append(clusterMaps, maps.Map{ + "id": cluster.Id, + "name": cluster.Name, + "nodes": nodeMaps, + "count": len(nodeMaps), + }) + } + + if len(clusterMaps) == 0 { + return nil + } + + return maps.Map{ + "name": "HTTPDNS节点", + "code": "httpdns", + "clusters": clusterMaps, + "count": totalCount, + } +} + +// decodeInstallStatusFromPB 从 protobuf InstallStatus 解码安装状态 +func decodeInstallStatusFromPB(status *pb.NodeInstallStatus) maps.Map { + if status == nil { + return nil + } + // 历史成功状态，在待升级列表中忽略 + if status.IsFinished && status.IsOk { + return nil + } + return maps.Map{ + "isRunning": status.IsRunning, + "isFinished": status.IsFinished, + "isOk": status.IsOk, + "error": status.Error, + "errorCode": status.ErrorCode, + "updatedAt": status.UpdatedAt, + } +} + +// decodeInstallStatusFromJSON 从 JSON 字节解码安装状态 +func decodeInstallStatusFromJSON(raw []byte) maps.Map { + if len(raw) == 0 { + return nil + } + result := maps.Map{} + _ = json.Unmarshal(raw, &result) + + isFinished, _ := result["isFinished"].(bool) + isOk, _ := result["isOk"].(bool) + if isFinished && isOk { + return nil + } + return result +} + +// decodeNodeAccessInfo 从节点状态和登录信息中提取 accessIP、login、loginParams +func decodeNodeAccessInfo(statusJSON []byte, nodeLogin *pb.NodeLogin, nodeName string) (accessIP string, login maps.Map, loginParams maps.Map) { + // 从 statusJSON 中提取 hostIP 作为 accessIP + if len(statusJSON) > 0 { + statusMap := maps.Map{} + _ = json.Unmarshal(statusJSON, &statusMap) + accessIP = strings.TrimSpace(statusMap.GetString("hostIP")) + } + if len(accessIP) == 0 { + accessIP = strings.TrimSpace(nodeName) + } + + // 解码 login 信息 + if nodeLogin != nil { + login = maps.Map{ + "id": nodeLogin.Id, + "name": nodeLogin.Name, + "type": nodeLogin.Type, + } + if len(nodeLogin.Params) > 0 { + loginParams = maps.Map{} + _ = json.Unmarshal(nodeLogin.Params, &loginParams) + } + } + return +} diff --git a/EdgeAdmin/internal/web/actions/default/settings/upgrade/init.go b/EdgeAdmin/internal/web/actions/default/settings/upgrade/init.go index c495cad..322e7cb 100644 --- a/EdgeAdmin/internal/web/actions/default/settings/upgrade/init.go +++ b/EdgeAdmin/internal/web/actions/default/settings/upgrade/init.go @@ -13,7 +13,9 @@ func init() { Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)). Helper(settingutils.NewHelper("upgrade")). Prefix("/settings/upgrade"). - Get("", new(IndexAction)). + GetPost("", new(IndexAction)). + Post("/upgradeNode", new(UpgradeNodeAction)). + Post("/status", new(StatusAction)). EndAll() }) } diff --git a/EdgeAdmin/internal/web/actions/default/settings/upgrade/status.go b/EdgeAdmin/internal/web/actions/default/settings/upgrade/status.go new file mode 100644 index 0000000..67617a6 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/settings/upgrade/status.go @@ -0,0 +1,80 @@ +package upgrade + +import ( + "encoding/json" + + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/maps" +) + +type StatusAction struct { + actionutils.ParentAction +} + +func (this *StatusAction) RunPost(params struct { + NodeIdsJSON []byte // JSON: {"node": [1,2], "dns": [3], "httpdns": [4,5]} +}) { + var nodeIdsMap map[string][]int64 + if len(params.NodeIdsJSON) > 0 { + _ = json.Unmarshal(params.NodeIdsJSON, &nodeIdsMap) + } + + result := maps.Map{} + + // EdgeNode 状态 + if nodeIds, ok := nodeIdsMap["node"]; ok && len(nodeIds) > 0 { + var nodeStatuses []maps.Map + for _, nodeId := range nodeIds { + resp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: nodeId}) + if err != nil || resp.Node == nil { + continue + } + var installStatusMap maps.Map + if resp.Node.InstallStatus != nil { + installStatusMap = maps.Map{ + "isRunning": resp.Node.InstallStatus.IsRunning, + "isFinished": resp.Node.InstallStatus.IsFinished, + "isOk": resp.Node.InstallStatus.IsOk, + "error": resp.Node.InstallStatus.Error, + "errorCode": resp.Node.InstallStatus.ErrorCode, + "updatedAt": resp.Node.InstallStatus.UpdatedAt, + } + } + nodeStatuses = append(nodeStatuses, maps.Map{ + "id": nodeId, + "installStatus": installStatusMap, + }) + } + result["node"] = nodeStatuses + } + + // DNS 状态 + if nodeIds, ok := nodeIdsMap["dns"]; ok && len(nodeIds) > 0 { + result["dns"] = loadDNSNodeStatus(&this.ParentAction, nodeIds) + } + + // HTTPDNS 状态 + if nodeIds, ok := nodeIdsMap["httpdns"]; ok && len(nodeIds) > 0 { + var nodeStatuses []maps.Map + for _, nodeId := range nodeIds { + resp, err := this.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(this.AdminContext(), &pb.FindHTTPDNSNodeRequest{NodeId: nodeId}) + if err != nil || resp.Node == nil { + continue + } + var installStatusMap maps.Map + if len(resp.Node.InstallStatusJSON) > 0 { + installStatusMap = maps.Map{} + _ = json.Unmarshal(resp.Node.InstallStatusJSON, &installStatusMap) + } + nodeStatuses = append(nodeStatuses, maps.Map{ + "id": nodeId, + "installStatus": installStatusMap, + }) + } + result["httpdns"] = nodeStatuses + } + + this.Data["statuses"] = result + this.Success() +} diff --git a/EdgeAdmin/internal/web/actions/default/settings/upgrade/upgradeNode.go b/EdgeAdmin/internal/web/actions/default/settings/upgrade/upgradeNode.go new file mode 100644 index 0000000..8bd7d78 --- /dev/null +++ b/EdgeAdmin/internal/web/actions/default/settings/upgrade/upgradeNode.go @@ -0,0 +1,150 @@ +package upgrade + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/maps" +) + +type UpgradeNodeAction struct { + actionutils.ParentAction +} + +func (this *UpgradeNodeAction) RunPost(params struct { + Module string // node, dns, httpdns + Scope string // all, module, cluster, node + ClusterId int64 + NodeId int64 +}) { + switch params.Scope { + case "node": + err := this.upgradeSingleNode(params.Module, params.NodeId) + if err != nil { + this.ErrorPage(err) + return + } + case "cluster": + err := this.upgradeCluster(params.Module, params.ClusterId) + if err != nil { + this.ErrorPage(err) + return + } + case "module": + err := this.upgradeModule(params.Module) + if err != nil { + this.ErrorPage(err) + return + } + case "all": + _ = this.upgradeModule("node") + _ = this.upgradeModule("dns") + _ = this.upgradeModule("httpdns") + } + + this.Success() +} + +func (this *UpgradeNodeAction) upgradeSingleNode(module string, nodeId int64) error { + switch module { + case "node": + _, err := this.RPC().NodeRPC().UpgradeNode(this.AdminContext(), &pb.UpgradeNodeRequest{NodeId: nodeId}) + return err + case "dns": + return upgradeDNSNode(&this.ParentAction, nodeId) + case "httpdns": + _, err := this.RPC().HTTPDNSNodeRPC().UpgradeHTTPDNSNode(this.AdminContext(), &pb.UpgradeHTTPDNSNodeRequest{NodeId: nodeId}) + return err + } + return nil +} + +func (this *UpgradeNodeAction) upgradeCluster(module string, clusterId int64) error { + switch module { + case "node": + resp, err := this.RPC().NodeRPC().FindAllUpgradeNodesWithNodeClusterId(this.AdminContext(), &pb.FindAllUpgradeNodesWithNodeClusterIdRequest{ + NodeClusterId: clusterId, + }) + if err != nil { + return err + } + for _, nodeUpgrade := range resp.Nodes { + if nodeUpgrade.Node == nil { + continue + } + _, _ = this.RPC().NodeRPC().UpgradeNode(this.AdminContext(), &pb.UpgradeNodeRequest{NodeId: nodeUpgrade.Node.Id}) + } + case "dns": + this.upgradeDNSCluster(clusterId) + case "httpdns": + resp, err := this.RPC().HTTPDNSNodeRPC().FindAllUpgradeHTTPDNSNodesWithClusterId(this.AdminContext(), &pb.FindAllUpgradeHTTPDNSNodesWithClusterIdRequest{ + ClusterId: clusterId, + }) + if err != nil { + return err + } + for _, nodeUpgrade := range resp.Nodes { + if nodeUpgrade.Node == nil { + continue + } + _, _ = this.RPC().HTTPDNSNodeRPC().UpgradeHTTPDNSNode(this.AdminContext(), &pb.UpgradeHTTPDNSNodeRequest{NodeId: nodeUpgrade.Node.Id}) + } + } + return nil +} + +func (this *UpgradeNodeAction) upgradeModule(module string) error { + switch module { + case "node": + clustersResp, err := this.RPC().NodeClusterRPC().ListEnabledNodeClusters(this.AdminContext(), &pb.ListEnabledNodeClustersRequest{ + Offset: 0, + Size: 10000, + }) + if err != nil { + return err + } + for _, cluster := range clustersResp.NodeClusters { + _ = this.upgradeCluster("node", cluster.Id) + } + case "dns": + dnsClusters := loadDNSUpgradeModules(&this.ParentAction) + for _, c := range dnsClusters { + this.upgradeDNSClusterFromMap(c) + } + case "httpdns": + clustersResp, err := this.RPC().HTTPDNSClusterRPC().ListHTTPDNSClusters(this.AdminContext(), &pb.ListHTTPDNSClustersRequest{ + Offset: 0, + Size: 10000, + }) + if err != nil { + return err + } + for _, cluster := range clustersResp.Clusters { + _ = this.upgradeCluster("httpdns", cluster.Id) + } + } + return nil +} + +// upgradeDNSCluster 根据集群ID升级DNS节点 +func (this *UpgradeNodeAction) upgradeDNSCluster(clusterId int64) { + dnsClusters := loadDNSUpgradeModules(&this.ParentAction) + for _, c := range dnsClusters { + if c.GetInt64("id") == clusterId { + this.upgradeDNSClusterFromMap(c) + break + } + } +} + +// upgradeDNSClusterFromMap 从maps.Map中提取节点ID并升级 +func (this *UpgradeNodeAction) upgradeDNSClusterFromMap(c maps.Map) { + nodesVal := c.Get("nodes") + if nodeMaps, ok := nodesVal.([]maps.Map); ok { + for _, n := range nodeMaps { + nodeId := n.GetInt64("id") + if nodeId > 0 { + _ = upgradeDNSNode(&this.ParentAction, nodeId) + } + } + } +} diff --git a/EdgeAdmin/internal/web/actions/default/users/createPopup.go b/EdgeAdmin/internal/web/actions/default/users/createPopup.go index 889efe8..54b3ef9 100644 --- a/EdgeAdmin/internal/web/actions/default/users/createPopup.go +++ b/EdgeAdmin/internal/web/actions/default/users/createPopup.go @@ -23,6 +23,34 @@ func (this *CreatePopupAction) Init() { } func (this *CreatePopupAction) RunGet(params struct{}) { + // 检查是否启用了 HTTPDNS 功能（全局用户注册设置中） + var hasHTTPDNSFeature = false + + resp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: systemconfigs.SettingCodeUserRegisterConfig}) + if err == nil && len(resp.ValueJSON) > 0 { + var config = userconfigs.DefaultUserRegisterConfig() + if json.Unmarshal(resp.ValueJSON, config) == nil { + hasHTTPDNSFeature = config.HTTPDNSIsOn + } + } + this.Data["hasHTTPDNSFeature"] = hasHTTPDNSFeature + this.Data["httpdnsClusterId"] = 0 + + // 加载所有 HTTPDNS 集群 + var httpdnsClusters = []maps.Map{} + if hasHTTPDNSFeature { + httpdnsClusterResp, err := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.AdminContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if err == nil { + for _, c := range httpdnsClusterResp.GetClusters() { + httpdnsClusters = append(httpdnsClusters, maps.Map{ + "id": c.GetId(), + "name": c.GetName(), + }) + } + } + } + this.Data["httpdnsClusters"] = httpdnsClusters + this.Show() } @@ -35,8 +63,9 @@ func (this *CreatePopupAction) RunPost(params struct { Tel string Email string Remark string - ClusterId int64 - FeaturesType string + ClusterId int64 + HttpdnsClusterId int64 + FeaturesType string // OTP OtpOn bool @@ -111,6 +140,28 @@ func (this *CreatePopupAction) RunPost(params struct { userId = createResp.UserId + // 如果表单选择了 HTTPDNS 关联集群，在这里予以保存 + if params.HttpdnsClusterId > 0 { + httpdnsJSON, _ := json.Marshal([]int64{params.HttpdnsClusterId}) + _, err = this.RPC().UserRPC().UpdateUser(this.AdminContext(), &pb.UpdateUserRequest{ + UserId: userId, + Username: params.Username, + Password: params.Pass1, + Fullname: params.Fullname, + Mobile: params.Mobile, + Tel: params.Tel, + Email: params.Email, + Remark: params.Remark, + IsOn: true, + NodeClusterId: params.ClusterId, + HttpdnsClusterIdsJSON: httpdnsJSON, + }) + if err != nil { + this.ErrorPage(err) + return + } + } + // 功能 if teaconst.IsPlus { if params.FeaturesType == "default" { @@ -127,14 +178,38 @@ func (this *CreatePopupAction) RunPost(params struct { this.ErrorPage(err) return } + var featureCodes = config.Features + _, err = this.RPC().UserRPC().UpdateUserFeatures(this.AdminContext(), &pb.UpdateUserFeaturesRequest{ UserId: userId, - FeatureCodes: config.Features, + FeatureCodes: featureCodes, }) if err != nil { this.ErrorPage(err) return } + + // 自动关联默认 HTTPDNS 集群 (如果没有在表单中选择的话) + if config.HTTPDNSIsOn && params.HttpdnsClusterId <= 0 && len(config.HTTPDNSDefaultClusterIds) > 0 { + httpdnsJSON, _ := json.Marshal(config.HTTPDNSDefaultClusterIds) + _, err = this.RPC().UserRPC().UpdateUser(this.AdminContext(), &pb.UpdateUserRequest{ + UserId: userId, + Username: params.Username, + Password: params.Pass1, + Fullname: params.Fullname, + Mobile: params.Mobile, + Tel: params.Tel, + Email: params.Email, + Remark: params.Remark, + IsOn: true, + NodeClusterId: params.ClusterId, + HttpdnsClusterIdsJSON: httpdnsJSON, + }) + if err != nil { + this.ErrorPage(err) + return + } + } } } else if params.FeaturesType == "all" { featuresResp, err := this.RPC().UserRPC().FindAllUserFeatureDefinitions(this.AdminContext(), &pb.FindAllUserFeatureDefinitionsRequest{}) diff --git a/EdgeAdmin/internal/web/actions/default/users/setting/index.go b/EdgeAdmin/internal/web/actions/default/users/setting/index.go index 11240aa..77f120b 100644 --- a/EdgeAdmin/internal/web/actions/default/users/setting/index.go +++ b/EdgeAdmin/internal/web/actions/default/users/setting/index.go @@ -66,6 +66,28 @@ func (this *IndexAction) RunGet(params struct{}) { // 当前默认的智能DNS设置 this.Data["nsIsVisible"] = plus.AllowComponent(plus.ComponentCodeNS) + // HTTPDNS 集群列表（用于默认集群多选） + httpdnsClusterResp, err := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.AdminContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + httpdnsClusters := make([]maps.Map, 0, len(httpdnsClusterResp.GetClusters())) + for _, cluster := range httpdnsClusterResp.GetClusters() { + httpdnsClusters = append(httpdnsClusters, maps.Map{ + "id": cluster.GetId(), + "name": cluster.GetName(), + }) + } + this.Data["httpdnsClusters"] = httpdnsClusters + + // 当前选中的默认集群（取数组第一个元素） + var httpdnsDefaultClusterId int64 + if len(config.HTTPDNSDefaultClusterIds) > 0 { + httpdnsDefaultClusterId = config.HTTPDNSDefaultClusterIds[0] + } + this.Data["httpdnsDefaultClusterId"] = httpdnsDefaultClusterId + this.Show() } @@ -102,6 +124,9 @@ func (this *IndexAction) RunPost(params struct { NsIsOn bool + HttpdnsIsOn bool + HttpdnsDefaultClusterId int64 + Must *actions.Must CSRF *actionutils.CSRF }) { @@ -112,6 +137,15 @@ func (this *IndexAction) RunPost(params struct { Gt(0, "请选择一个集群") var config = userconfigs.DefaultUserRegisterConfig() + { + // 先读取现有配置，避免保存时把未出现在当前表单里的字段重置为默认值 + resp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{ + Code: systemconfigs.SettingCodeUserRegisterConfig, + }) + if err == nil && len(resp.ValueJSON) > 0 { + _ = json.Unmarshal(resp.ValueJSON, config) + } + } config.IsOn = params.IsOn config.ComplexPassword = params.ComplexPassword config.RequireVerification = params.RequireVerification @@ -142,6 +176,12 @@ func (this *IndexAction) RunPost(params struct { config.ADIsOn = params.AdIsOn config.NSIsOn = params.NsIsOn + config.HTTPDNSIsOn = params.HttpdnsIsOn + if params.HttpdnsDefaultClusterId > 0 { + config.HTTPDNSDefaultClusterIds = []int64{params.HttpdnsDefaultClusterId} + } else { + config.HTTPDNSDefaultClusterIds = []int64{} + } configJSON, err := json.Marshal(config) if err != nil { @@ -157,10 +197,15 @@ func (this *IndexAction) RunPost(params struct { return } - if params.FeatureOp != "keep" { + featureOp := params.FeatureOp + if featureOp != "overwrite" && featureOp != "append" && featureOp != "keep" { + featureOp = "keep" + } + + if featureOp != "keep" { _, err = this.RPC().UserRPC().UpdateAllUsersFeatures(this.AdminContext(), &pb.UpdateAllUsersFeaturesRequest{ FeatureCodes: params.Features, - Overwrite: params.FeatureOp == "overwrite", + Overwrite: featureOp == "overwrite", }) if err != nil { this.ErrorPage(err) diff --git a/EdgeAdmin/internal/web/actions/default/users/update.go b/EdgeAdmin/internal/web/actions/default/users/update.go index 8ab6687..2347ef7 100644 --- a/EdgeAdmin/internal/web/actions/default/users/update.go +++ b/EdgeAdmin/internal/web/actions/default/users/update.go @@ -1,10 +1,14 @@ package users import ( + "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/users/userutils" "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/userconfigs" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" "github.com/xlzd/gotp" @@ -85,6 +89,42 @@ func (this *UpdateAction) RunGet(params struct { this.Data["clusterId"] = user.NodeCluster.Id } + // 检查全局是否启用了 HTTPDNS 功能 + var hasHTTPDNSFeature = false + sysResp, sysErr := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: systemconfigs.SettingCodeUserRegisterConfig}) + if sysErr == nil && len(sysResp.ValueJSON) > 0 { + var regConfig = userconfigs.DefaultUserRegisterConfig() + if json.Unmarshal(sysResp.ValueJSON, regConfig) == nil { + hasHTTPDNSFeature = regConfig.HTTPDNSIsOn + } + } + this.Data["hasHTTPDNSFeature"] = hasHTTPDNSFeature + + // 读取用户已关联的 HTTPDNS 集群（取第一个作为下拉默认值） + var httpdnsClusterId int64 + if len(user.HttpdnsClusterIdsJSON) > 0 { + var userHTTPDNSClusterIds []int64 + if json.Unmarshal(user.HttpdnsClusterIdsJSON, &userHTTPDNSClusterIds) == nil && len(userHTTPDNSClusterIds) > 0 { + httpdnsClusterId = userHTTPDNSClusterIds[0] + } + } + this.Data["httpdnsClusterId"] = httpdnsClusterId + + // 加载所有 HTTPDNS 集群 + httpdnsClusterResp, err := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.AdminContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + httpdnsClusters := make([]maps.Map, 0, len(httpdnsClusterResp.GetClusters())) + for _, c := range httpdnsClusterResp.GetClusters() { + httpdnsClusters = append(httpdnsClusters, maps.Map{ + "id": c.GetId(), + "name": c.GetName(), + }) + } + this.Data["httpdnsClusters"] = httpdnsClusters + this.Show() } @@ -99,8 +139,9 @@ func (this *UpdateAction) RunPost(params struct { Email string Remark string IsOn bool - ClusterId int64 - BandwidthAlgo string + ClusterId int64 + HttpdnsClusterId int64 + BandwidthAlgo string // OTP OtpOn bool @@ -151,18 +192,25 @@ func (this *UpdateAction) RunPost(params struct { Email("请输入正确的电子邮箱") } + var httpdnsClusterIds []int64 + if params.HttpdnsClusterId > 0 { + httpdnsClusterIds = []int64{params.HttpdnsClusterId} + } + httpdnsClusterIdsJSON, _ := json.Marshal(httpdnsClusterIds) + _, err = this.RPC().UserRPC().UpdateUser(this.AdminContext(), &pb.UpdateUserRequest{ - UserId: params.UserId, - Username: params.Username, - Password: params.Pass1, - Fullname: params.Fullname, - Mobile: params.Mobile, - Tel: params.Tel, - Email: params.Email, - Remark: params.Remark, - IsOn: params.IsOn, - NodeClusterId: params.ClusterId, - BandwidthAlgo: params.BandwidthAlgo, + UserId: params.UserId, + Username: params.Username, + Password: params.Pass1, + Fullname: params.Fullname, + Mobile: params.Mobile, + Tel: params.Tel, + Email: params.Email, + Remark: params.Remark, + IsOn: params.IsOn, + NodeClusterId: params.ClusterId, + BandwidthAlgo: params.BandwidthAlgo, + HttpdnsClusterIdsJSON: httpdnsClusterIdsJSON, }) if err != nil { this.ErrorPage(err) diff --git a/EdgeAdmin/internal/web/actions/default/users/user.go b/EdgeAdmin/internal/web/actions/default/users/user.go index f42daa6..72e2377 100644 --- a/EdgeAdmin/internal/web/actions/default/users/user.go +++ b/EdgeAdmin/internal/web/actions/default/users/user.go @@ -6,6 +6,8 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/users/userutils" "github.com/TeaOSLab/EdgeCommon/pkg/iplibrary" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/userconfigs" "github.com/iwind/TeaGo/maps" ) @@ -89,6 +91,37 @@ func (this *UserAction) RunGet(params struct { } } + // 检查全局是否启用了 HTTPDNS 功能 + var hasHTTPDNSFeature = false + sysResp, sysErr := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: systemconfigs.SettingCodeUserRegisterConfig}) + if sysErr == nil && len(sysResp.ValueJSON) > 0 { + var config = userconfigs.DefaultUserRegisterConfig() + if json.Unmarshal(sysResp.ValueJSON, config) == nil { + hasHTTPDNSFeature = config.HTTPDNSIsOn + } + } + this.Data["hasHTTPDNSFeature"] = hasHTTPDNSFeature + + // 读取用户关联的 HTTPDNS 集群 + var httpdnsClusterMap maps.Map = nil + if hasHTTPDNSFeature && len(user.HttpdnsClusterIdsJSON) > 0 { + var httpdnsClusterIds []int64 + if json.Unmarshal(user.HttpdnsClusterIdsJSON, &httpdnsClusterIds) == nil && len(httpdnsClusterIds) > 0 { + httpdnsClusterResp, httpdnsErr := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.AdminContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if httpdnsErr == nil { + for _, c := range httpdnsClusterResp.GetClusters() { + if c.GetId() == httpdnsClusterIds[0] { + httpdnsClusterMap = maps.Map{ + "id": c.GetId(), + "name": c.GetName(), + } + break + } + } + } + } + } + this.Data["user"] = maps.Map{ "id": user.Id, "username": user.Username, @@ -100,6 +133,7 @@ func (this *UserAction) RunGet(params struct { "mobile": user.Mobile, "isOn": user.IsOn, "cluster": clusterMap, + "httpdnsCluster": httpdnsClusterMap, "countAccessKeys": countAccessKeys, "isRejected": user.IsRejected, "rejectReason": user.RejectReason, diff --git a/EdgeAdmin/internal/web/helpers/menu.go b/EdgeAdmin/internal/web/helpers/menu.go index 5712079..b50237b 100644 --- a/EdgeAdmin/internal/web/helpers/menu.go +++ b/EdgeAdmin/internal/web/helpers/menu.go @@ -137,6 +137,40 @@ func FindAllMenuMaps(langCode string, nodeLogsType string, countUnreadNodeLogs i }, }, }, + { + "code": "httpdns", + "module": configloaders.AdminModuleCodeHttpDNS, + "name": "HTTPDNS", + "subtitle": "", + "icon": "shield alternate", + "subItems": []maps.Map{ + { + "name": "集群管理", + "url": "/httpdns/clusters", + "code": "cluster", + }, + { + "name": "应用管理", + "url": "/httpdns/apps", + "code": "app", + }, + { + "name": "访问日志", + "url": "/httpdns/resolveLogs", + "code": "resolveLogs", + }, + { + "name": "运行日志", + "url": "/httpdns/runtimeLogs", + "code": "runtimeLogs", + }, + { + "name": "解析测试", + "url": "/httpdns/sandbox", + "code": "sandbox", + }, + }, + }, { "code": "users", "module": configloaders.AdminModuleCodeUser, diff --git a/EdgeAdmin/internal/web/helpers/menu_plus.go b/EdgeAdmin/internal/web/helpers/menu_plus.go index 9e40652..a178d61 100644 --- a/EdgeAdmin/internal/web/helpers/menu_plus.go +++ b/EdgeAdmin/internal/web/helpers/menu_plus.go @@ -275,6 +275,40 @@ func FindAllMenuMaps(langCode string, nodeLogsType string, countUnreadNodeLogs i }, }, }, + { + "code": "httpdns", + "module": configloaders.AdminModuleCodeHttpDNS, + "name": "HTTPDNS", + "subtitle": "", + "icon": "shield alternate", + "subItems": []maps.Map{ + { + "name": "集群管理", + "url": "/httpdns/clusters", + "code": "cluster", + }, + { + "name": "应用管理", + "url": "/httpdns/apps", + "code": "app", + }, + { + "name": "访问日志", + "url": "/httpdns/resolveLogs", + "code": "resolveLogs", + }, + { + "name": "运行日志", + "url": "/httpdns/runtimeLogs", + "code": "runtimeLogs", + }, + { + "name": "解析测试", + "url": "/httpdns/sandbox", + "code": "sandbox", + }, + }, + }, { "code": "users", "module": configloaders.AdminModuleCodeUser, @@ -433,3 +467,4 @@ func FindAllMenuMaps(langCode string, nodeLogsType string, countUnreadNodeLogs i }, } } + diff --git a/EdgeAdmin/internal/web/import.go b/EdgeAdmin/internal/web/import.go index 6cd88b9..73167f8 100644 --- a/EdgeAdmin/internal/web/import.go +++ b/EdgeAdmin/internal/web/import.go @@ -136,4 +136,13 @@ import ( // 平台用户 _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/users" + + // HTTPDNS体系 + _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns" + _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/apps" + _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/clusters" + _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/clusters" + _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/resolveLogs" + _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/runtimeLogs" + _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/sandbox" ) diff --git a/EdgeAdmin/test_db.go b/EdgeAdmin/test_db.go new file mode 100644 index 0000000..02ecb46 --- /dev/null +++ b/EdgeAdmin/test_db.go @@ -0,0 +1 @@ +package main; import ("fmt"; "github.com/TeaOSLab/EdgeAPI/internal/db/models"; "github.com/iwind/TeaGo/dbs"; "github.com/iwind/TeaGo/Tea"); func main() { Tea.Env = "prod"; dbs.OnReady(func(){ apps, _ := models.SharedHTTPDNSAppDAO.FindAllEnabledApps(nil); for _, app := range apps { fmt.Printf("App: %s, Primary: %d\n", app.AppId, app.PrimaryClusterId) } }); } diff --git a/EdgeAdmin/test_db2.go b/EdgeAdmin/test_db2.go new file mode 100644 index 0000000..9f26f1c --- /dev/null +++ b/EdgeAdmin/test_db2.go @@ -0,0 +1 @@ +package main; import ("fmt"; "github.com/TeaOSLab/EdgeAPI/internal/db/models"; _ "github.com/go-sql-driver/mysql"; "github.com/iwind/TeaGo/dbs"; "github.com/iwind/TeaGo/Tea"); func main() { Tea.Env = "prod"; dbConfig := &dbs.Config{Driver: "mysql", Dsn: "edge:123456@tcp(127.0.0.1:3306)/edge?charset=utf8mb4&parseTime=true&loc=Local", Prefix: "edge"}; dbs.DefaultDB(dbConfig); apps, _ := models.SharedHTTPDNSAppDAO.FindAllEnabledApps(nil); for _, app := range apps { fmt.Printf("App: %s, Primary: %d\n", app.AppId, app.PrimaryClusterId) } } diff --git a/EdgeAdmin/web/public/js/components.js b/EdgeAdmin/web/public/js/components.js index e5f74f0..e333e92 100644 --- a/EdgeAdmin/web/public/js/components.js +++ b/EdgeAdmin/web/public/js/components.js @@ -531,6 +531,57 @@ Vue.component("ddos-protection-ports-config-box", { ` }) +Vue.component("httpdns-clusters-selector", { + props: ["vClusters", "vName"], + data: function () { + let inputClusters = this.vClusters + let clusters = [] + + if (inputClusters != null && inputClusters.length > 0) { + if (inputClusters[0].isChecked !== undefined) { + // 带 isChecked 标志的完整集群列表 + clusters = inputClusters.map(function (c) { + return {id: c.id, name: c.name, isChecked: c.isChecked} + }) + } else { + // 仅包含已选集群，全部标记为选中 + clusters = inputClusters.map(function (c) { + return {id: c.id, name: c.name, isChecked: true} + }) + } + } + + // 无 prop 时从根实例读取所有集群（如创建应用页面） + if (clusters.length === 0) { + let rootClusters = this.$root.clusters + if (rootClusters != null && rootClusters.length > 0) { + clusters = rootClusters.map(function (c) { + return {id: c.id, name: c.name, isChecked: false} + }) + } + } + + return { + clusters: clusters, + fieldName: this.vName || "clusterIds" + } + }, + methods: { + changeCluster: function (cluster) { + cluster.isChecked = !cluster.isChecked + } + }, + template: `
+
+ + {{cluster.name}} + +
+ 暂无可用集群 +
` +}) + + Vue.component("node-cluster-combo-box", { props: ["v-cluster-id"], data: function () { @@ -21995,15 +22046,16 @@ Vue.component("ssl-certs-box", { {{description}}
-
+
  - |   + |    
` }) + Vue.component("ssl-certs-view", { props: ["v-certs"], data: function () { @@ -22467,12 +22519,16 @@ Vue.component("ssl-config-box", { 选择或上传证书后HTTPSTLS服务才能生效。
-   - |   -   -   - |   - +
+ + | + + + +
diff --git a/EdgeAdmin/web/public/js/components.src.js b/EdgeAdmin/web/public/js/components.src.js index e5f74f0..e333e92 100644 --- a/EdgeAdmin/web/public/js/components.src.js +++ b/EdgeAdmin/web/public/js/components.src.js @@ -531,6 +531,57 @@ Vue.component("ddos-protection-ports-config-box", { ` }) +Vue.component("httpdns-clusters-selector", { + props: ["vClusters", "vName"], + data: function () { + let inputClusters = this.vClusters + let clusters = [] + + if (inputClusters != null && inputClusters.length > 0) { + if (inputClusters[0].isChecked !== undefined) { + // 带 isChecked 标志的完整集群列表 + clusters = inputClusters.map(function (c) { + return {id: c.id, name: c.name, isChecked: c.isChecked} + }) + } else { + // 仅包含已选集群，全部标记为选中 + clusters = inputClusters.map(function (c) { + return {id: c.id, name: c.name, isChecked: true} + }) + } + } + + // 无 prop 时从根实例读取所有集群（如创建应用页面） + if (clusters.length === 0) { + let rootClusters = this.$root.clusters + if (rootClusters != null && rootClusters.length > 0) { + clusters = rootClusters.map(function (c) { + return {id: c.id, name: c.name, isChecked: false} + }) + } + } + + return { + clusters: clusters, + fieldName: this.vName || "clusterIds" + } + }, + methods: { + changeCluster: function (cluster) { + cluster.isChecked = !cluster.isChecked + } + }, + template: `
+
+ + {{cluster.name}} + +
+ 暂无可用集群 +
` +}) + + Vue.component("node-cluster-combo-box", { props: ["v-cluster-id"], data: function () { @@ -21995,15 +22046,16 @@ Vue.component("ssl-certs-box", { {{description}}
-
+
  - |   + |    
` }) + Vue.component("ssl-certs-view", { props: ["v-certs"], data: function () { @@ -22467,12 +22519,16 @@ Vue.component("ssl-config-box", { 选择或上传证书后HTTPSTLS服务才能生效。
-   - |   -   -   - |   - +
+ + | + + + +
diff --git a/EdgeAdmin/web/public/js/components/cluster/httpdns-clusters-selector.js b/EdgeAdmin/web/public/js/components/cluster/httpdns-clusters-selector.js new file mode 100644 index 0000000..fb67aed --- /dev/null +++ b/EdgeAdmin/web/public/js/components/cluster/httpdns-clusters-selector.js @@ -0,0 +1,49 @@ +Vue.component("httpdns-clusters-selector", { + props: ["vClusters", "vName"], + data: function () { + let inputClusters = this.vClusters + let clusters = [] + + if (inputClusters != null && inputClusters.length > 0) { + if (inputClusters[0].isChecked !== undefined) { + // 带 isChecked 标志的完整集群列表 + clusters = inputClusters.map(function (c) { + return {id: c.id, name: c.name, isChecked: c.isChecked} + }) + } else { + // 仅包含已选集群，全部标记为选中 + clusters = inputClusters.map(function (c) { + return {id: c.id, name: c.name, isChecked: true} + }) + } + } + + // 无 prop 时从根实例读取所有集群（如创建应用页面） + if (clusters.length === 0) { + let rootClusters = this.$root.clusters + if (rootClusters != null && rootClusters.length > 0) { + clusters = rootClusters.map(function (c) { + return {id: c.id, name: c.name, isChecked: false} + }) + } + } + + return { + clusters: clusters, + fieldName: this.vName || "clusterIds" + } + }, + methods: { + changeCluster: function (cluster) { + cluster.isChecked = !cluster.isChecked + } + }, + template: `
+
+ + {{cluster.name}} + +
+ 暂无可用集群 +
` +}) diff --git a/EdgeAdmin/web/public/js/components/server/ssl-certs-box.js b/EdgeAdmin/web/public/js/components/server/ssl-certs-box.js index 04846c0..51ac768 100644 --- a/EdgeAdmin/web/public/js/components/server/ssl-certs-box.js +++ b/EdgeAdmin/web/public/js/components/server/ssl-certs-box.js @@ -160,11 +160,11 @@ Vue.component("ssl-certs-box", { {{description}}
-
+
  - |   + |    
` -}) \ No newline at end of file +}) diff --git a/EdgeAdmin/web/public/js/components/server/ssl-config-box.js b/EdgeAdmin/web/public/js/components/server/ssl-config-box.js index e1cf825..786879b 100644 --- a/EdgeAdmin/web/public/js/components/server/ssl-config-box.js +++ b/EdgeAdmin/web/public/js/components/server/ssl-config-box.js @@ -427,12 +427,16 @@ Vue.component("ssl-config-box", { 选择或上传证书后HTTPSTLS服务才能生效。
-   - |   -   -   - |   - +
+ + | + + + +
diff --git a/EdgeAdmin/web/public/js/sweetalert2/dist/sweetalert2.css b/EdgeAdmin/web/public/js/sweetalert2/dist/sweetalert2.css index 380c5b1..5527431 100644 --- a/EdgeAdmin/web/public/js/sweetalert2/dist/sweetalert2.css +++ b/EdgeAdmin/web/public/js/sweetalert2/dist/sweetalert2.css @@ -7,78 +7,96 @@ background: #fff; box-shadow: 0 0 0.625em #d9d9d9; } + .swal2-popup.swal2-toast .swal2-header { flex-direction: row; } + .swal2-popup.swal2-toast .swal2-title { flex-grow: 1; justify-content: flex-start; margin: 0 0.6em; font-size: 1em; } + .swal2-popup.swal2-toast .swal2-footer { margin: 0.5em 0 0; padding: 0.5em 0 0; font-size: 0.8em; } + .swal2-popup.swal2-toast .swal2-close { position: static; width: 0.8em; height: 0.8em; line-height: 0.8; } + .swal2-popup.swal2-toast .swal2-content { justify-content: flex-start; font-size: 1em; } + .swal2-popup.swal2-toast .swal2-icon { width: 2em; min-width: 2em; height: 2em; margin: 0; } + .swal2-popup.swal2-toast .swal2-icon .swal2-icon-content { display: flex; align-items: center; font-size: 1.8em; font-weight: bold; } -@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) { + +@media all and (-ms-high-contrast: none), +(-ms-high-contrast: active) { .swal2-popup.swal2-toast .swal2-icon .swal2-icon-content { font-size: 0.25em; } } + .swal2-popup.swal2-toast .swal2-icon.swal2-success .swal2-success-ring { width: 2em; height: 2em; } + .swal2-popup.swal2-toast .swal2-icon.swal2-error [class^=swal2-x-mark-line] { top: 0.875em; width: 1.375em; } + .swal2-popup.swal2-toast .swal2-icon.swal2-error [class^=swal2-x-mark-line][class$=left] { left: 0.3125em; } + .swal2-popup.swal2-toast .swal2-icon.swal2-error [class^=swal2-x-mark-line][class$=right] { right: 0.3125em; } + .swal2-popup.swal2-toast .swal2-actions { flex-basis: auto !important; width: auto; height: auto; margin: 0 0.3125em; } + .swal2-popup.swal2-toast .swal2-styled { margin: 0 0.3125em; padding: 0.3125em 0.625em; font-size: 1em; } + .swal2-popup.swal2-toast .swal2-styled:focus { box-shadow: 0 0 0 1px #fff, 0 0 0 3px rgba(50, 100, 150, 0.4); } + .swal2-popup.swal2-toast .swal2-success { border-color: #a5dc86; } + .swal2-popup.swal2-toast .swal2-success [class^=swal2-success-circular-line] { position: absolute; width: 1.6em; @@ -86,6 +104,7 @@ transform: rotate(45deg); border-radius: 50%; } + .swal2-popup.swal2-toast .swal2-success [class^=swal2-success-circular-line][class$=left] { top: -0.8em; left: -0.5em; @@ -93,50 +112,60 @@ transform-origin: 2em 2em; border-radius: 4em 0 0 4em; } + .swal2-popup.swal2-toast .swal2-success [class^=swal2-success-circular-line][class$=right] { top: -0.25em; left: 0.9375em; transform-origin: 0 1.5em; border-radius: 0 4em 4em 0; } + .swal2-popup.swal2-toast .swal2-success .swal2-success-ring { width: 2em; height: 2em; } + .swal2-popup.swal2-toast .swal2-success .swal2-success-fix { top: 0; left: 0.4375em; width: 0.4375em; height: 2.6875em; } + .swal2-popup.swal2-toast .swal2-success [class^=swal2-success-line] { height: 0.3125em; } + .swal2-popup.swal2-toast .swal2-success [class^=swal2-success-line][class$=tip] { top: 1.125em; left: 0.1875em; width: 0.75em; } + .swal2-popup.swal2-toast .swal2-success [class^=swal2-success-line][class$=long] { top: 0.9375em; right: 0.1875em; width: 1.375em; } + .swal2-popup.swal2-toast .swal2-success.swal2-icon-show .swal2-success-line-tip { -webkit-animation: swal2-toast-animate-success-line-tip 0.75s; - animation: swal2-toast-animate-success-line-tip 0.75s; + animation: swal2-toast-animate-success-line-tip 0.75s; } + .swal2-popup.swal2-toast .swal2-success.swal2-icon-show .swal2-success-line-long { -webkit-animation: swal2-toast-animate-success-line-long 0.75s; - animation: swal2-toast-animate-success-line-long 0.75s; + animation: swal2-toast-animate-success-line-long 0.75s; } + .swal2-popup.swal2-toast.swal2-show { -webkit-animation: swal2-toast-show 0.5s; - animation: swal2-toast-show 0.5s; + animation: swal2-toast-show 0.5s; } + .swal2-popup.swal2-toast.swal2-hide { -webkit-animation: swal2-toast-hide 0.1s forwards; - animation: swal2-toast-hide 0.1s forwards; + animation: swal2-toast-hide 0.1s forwards; } .swal2-container { @@ -155,86 +184,131 @@ transition: background-color 0.1s; -webkit-overflow-scrolling: touch; } + .swal2-container.swal2-backdrop-show { background: rgba(0, 0, 0, 0.4); } + .swal2-container.swal2-backdrop-hide { background: transparent !important; } + .swal2-container.swal2-top { align-items: flex-start; } -.swal2-container.swal2-top-start, .swal2-container.swal2-top-left { + +.swal2-container.swal2-top-start, +.swal2-container.swal2-top-left { align-items: flex-start; justify-content: flex-start; } -.swal2-container.swal2-top-end, .swal2-container.swal2-top-right { + +.swal2-container.swal2-top-end, +.swal2-container.swal2-top-right { align-items: flex-start; justify-content: flex-end; } + .swal2-container.swal2-center { align-items: center; } -.swal2-container.swal2-center-start, .swal2-container.swal2-center-left { + +.swal2-container.swal2-center-start, +.swal2-container.swal2-center-left { align-items: center; justify-content: flex-start; } -.swal2-container.swal2-center-end, .swal2-container.swal2-center-right { + +.swal2-container.swal2-center-end, +.swal2-container.swal2-center-right { align-items: center; justify-content: flex-end; } + .swal2-container.swal2-bottom { align-items: flex-end; } -.swal2-container.swal2-bottom-start, .swal2-container.swal2-bottom-left { + +.swal2-container.swal2-bottom-start, +.swal2-container.swal2-bottom-left { align-items: flex-end; justify-content: flex-start; } -.swal2-container.swal2-bottom-end, .swal2-container.swal2-bottom-right { + +.swal2-container.swal2-bottom-end, +.swal2-container.swal2-bottom-right { align-items: flex-end; justify-content: flex-end; } -.swal2-container.swal2-bottom > :first-child, .swal2-container.swal2-bottom-start > :first-child, .swal2-container.swal2-bottom-left > :first-child, .swal2-container.swal2-bottom-end > :first-child, .swal2-container.swal2-bottom-right > :first-child { + +.swal2-container.swal2-bottom> :first-child, +.swal2-container.swal2-bottom-start> :first-child, +.swal2-container.swal2-bottom-left> :first-child, +.swal2-container.swal2-bottom-end> :first-child, +.swal2-container.swal2-bottom-right> :first-child { margin-top: auto; } -.swal2-container.swal2-grow-fullscreen > .swal2-modal { + +.swal2-container.swal2-grow-fullscreen>.swal2-modal { display: flex !important; flex: 1; align-self: stretch; justify-content: center; } -.swal2-container.swal2-grow-row > .swal2-modal { + +.swal2-container.swal2-grow-row>.swal2-modal { display: flex !important; flex: 1; align-content: center; justify-content: center; } + .swal2-container.swal2-grow-column { flex: 1; flex-direction: column; } -.swal2-container.swal2-grow-column.swal2-top, .swal2-container.swal2-grow-column.swal2-center, .swal2-container.swal2-grow-column.swal2-bottom { + +.swal2-container.swal2-grow-column.swal2-top, +.swal2-container.swal2-grow-column.swal2-center, +.swal2-container.swal2-grow-column.swal2-bottom { align-items: center; } -.swal2-container.swal2-grow-column.swal2-top-start, .swal2-container.swal2-grow-column.swal2-center-start, .swal2-container.swal2-grow-column.swal2-bottom-start, .swal2-container.swal2-grow-column.swal2-top-left, .swal2-container.swal2-grow-column.swal2-center-left, .swal2-container.swal2-grow-column.swal2-bottom-left { + +.swal2-container.swal2-grow-column.swal2-top-start, +.swal2-container.swal2-grow-column.swal2-center-start, +.swal2-container.swal2-grow-column.swal2-bottom-start, +.swal2-container.swal2-grow-column.swal2-top-left, +.swal2-container.swal2-grow-column.swal2-center-left, +.swal2-container.swal2-grow-column.swal2-bottom-left { align-items: flex-start; } -.swal2-container.swal2-grow-column.swal2-top-end, .swal2-container.swal2-grow-column.swal2-center-end, .swal2-container.swal2-grow-column.swal2-bottom-end, .swal2-container.swal2-grow-column.swal2-top-right, .swal2-container.swal2-grow-column.swal2-center-right, .swal2-container.swal2-grow-column.swal2-bottom-right { + +.swal2-container.swal2-grow-column.swal2-top-end, +.swal2-container.swal2-grow-column.swal2-center-end, +.swal2-container.swal2-grow-column.swal2-bottom-end, +.swal2-container.swal2-grow-column.swal2-top-right, +.swal2-container.swal2-grow-column.swal2-center-right, +.swal2-container.swal2-grow-column.swal2-bottom-right { align-items: flex-end; } -.swal2-container.swal2-grow-column > .swal2-modal { + +.swal2-container.swal2-grow-column>.swal2-modal { display: flex !important; flex: 1; align-content: center; justify-content: center; } + .swal2-container.swal2-no-transition { transition: none !important; } -.swal2-container:not(.swal2-top):not(.swal2-top-start):not(.swal2-top-end):not(.swal2-top-left):not(.swal2-top-right):not(.swal2-center-start):not(.swal2-center-end):not(.swal2-center-left):not(.swal2-center-right):not(.swal2-bottom):not(.swal2-bottom-start):not(.swal2-bottom-end):not(.swal2-bottom-left):not(.swal2-bottom-right):not(.swal2-grow-fullscreen) > .swal2-modal { + +.swal2-container:not(.swal2-top):not(.swal2-top-start):not(.swal2-top-end):not(.swal2-top-left):not(.swal2-top-right):not(.swal2-center-start):not(.swal2-center-end):not(.swal2-center-left):not(.swal2-center-right):not(.swal2-bottom):not(.swal2-bottom-start):not(.swal2-bottom-end):not(.swal2-bottom-left):not(.swal2-bottom-right):not(.swal2-grow-fullscreen)>.swal2-modal { margin: auto; } -@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) { + +@media all and (-ms-high-contrast: none), +(-ms-high-contrast: active) { .swal2-container .swal2-modal { margin: 0 !important; } @@ -255,9 +329,11 @@ font-family: inherit; font-size: 1rem; } + .swal2-popup:focus { outline: none; } + .swal2-popup.swal2-loading { overflow-y: hidden; } @@ -290,15 +366,19 @@ width: 100%; margin: 1.25em auto 0; } + .swal2-actions:not(.swal2-loading) .swal2-styled[disabled] { opacity: 0.4; } + .swal2-actions:not(.swal2-loading) .swal2-styled:hover { background-image: linear-gradient(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1)); } + .swal2-actions:not(.swal2-loading) .swal2-styled:active { background-image: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)); } + .swal2-actions.swal2-loading .swal2-styled.swal2-confirm { box-sizing: border-box; width: 2.5em; @@ -306,7 +386,7 @@ margin: 0.46875em; padding: 0; -webkit-animation: swal2-rotate-loading 1.5s linear 0s infinite normal; - animation: swal2-rotate-loading 1.5s linear 0s infinite normal; + animation: swal2-rotate-loading 1.5s linear 0s infinite normal; border: 0.25em solid transparent; border-radius: 100%; border-color: transparent; @@ -314,14 +394,16 @@ color: transparent; cursor: default; -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + .swal2-actions.swal2-loading .swal2-styled.swal2-cancel { margin-right: 30px; margin-left: 30px; } + .swal2-actions.swal2-loading :not(.swal2-styled).swal2-confirm::after { content: ""; display: inline-block; @@ -329,7 +411,7 @@ height: 15px; margin-left: 5px; -webkit-animation: swal2-rotate-loading 1.5s linear 0s infinite normal; - animation: swal2-rotate-loading 1.5s linear 0s infinite normal; + animation: swal2-rotate-loading 1.5s linear 0s infinite normal; border: 3px solid #999999; border-radius: 50%; border-right-color: transparent; @@ -342,9 +424,11 @@ box-shadow: none; font-weight: 500; } + .swal2-styled:not([disabled]) { cursor: pointer; } + .swal2-styled.swal2-confirm { border: 0; border-radius: 0.25em; @@ -353,6 +437,7 @@ color: #fff; font-size: 1.0625em; } + .swal2-styled.swal2-cancel { border: 0; border-radius: 0.25em; @@ -361,10 +446,12 @@ color: #fff; font-size: 1.0625em; } + .swal2-styled:focus { outline: none; box-shadow: 0 0 0 1px #fff, 0 0 0 3px rgba(50, 100, 150, 0.4); } + .swal2-styled::-moz-focus-inner { border: 0; } @@ -423,11 +510,13 @@ line-height: 1.2; cursor: pointer; } + .swal2-close:hover { transform: none; background: transparent; color: #f27474; } + .swal2-close::-moz-focus-inner { border: 0; } @@ -467,12 +556,14 @@ color: inherit; font-size: 1.125em; } + .swal2-input.swal2-inputerror, .swal2-file.swal2-inputerror, .swal2-textarea.swal2-inputerror { border-color: #f27474 !important; box-shadow: 0 0 2px #f27474 !important; } + .swal2-input:focus, .swal2-file:focus, .swal2-textarea:focus { @@ -480,18 +571,31 @@ outline: none; box-shadow: 0 0 3px #c4e6f5; } -.swal2-input::-webkit-input-placeholder, .swal2-file::-webkit-input-placeholder, .swal2-textarea::-webkit-input-placeholder { + +.swal2-input::-webkit-input-placeholder, +.swal2-file::-webkit-input-placeholder, +.swal2-textarea::-webkit-input-placeholder { color: #cccccc; } -.swal2-input::-moz-placeholder, .swal2-file::-moz-placeholder, .swal2-textarea::-moz-placeholder { + +.swal2-input::-moz-placeholder, +.swal2-file::-moz-placeholder, +.swal2-textarea::-moz-placeholder { color: #cccccc; } -.swal2-input:-ms-input-placeholder, .swal2-file:-ms-input-placeholder, .swal2-textarea:-ms-input-placeholder { + +.swal2-input:-ms-input-placeholder, +.swal2-file:-ms-input-placeholder, +.swal2-textarea:-ms-input-placeholder { color: #cccccc; } -.swal2-input::-ms-input-placeholder, .swal2-file::-ms-input-placeholder, .swal2-textarea::-ms-input-placeholder { + +.swal2-input::-ms-input-placeholder, +.swal2-file::-ms-input-placeholder, +.swal2-textarea::-ms-input-placeholder { color: #cccccc; } + .swal2-input::placeholder, .swal2-file::placeholder, .swal2-textarea::placeholder { @@ -502,15 +606,18 @@ margin: 1em auto; background: #fff; } + .swal2-range input { width: 80%; } + .swal2-range output { width: 20%; color: inherit; font-weight: 600; text-align: center; } + .swal2-range input, .swal2-range output { height: 2.625em; @@ -523,6 +630,7 @@ height: 2.625em; padding: 0 0.75em; } + .swal2-input[type=number] { max-width: 10em; } @@ -553,11 +661,13 @@ background: #fff; color: inherit; } + .swal2-radio label, .swal2-checkbox label { margin: 0 0.6em; font-size: 1.125em; } + .swal2-radio input, .swal2-checkbox input { margin: 0 0.4em; @@ -574,6 +684,7 @@ font-size: 1em; font-weight: 300; } + .swal2-validation-message::before { content: "!"; display: inline-block; @@ -602,23 +713,27 @@ line-height: 5em; cursor: default; -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + .swal2-icon .swal2-icon-content { display: flex; align-items: center; font-size: 3.75em; } + .swal2-icon.swal2-error { border-color: #f27474; color: #f27474; } + .swal2-icon.swal2-error .swal2-x-mark { position: relative; flex-grow: 1; } + .swal2-icon.swal2-error [class^=swal2-x-mark-line] { display: block; position: absolute; @@ -628,38 +743,47 @@ border-radius: 0.125em; background-color: #f27474; } + .swal2-icon.swal2-error [class^=swal2-x-mark-line][class$=left] { left: 1.0625em; transform: rotate(45deg); } + .swal2-icon.swal2-error [class^=swal2-x-mark-line][class$=right] { right: 1em; transform: rotate(-45deg); } + .swal2-icon.swal2-error.swal2-icon-show { -webkit-animation: swal2-animate-error-icon 0.5s; - animation: swal2-animate-error-icon 0.5s; + animation: swal2-animate-error-icon 0.5s; } + .swal2-icon.swal2-error.swal2-icon-show .swal2-x-mark { -webkit-animation: swal2-animate-error-x-mark 0.5s; - animation: swal2-animate-error-x-mark 0.5s; + animation: swal2-animate-error-x-mark 0.5s; } + .swal2-icon.swal2-warning { border-color: #facea8; color: #f8bb86; } + .swal2-icon.swal2-info { border-color: #9de0f6; color: #3fc3ee; } + .swal2-icon.swal2-question { border-color: #c9dae1; color: #87adbd; } + .swal2-icon.swal2-success { border-color: #a5dc86; color: #a5dc86; } + .swal2-icon.swal2-success [class^=swal2-success-circular-line] { position: absolute; width: 3.75em; @@ -667,6 +791,7 @@ transform: rotate(45deg); border-radius: 50%; } + .swal2-icon.swal2-success [class^=swal2-success-circular-line][class$=left] { top: -0.4375em; left: -2.0635em; @@ -674,6 +799,7 @@ transform-origin: 3.75em 3.75em; border-radius: 7.5em 0 0 7.5em; } + .swal2-icon.swal2-success [class^=swal2-success-circular-line][class$=right] { top: -0.6875em; left: 1.875em; @@ -681,6 +807,7 @@ transform-origin: 0 3.75em; border-radius: 0 7.5em 7.5em 0; } + .swal2-icon.swal2-success .swal2-success-ring { position: absolute; z-index: 2; @@ -692,6 +819,7 @@ border: 0.25em solid rgba(165, 220, 134, 0.3); border-radius: 50%; } + .swal2-icon.swal2-success .swal2-success-fix { position: absolute; z-index: 1; @@ -701,6 +829,7 @@ height: 5.625em; transform: rotate(-45deg); } + .swal2-icon.swal2-success [class^=swal2-success-line] { display: block; position: absolute; @@ -709,29 +838,34 @@ border-radius: 0.125em; background-color: #a5dc86; } + .swal2-icon.swal2-success [class^=swal2-success-line][class$=tip] { top: 2.875em; left: 0.8125em; width: 1.5625em; transform: rotate(45deg); } + .swal2-icon.swal2-success [class^=swal2-success-line][class$=long] { top: 2.375em; right: 0.5em; width: 2.9375em; transform: rotate(-45deg); } + .swal2-icon.swal2-success.swal2-icon-show .swal2-success-line-tip { -webkit-animation: swal2-animate-success-line-tip 0.75s; - animation: swal2-animate-success-line-tip 0.75s; + animation: swal2-animate-success-line-tip 0.75s; } + .swal2-icon.swal2-success.swal2-icon-show .swal2-success-line-long { -webkit-animation: swal2-animate-success-line-long 0.75s; - animation: swal2-animate-success-line-long 0.75s; + animation: swal2-animate-success-line-long 0.75s; } + .swal2-icon.swal2-success.swal2-icon-show .swal2-success-circular-line-right { -webkit-animation: swal2-rotate-success-circular-line 4.25s ease-in; - animation: swal2-rotate-success-circular-line 4.25s ease-in; + animation: swal2-rotate-success-circular-line 4.25s ease-in; } .swal2-progress-steps { @@ -741,10 +875,12 @@ background: inherit; font-weight: 600; } + .swal2-progress-steps li { display: inline-block; position: relative; } + .swal2-progress-steps .swal2-progress-step { z-index: 20; width: 2em; @@ -755,16 +891,20 @@ line-height: 2em; text-align: center; } + .swal2-progress-steps .swal2-progress-step.swal2-active-progress-step { background: #3085d6; } -.swal2-progress-steps .swal2-progress-step.swal2-active-progress-step ~ .swal2-progress-step { + +.swal2-progress-steps .swal2-progress-step.swal2-active-progress-step~.swal2-progress-step { background: #add8e6; color: #fff; } -.swal2-progress-steps .swal2-progress-step.swal2-active-progress-step ~ .swal2-progress-step-line { + +.swal2-progress-steps .swal2-progress-step.swal2-active-progress-step~.swal2-progress-step-line { background: #add8e6; } + .swal2-progress-steps .swal2-progress-step-line { z-index: 10; width: 2.5em; @@ -779,12 +919,12 @@ .swal2-show { -webkit-animation: swal2-show 0.3s; - animation: swal2-show 0.3s; + animation: swal2-show 0.3s; } .swal2-hide { -webkit-animation: swal2-hide 0.15s forwards; - animation: swal2-hide 0.15s forwards; + animation: swal2-hide 0.15s forwards; } .swal2-noanimation { @@ -803,6 +943,7 @@ right: auto; left: 0; } + .swal2-rtl .swal2-timer-progress-bar { right: 0; left: auto; @@ -812,419 +953,509 @@ .swal2-range input { width: 100% !important; } + .swal2-range output { display: none; } } -@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) { + +@media all and (-ms-high-contrast: none), +(-ms-high-contrast: active) { .swal2-range input { width: 100% !important; } + .swal2-range output { display: none; } } + @-moz-document url-prefix() { .swal2-close:focus { outline: 2px solid rgba(50, 100, 150, 0.4); } } + @-webkit-keyframes swal2-toast-show { 0% { transform: translateY(-0.625em) rotateZ(2deg); } + 33% { transform: translateY(0) rotateZ(-2deg); } + 66% { transform: translateY(0.3125em) rotateZ(2deg); } + 100% { transform: translateY(0) rotateZ(0deg); } } + @keyframes swal2-toast-show { 0% { transform: translateY(-0.625em) rotateZ(2deg); } + 33% { transform: translateY(0) rotateZ(-2deg); } + 66% { transform: translateY(0.3125em) rotateZ(2deg); } + 100% { transform: translateY(0) rotateZ(0deg); } } + @-webkit-keyframes swal2-toast-hide { 100% { transform: rotateZ(1deg); opacity: 0; } } + @keyframes swal2-toast-hide { 100% { transform: rotateZ(1deg); opacity: 0; } } + @-webkit-keyframes swal2-toast-animate-success-line-tip { 0% { top: 0.5625em; left: 0.0625em; width: 0; } + 54% { top: 0.125em; left: 0.125em; width: 0; } + 70% { top: 0.625em; left: -0.25em; width: 1.625em; } + 84% { top: 1.0625em; left: 0.75em; width: 0.5em; } + 100% { top: 1.125em; left: 0.1875em; width: 0.75em; } } + @keyframes swal2-toast-animate-success-line-tip { 0% { top: 0.5625em; left: 0.0625em; width: 0; } + 54% { top: 0.125em; left: 0.125em; width: 0; } + 70% { top: 0.625em; left: -0.25em; width: 1.625em; } + 84% { top: 1.0625em; left: 0.75em; width: 0.5em; } + 100% { top: 1.125em; left: 0.1875em; width: 0.75em; } } + @-webkit-keyframes swal2-toast-animate-success-line-long { 0% { top: 1.625em; right: 1.375em; width: 0; } + 65% { top: 1.25em; right: 0.9375em; width: 0; } + 84% { top: 0.9375em; right: 0; width: 1.125em; } + 100% { top: 0.9375em; right: 0.1875em; width: 1.375em; } } + @keyframes swal2-toast-animate-success-line-long { 0% { top: 1.625em; right: 1.375em; width: 0; } + 65% { top: 1.25em; right: 0.9375em; width: 0; } + 84% { top: 0.9375em; right: 0; width: 1.125em; } + 100% { top: 0.9375em; right: 0.1875em; width: 1.375em; } } + @-webkit-keyframes swal2-show { 0% { transform: scale(0.7); } + 45% { transform: scale(1.05); } + 80% { transform: scale(0.95); } + 100% { transform: scale(1); } } + @keyframes swal2-show { 0% { transform: scale(0.7); } + 45% { transform: scale(1.05); } + 80% { transform: scale(0.95); } + 100% { transform: scale(1); } } + @-webkit-keyframes swal2-hide { 0% { transform: scale(1); opacity: 1; } + 100% { transform: scale(0.5); opacity: 0; } } + @keyframes swal2-hide { 0% { transform: scale(1); opacity: 1; } + 100% { transform: scale(0.5); opacity: 0; } } + @-webkit-keyframes swal2-animate-success-line-tip { 0% { top: 1.1875em; left: 0.0625em; width: 0; } + 54% { top: 1.0625em; left: 0.125em; width: 0; } + 70% { top: 2.1875em; left: -0.375em; width: 3.125em; } + 84% { top: 3em; left: 1.3125em; width: 1.0625em; } + 100% { top: 2.8125em; left: 0.8125em; width: 1.5625em; } } + @keyframes swal2-animate-success-line-tip { 0% { top: 1.1875em; left: 0.0625em; width: 0; } + 54% { top: 1.0625em; left: 0.125em; width: 0; } + 70% { top: 2.1875em; left: -0.375em; width: 3.125em; } + 84% { top: 3em; left: 1.3125em; width: 1.0625em; } + 100% { top: 2.8125em; left: 0.8125em; width: 1.5625em; } } + @-webkit-keyframes swal2-animate-success-line-long { 0% { top: 3.375em; right: 2.875em; width: 0; } + 65% { top: 3.375em; right: 2.875em; width: 0; } + 84% { top: 2.1875em; right: 0; width: 3.4375em; } + 100% { top: 2.375em; right: 0.5em; width: 2.9375em; } } + @keyframes swal2-animate-success-line-long { 0% { top: 3.375em; right: 2.875em; width: 0; } + 65% { top: 3.375em; right: 2.875em; width: 0; } + 84% { top: 2.1875em; right: 0; width: 3.4375em; } + 100% { top: 2.375em; right: 0.5em; width: 2.9375em; } } + @-webkit-keyframes swal2-rotate-success-circular-line { 0% { transform: rotate(-45deg); } + 5% { transform: rotate(-45deg); } + 12% { transform: rotate(-405deg); } + 100% { transform: rotate(-405deg); } } + @keyframes swal2-rotate-success-circular-line { 0% { transform: rotate(-45deg); } + 5% { transform: rotate(-45deg); } + 12% { transform: rotate(-405deg); } + 100% { transform: rotate(-405deg); } } + @-webkit-keyframes swal2-animate-error-x-mark { 0% { margin-top: 1.625em; transform: scale(0.4); opacity: 0; } + 50% { margin-top: 1.625em; transform: scale(0.4); opacity: 0; } + 80% { margin-top: -0.375em; transform: scale(1.15); } + 100% { margin-top: 0; transform: scale(1); opacity: 1; } } + @keyframes swal2-animate-error-x-mark { 0% { margin-top: 1.625em; transform: scale(0.4); opacity: 0; } + 50% { margin-top: 1.625em; transform: scale(0.4); opacity: 0; } + 80% { margin-top: -0.375em; transform: scale(1.15); } + 100% { margin-top: 0; transform: scale(1); opacity: 1; } } + @-webkit-keyframes swal2-animate-error-icon { 0% { transform: rotateX(100deg); opacity: 0; } + 100% { transform: rotateX(0deg); opacity: 1; } } + @keyframes swal2-animate-error-icon { 0% { transform: rotateX(100deg); opacity: 0; } + 100% { transform: rotateX(0deg); opacity: 1; } } + @-webkit-keyframes swal2-rotate-loading { 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } } + @keyframes swal2-rotate-loading { 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } } + body.swal2-shown:not(.swal2-no-backdrop):not(.swal2-toast-shown) { overflow: hidden; } + body.swal2-height-auto { height: auto !important; } + body.swal2-no-backdrop .swal2-container { top: auto; right: auto; @@ -1233,64 +1464,85 @@ body.swal2-no-backdrop .swal2-container { max-width: calc(100% - 0.625em * 2); background-color: transparent !important; } -body.swal2-no-backdrop .swal2-container > .swal2-modal { + +body.swal2-no-backdrop .swal2-container>.swal2-modal { box-shadow: 0 0 10px rgba(0, 0, 0, 0.4); } + body.swal2-no-backdrop .swal2-container.swal2-top { top: 0; left: 50%; transform: translateX(-50%); } -body.swal2-no-backdrop .swal2-container.swal2-top-start, body.swal2-no-backdrop .swal2-container.swal2-top-left { + +body.swal2-no-backdrop .swal2-container.swal2-top-start, +body.swal2-no-backdrop .swal2-container.swal2-top-left { top: 0; left: 0; } -body.swal2-no-backdrop .swal2-container.swal2-top-end, body.swal2-no-backdrop .swal2-container.swal2-top-right { + +body.swal2-no-backdrop .swal2-container.swal2-top-end, +body.swal2-no-backdrop .swal2-container.swal2-top-right { top: 0; right: 0; } + body.swal2-no-backdrop .swal2-container.swal2-center { top: 50%; left: 50%; transform: translate(-50%, -50%); } -body.swal2-no-backdrop .swal2-container.swal2-center-start, body.swal2-no-backdrop .swal2-container.swal2-center-left { + +body.swal2-no-backdrop .swal2-container.swal2-center-start, +body.swal2-no-backdrop .swal2-container.swal2-center-left { top: 50%; left: 0; transform: translateY(-50%); } -body.swal2-no-backdrop .swal2-container.swal2-center-end, body.swal2-no-backdrop .swal2-container.swal2-center-right { + +body.swal2-no-backdrop .swal2-container.swal2-center-end, +body.swal2-no-backdrop .swal2-container.swal2-center-right { top: 50%; right: 0; transform: translateY(-50%); } + body.swal2-no-backdrop .swal2-container.swal2-bottom { bottom: 0; left: 50%; transform: translateX(-50%); } -body.swal2-no-backdrop .swal2-container.swal2-bottom-start, body.swal2-no-backdrop .swal2-container.swal2-bottom-left { + +body.swal2-no-backdrop .swal2-container.swal2-bottom-start, +body.swal2-no-backdrop .swal2-container.swal2-bottom-left { bottom: 0; left: 0; } -body.swal2-no-backdrop .swal2-container.swal2-bottom-end, body.swal2-no-backdrop .swal2-container.swal2-bottom-right { + +body.swal2-no-backdrop .swal2-container.swal2-bottom-end, +body.swal2-no-backdrop .swal2-container.swal2-bottom-right { right: 0; bottom: 0; } + @media print { body.swal2-shown:not(.swal2-no-backdrop):not(.swal2-toast-shown) { overflow-y: scroll !important; } - body.swal2-shown:not(.swal2-no-backdrop):not(.swal2-toast-shown) > [aria-hidden=true] { + + body.swal2-shown:not(.swal2-no-backdrop):not(.swal2-toast-shown)>[aria-hidden=true] { display: none; } + body.swal2-shown:not(.swal2-no-backdrop):not(.swal2-toast-shown) .swal2-container { position: static !important; } } + body.swal2-toast-shown .swal2-container { background-color: transparent; } + body.swal2-toast-shown .swal2-container.swal2-top { top: 0; right: auto; @@ -1298,25 +1550,32 @@ body.swal2-toast-shown .swal2-container.swal2-top { left: 50%; transform: translateX(-50%); } -body.swal2-toast-shown .swal2-container.swal2-top-end, body.swal2-toast-shown .swal2-container.swal2-top-right { + +body.swal2-toast-shown .swal2-container.swal2-top-end, +body.swal2-toast-shown .swal2-container.swal2-top-right { top: 0; right: 0; bottom: auto; left: auto; } -body.swal2-toast-shown .swal2-container.swal2-top-start, body.swal2-toast-shown .swal2-container.swal2-top-left { + +body.swal2-toast-shown .swal2-container.swal2-top-start, +body.swal2-toast-shown .swal2-container.swal2-top-left { top: 0; right: auto; bottom: auto; left: 0; } -body.swal2-toast-shown .swal2-container.swal2-center-start, body.swal2-toast-shown .swal2-container.swal2-center-left { + +body.swal2-toast-shown .swal2-container.swal2-center-start, +body.swal2-toast-shown .swal2-container.swal2-center-left { top: 50%; right: auto; bottom: auto; left: 0; transform: translateY(-50%); } + body.swal2-toast-shown .swal2-container.swal2-center { top: 50%; right: auto; @@ -1324,19 +1583,24 @@ body.swal2-toast-shown .swal2-container.swal2-center { left: 50%; transform: translate(-50%, -50%); } -body.swal2-toast-shown .swal2-container.swal2-center-end, body.swal2-toast-shown .swal2-container.swal2-center-right { + +body.swal2-toast-shown .swal2-container.swal2-center-end, +body.swal2-toast-shown .swal2-container.swal2-center-right { top: 50%; right: 0; bottom: auto; left: auto; transform: translateY(-50%); } -body.swal2-toast-shown .swal2-container.swal2-bottom-start, body.swal2-toast-shown .swal2-container.swal2-bottom-left { + +body.swal2-toast-shown .swal2-container.swal2-bottom-start, +body.swal2-toast-shown .swal2-container.swal2-bottom-left { top: auto; right: auto; bottom: 0; left: 0; } + body.swal2-toast-shown .swal2-container.swal2-bottom { top: auto; right: auto; @@ -1344,30 +1608,37 @@ body.swal2-toast-shown .swal2-container.swal2-bottom { left: 50%; transform: translateX(-50%); } -body.swal2-toast-shown .swal2-container.swal2-bottom-end, body.swal2-toast-shown .swal2-container.swal2-bottom-right { + +body.swal2-toast-shown .swal2-container.swal2-bottom-end, +body.swal2-toast-shown .swal2-container.swal2-bottom-right { top: auto; right: 0; bottom: 0; left: auto; } + body.swal2-toast-column .swal2-toast { flex-direction: column; align-items: stretch; } + body.swal2-toast-column .swal2-toast .swal2-actions { flex: 1; align-self: stretch; height: 2.2em; margin-top: 0.3125em; } + body.swal2-toast-column .swal2-toast .swal2-loading { justify-content: center; } + body.swal2-toast-column .swal2-toast .swal2-input { height: 2em; margin: 0.3125em auto; font-size: 1em; } + body.swal2-toast-column .swal2-toast .swal2-validation-message { font-size: 1em; } \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/@layout.css b/EdgeAdmin/web/views/@default/@layout.css index 2109f21..66b2498 100644 --- a/EdgeAdmin/web/views/@default/@layout.css +++ b/EdgeAdmin/web/views/@default/@layout.css @@ -7,20 +7,24 @@ overflow-x: hidden; border-right: 1px #ddd solid; } + .left-box .menu { width: 95% !important; } + .left-box .menu .item { line-height: 1.2; position: relative; padding-left: 1em !important; } + .left-box .menu .item .icon { position: absolute; top: 50%; left: 0; margin-top: -0.4em !important; } + .left-box .menu .item.separator { border-bottom: 1px #eee solid !important; padding-top: 0; @@ -28,9 +32,11 @@ margin-top: 0 !important; margin-bottom: 0 !important; } + .left-box .menu .item.on span { border-bottom: 1px #666 dashed; } + .left-box .menu .item.off span var { font-style: normal; background: #db2828; @@ -40,33 +46,42 @@ border-radius: 2px; margin-left: 1em; } + .left-box .menu .item.active { background: rgba(230, 230, 230, 0.35) !important; border-radius: 3px; } + .left-box .menu .header { border-bottom: 1px #ddd solid; padding-left: 0 !important; padding-bottom: 1em !important; } + .left-box::-webkit-scrollbar { width: 4px; } + .left-box.disabled { opacity: 0.1; } + .left-box.tiny { top: 10em; } + .left-box.without-tabbar { top: 3em; } + .left-box.with-menu { top: 8.7em; } + .left-box.without-menu { top: 6em; } + .right-box { position: fixed; top: 7em; @@ -77,47 +92,60 @@ padding-bottom: 2em; overflow-y: auto; } + .right-box h4:first-child { margin-top: 1em; } -.right-box > .comment:first-child { + +.right-box>.comment:first-child { margin-top: 0.5em; } + @media screen and (max-width: 512px) { .right-box { left: 13em; padding-right: 1em; } } + body.expanded .right-box { left: 10em; } + .right-box.tiny { top: 10em; left: 26.5em; } + .right-box::-webkit-scrollbar { width: 4px; } + .right-box.without-tabbar { top: 3em; } + .right-box.with-menu { top: 8.6em; } + .right-box.without-menu { top: 6em; } + .main.without-footer .left-box { bottom: 0.2em; } + .narrow-scrollbar::-webkit-scrollbar { width: 4px; } + .grid.counter-chart { margin-top: 1em !important; margin-left: 0.4em !important; } + .grid.counter-chart .column { margin-bottom: 1em; font-size: 0.85em; @@ -126,203 +154,256 @@ body.expanded .right-box { border: 1px rgba(0, 0, 0, 0.1) solid; border-right: 0; } + .grid.counter-chart .column div.value { margin-top: 1.5em; font-weight: normal; } + .grid.counter-chart .column div.value span { font-size: 1.5em; margin-right: 0.2em; } + .grid.counter-chart .column.with-border { border-right: 1px rgba(0, 0, 0, 0.1) solid; } + .grid.counter-chart h4 { color: grey; position: relative; font-size: 1em; text-align: left; } + .grid.counter-chart h4 a { position: absolute; right: 0.1em; font-size: 1.26em; display: none; } + .grid.counter-chart .column:hover { background: rgba(0, 0, 0, 0.03) !important; } + .grid.counter-chart .column:hover a { display: inline; } + .grid.chart-grid { margin-top: 1em !important; margin-left: 0.4em !important; } + .grid.chart-grid .column { margin-bottom: 1em; border: 1px rgba(0, 0, 0, 0.1) solid; border-right: 0; } + .grid.chart-grid .column .menu { margin-top: -0.6em !important; margin-bottom: -0.6em !important; } + .grid.chart-grid .column h4 span { font-size: 0.8em; color: grey; } + .grid.chart-grid .column.with-border { border-right: 1px rgba(0, 0, 0, 0.1) solid; } + /** 通用 **/ * { scrollbar-color: rgba(0, 0, 0, 0.2) transparent; scrollbar-width: thin; } + .clear { clear: both; } + .hidden { display: none; } + pre { white-space: pre-wrap; } + a.disabled, a.disabled:hover, a.disabled:active, span.disabled { color: #ccc !important; } + a.enabled, span.enabled, span.green { color: #21ba45; } + span.grey, label.grey, p.grey { color: grey !important; } + p.grey { margin-top: 0.8em; } + span.red, pre.red { color: #db2828; } + span.blue { color: #4183c4; } + span.orange { color: #ff851b; } + pre:not(.CodeMirror-line) { font-family: Lato, 'Helvetica Neue', Arial, Helvetica, sans-serif !important; } + tbody { background: transparent; } + .table-box { margin-top: 1em; overflow-x: auto; } + .table-box::-webkit-scrollbar { height: 6px; } + .table.width30 { width: 30em !important; } + .table.width35 { width: 35em !important; } + .table.width40 { width: 40em !important; } + .table.width1024 { width: 1024px !important; } + .table th, .table td { font-size: 0.9em !important; } + .table tr.active td { background: rgba(0, 0, 0, 0.01) !important; } + p.comment, div.comment { color: #959da6; padding-top: 0.4em; font-size: 1em; } + p.comment em, div.comment em { font-style: italic !important; } + .truncate { white-space: nowrap; -ms-text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; } + div.margin, p.margin { margin-top: 1em; } + .opacity-mask { opacity: 0.3; } + /** 操作按钮容器 **/ .op.one { width: 4em; } + .op.two { width: 7.4em; } + .op.three { width: 9em; } + .op.four { width: 12em; } + /** 主菜单 **/ .main-menu { width: 8em !important; } + .main-menu .ui.menu { width: 100% !important; } + .main-menu .ui.menu .item.separator { border-top: 1px rgba(0, 0, 0, 0.2) solid; height: 1px; min-height: 0; padding: 0; } + @media screen and (max-width: 512px) { .main-menu { width: auto !important; } + .main-menu .ui.menu { width: 3.6em !important; } + .main-menu .ui.menu .item.separator { display: none; } + .main-menu .ui.menu .item { padding-top: 2em; padding-bottom: 2.4em; } } + .main-menu .ui.labeled.icon.menu .item { font-size: 0.9em; } + .main-menu .ui.menu { padding-bottom: 3em; } + .main-menu .ui.menu .item .subtitle { display: none; } + .main-menu .ui.menu .item.expend .subtitle { display: block; font-size: 10px; @@ -330,20 +411,24 @@ p.margin { margin-top: 0.5em; color: grey; } + @media screen and (max-width: 512px) { .main-menu .ui.menu .item.expend .subtitle { display: none; } } + .main-menu .ui.menu .sub-items .item { padding-left: 2.8em !important; padding-right: 0.4em !important; } + .main-menu .ui.menu .sub-items .item .icon { position: absolute; left: 1.1em; top: 0.93em; } + .main-menu .ui.menu .sub-items .item .label { margin-left: 0; margin-right: 0; @@ -351,53 +436,67 @@ p.margin { padding-right: 0.4em; min-width: 2em; } + @media screen and (max-width: 512px) { .main-menu .ui.menu .sub-items .item { padding-left: 1em !important; } } + .main-menu .ui.menu .sub-items .item.active { background-color: #2185d0 !important; } + /** 扩展UI **/ .field.text { padding: 0.5em; } + .form .fields:not(.inline) .field { margin-bottom: 0.5em !important; } + .form .fields:not(.inline) .field .button { min-width: 5em; } + /** body **/ @keyframes blink { from { opacity: 0.1; } + to { opacity: 0.8; } } + @keyframes rotation { from { transform: rotate(0); } + to { transform: rotate(360deg); } } + body .ui.menu .item .blink { animation: blink 1s infinite; } + body .ui.menu .item:not(:hover) span.rotate { animation: rotation 3s infinite; } + body.expanded .main-menu { display: none; } + body.expanded .main { left: 1em; } + /** 布局相关 */ .top-nav { border-radius: 0 !important; @@ -407,6 +506,7 @@ body.expanded .main { overflow-x: auto; border: 0 !important; } + .top-nav img.avatar { width: 1.6em !important; height: 1.6em !important; @@ -415,44 +515,57 @@ body.expanded .main { border-radius: 0.9em; margin-right: 0.5em !important; } + .top-nav em { font-style: normal; font-size: 0.9em; padding-left: 0.2em; } + .top-nav .item .hover-span span { display: none; } + .top-nav .item:hover .hover-span span { display: inline; } + .top-nav .item.red { color: red !important; } + .top-nav.theme1 { background: #14539A !important; } + .top-nav.theme2 { background: #276AC6 !important; } + .top-nav.theme3 { background: #007D9C !important; } + .top-nav.theme4 { background: #A12568 !important; } + .top-nav.theme5 { background: #1C7947 !important; } + .top-nav.theme6 { background: #1D365D !important; } + .top-nav.theme7 { background: black !important; } + .top-nav::-webkit-scrollbar { height: 2px; } + /** 顶部菜单 **/ .top-secondary-menu { position: fixed; @@ -462,23 +575,28 @@ body.expanded .main { z-index: 100; background: white; } + .top-secondary-menu .menu { margin-top: 0 !important; margin-bottom: 0 !important; border-radius: 0 !important; } + .top-secondary-menu .menu var { font-style: normal; } + .top-secondary-menu .divider { margin-top: 0 !important; margin-bottom: 0 !important; } + @media screen and (max-width: 512px) { .top-secondary-menu { left: 4em; } } + /** 右侧主操作区 **/ .main { position: absolute; @@ -488,84 +606,107 @@ body.expanded .main { padding-right: 0.2em; right: 1em; } + @media screen and (max-width: 512px) { .main { left: 4em; } + .main .main-box { display: block; } } + .main.without-menu { left: 9em; } + .main.without-secondary-menu { top: 2.9em; } + @media screen and (max-width: 512px) { .main.without-menu { left: 4em; } } + .main table td.title { width: 10em; } + .main table td.middle-title { width: 14em; } + .main table td { vertical-align: top; } + .main table td.color-border { border-left: 1px #276ac6 solid !important; } + .main table td.vertical-top { vertical-align: top; } + .main table td.vertical-middle { vertical-align: middle; } + .main table td[colspan="2"] a { font-weight: normal; } + .main table td em { font-weight: normal; font-style: normal; font-size: 0.9em; } + .main table td em.grey { color: grey; } + .main h3 { font-weight: normal; margin-top: 1em !important; position: relative; } + .main h3 span { font-size: 0.8em; } + .main h3 span.label { color: #6435c9; } + .main h3 a { margin-left: 1em; font-size: 14px !important; right: 1em; } + .main h4 { font-weight: normal; } + .main form h4 { margin-top: 0.6em; } + .main td span.small { font-size: 0.8em; } + .main .button.mini { font-size: 0.8em; padding: 0.2em; margin-left: 1em; } + .main-menu { position: fixed; /**top: 1.05em;**/ @@ -574,89 +715,114 @@ body.expanded .main { overflow-y: auto; z-index: 10; } + .main-menu .menu { border: 0 !important; box-shadow: none !important; } + .main-menu.theme1 { background: #14539A !important; } + .main-menu.theme1 .menu { background: #14539A !important; } + .main-menu.theme2 { background: #276AC6 !important; } + .main-menu.theme2 .menu { background: #276AC6 !important; } + .main-menu.theme3 { background: #007D9C !important; } + .main-menu.theme3 .menu { background: #007D9C !important; } + .main-menu.theme4 { background: #A12568 !important; } + .main-menu.theme4 .menu { background: #A12568 !important; } + .main-menu.theme5 { background: #1C7947 !important; } + .main-menu.theme5 .menu { background: #1C7947 !important; } + .main-menu.theme6 { background: #1D365D !important; } + .main-menu.theme6 .menu { background: #1D365D !important; } + .main-menu.theme7 { background: black !important; } + .main-menu.theme7 .menu { background: black !important; } + .main-menu::-webkit-scrollbar { width: 4px; } + .main .tab-menu { margin-top: 0.3em !important; margin-bottom: 0 !important; overflow-x: auto; overflow-y: hidden; } + .main .tab-menu .item { padding: 0 1em !important; } + .main .tab-menu .item var { font-style: normal; } + .main .tab-menu .item span { font-size: 0.8em; padding-left: 0.3em; } + .main .tab-menu .item .icon { margin-left: 0.6em; } + .main .tab-menu .item.active.title { font-weight: normal !important; margin-right: 1em !important; border-radius: 0 !important; } + .main .tab-menu .item:hover { background: #f8f8f9 !important; border-width: 1px; } + .main .tab-menu .item.active:not(.title) { font-weight: normal !important; border: none; border-radius: 0 !important; color: #2185d0 !important; } + .main .tab-menu .item.active:not(.title) .bottom-indicator { border-bottom: 1px #2185d0 solid; position: absolute; @@ -664,6 +830,7 @@ body.expanded .main { right: 0; bottom: 1px; } + .main .tab-menu .item.active:not(.title).icon .bottom-indicator { border-bottom: 1px #2185d0 solid; position: absolute; @@ -671,12 +838,15 @@ body.expanded .main { right: 0.6em; bottom: 1px; } + .main .tab-menu .item.active.blue { font-weight: bold !important; } + .main .tab-menu::-webkit-scrollbar { height: 4px; } + .main .go-top-btn { position: fixed; right: 2.6em; @@ -687,14 +857,17 @@ body.expanded .main { z-index: 999999; background: white; } + /** 右侧文本子菜单 **/ .text.menu { overflow-x: auto; } + .text.menu::-webkit-scrollbar { width: 4px; height: 4px; } + /** 脚部相关样式 **/ #footer { position: fixed; @@ -706,27 +879,34 @@ body.expanded .main { z-index: 10; overflow-x: auto; } + #footer::-webkit-scrollbar { height: 2px; } + #footer a { font-size: 0.9em; } + #footer a form { display: none; } + #footer a:hover span, #footer a:active span { display: none; } + #footer a:hover form, #footer a:active form { display: block; } + #footer form input { padding: 0; margin: 0; } + #footer-outer-box { z-index: 999999; position: fixed; @@ -736,6 +916,7 @@ body.expanded .main { background: rgba(0, 0, 0, 0.8); bottom: 2.6em; } + #footer-outer-box .qrcode { width: 20em; position: absolute; @@ -744,95 +925,119 @@ body.expanded .main { margin-top: -14em; margin-left: -10em; } + #footer-outer-box .qrcode img { width: 100%; } + #footer-outer-box .qrcode a { position: absolute; right: 0.5em; top: 0.5em; } + @media screen and (max-width: 512px) { #footer-outer-box .qrcode { margin-left: 0; left: 3.5em; } } + /** Vue **/ [v-cloak] { display: none !important; } + /** auto complete **/ .autocomplete-box .menu { background: #eee !important; } + .autocomplete-box .menu::-webkit-scrollbar { width: 4px; } + .autocomplete-box .menu .item { border-top: none !important; } + select.auto-width { width: auto !important; } + /** column **/ @media screen and (max-width: 512px) { .column:not(.one) { width: 100% !important; } } + label[for] { cursor: pointer !important; } + label.blue { color: #2185d0 !important; } + /** Menu **/ .first-menu .menu.text { margin-top: 0 !important; margin-bottom: 0 !important; } + .first-menu .divider { margin-top: 0 !important; margin-bottom: 0 !important; } + .second-menu .menu.text { margin-top: 0 !important; margin-bottom: 0 !important; } + .second-menu .menu.text em { font-style: normal; } + .second-menu .divider { margin-top: 0 !important; } + .menu a { outline: none; } + /** var **/ span.olive, var.olive { color: #b5cc18 !important; } + span.dash { border-bottom: 1px dashed grey; } + span.hover:hover { background: #eee; } + var.normal { font-style: normal; } + /** checkbox **/ .checkbox label a, .checkbox label { font-size: 0.9em !important; } + /** page **/ .page { margin-top: 1em; border-left: 1px solid #ddd; } + .page a { display: inline-block; background: #fafafa; @@ -843,86 +1048,109 @@ var.normal { border: 1px solid #ddd; border-left: 0; } + .page a.active { background: #2185d0 !important; color: white; } + .page a:hover { background: #eee; } + .page select { padding-top: 0.3em !important; padding-bottom: 0.3em !important; } + /** popup **/ .swal2-html-container { overflow-x: hidden; } + .swal2-close, .swal2-close:focus { border: 0; } + .swal2-confirm:focus, .swal2-cancel:focus { border: 3px #ddd solid !important; } + .swal2-confirm, .swal2-cancel { border: 3px #fff solid !important; } + .swal2-cancel { margin-left: 2em !important; } + /** 排序 **/ .sortable-ghost { background: #ddd !important; opacity: 0.1; } + .sortable-drag { opacity: 1; } + .icon.handle { cursor: pointer; } + .label.port-label { margin-top: 0.4em !important; margin-bottom: 0.4em !important; display: block; line-height: 1.5; } + .label { word-break: break-all; } + td .label.small { margin-bottom: 0.2em !important; } + td { word-break: break-all; } + .source-code-box .CodeMirror { border: 1px solid #eee; height: auto !important; } + .source-code-box .CodeMirror-vscrollbar { width: 6px; border-radius: 3px !important; } + .source-code-box .CodeMirror-vscrollbar::-webkit-scrollbar-thumb { border-radius: 2px; } + .scroll-box { overflow-y: auto; } + .scroll-box::-webkit-scrollbar { width: 4px; } + input.error { border: 1px #e0b4b4 solid !important; } + textarea.wide-code { font-family: Menlo, Monaco, "Courier New", monospace !important; line-height: 1.6 !important; } + .combo-box .menu { max-height: 17em; overflow-y: auto; @@ -931,7 +1159,66 @@ textarea.wide-code { border-top: 0; z-index: 100; } + .combo-box .menu::-webkit-scrollbar { width: 4px; } -/*# sourceMappingURL=@layout.css.map */ \ No newline at end of file + +/*# sourceMappingURL=@layout.css.map */ +/* Override Primary Button Color for WAF Platform */ +.ui.primary.button, +.ui.primary.buttons .button { + background-color: #0f2c54 !important; + color: #ffffff !important; +} + +.ui.primary.button:hover, +.ui.primary.buttons .button:hover { + background-color: #0a1f3a !important; +} + +.ui.primary.button:focus, +.ui.primary.buttons .button:focus { + background-color: #08192e !important; +} + +.ui.primary.button:active, +.ui.primary.buttons .button:active, +.ui.primary.active.button { + background-color: #050d18 !important; +} + +.text-primary, +.blue { + color: #0f2c54 !important; +} + +/* Override Semantic UI Default Blue */ +.ui.blue.button, +.ui.blue.buttons .button { + background-color: #0f2c54 !important; + color: #ffffff !important; +} + +.ui.blue.button:hover, +.ui.blue.buttons .button:hover { + background-color: #0a1f3a !important; +} + +.ui.basic.blue.button, +.ui.basic.blue.buttons .button { + box-shadow: 0 0 0 1px #0f2c54 inset !important; + color: #0f2c54 !important; +} + +.ui.basic.blue.button:hover, +.ui.basic.blue.buttons .button:hover { + background: transparent !important; + box-shadow: 0 0 0 1px #0a1f3a inset !important; + color: #0a1f3a !important; +} + +.ui.menu .active.item { + border-color: #2185d0 !important; + color: #0f2c54 !important; +} \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/@layout.html b/EdgeAdmin/web/views/@default/@layout.html index 708bdc6..722a93c 100644 --- a/EdgeAdmin/web/views/@default/@layout.html +++ b/EdgeAdmin/web/views/@default/@layout.html @@ -1,15 +1,16 @@ + {$ htmlEncode .teaTitle} - + {$if eq .teaFaviconFileId 0} - + {$else} - + {$end} - + {$TEA.SEMANTIC} {$TEA.VUE} @@ -20,7 +21,7 @@ window.BRAND_DOCS_SITE = {$ jsonEncode .brandConfig.docsSite}; window.BRAND_DOCS_PREFIX = {$ jsonEncode .brandConfig.docsPathPrefix}; window.BRAND_PRODUCT_NAME = {$ jsonEncode .brandConfig.productName}; - + // 确保 teaName 和 teaVersion 在 Vue 初始化前可用 if (typeof window.TEA === "undefined") { window.TEA = {}; @@ -36,122 +37,152 @@ - - - - + + + + - + - + + -
- -
- - logo   {{teaTitle}} v{{teaVersion}} beta   - - -
- - - 已同步节点 - 正在同步节点... - 节点同步失败 +
+ +
+ + logo   + {{teaTitle}} v{{teaVersion}} beta   - - - 已同步DNS - 正在同步DNS... - DNS同步失败 - +
+ + + 已同步节点 + 正在同步节点... + 节点同步失败 + - - - 消息({{globalMessageBadge}}) - 消息(0) - + + + 已同步DNS + 正在同步DNS... + DNS同步失败 + - - - - - {{teaUsername}} - + + + 消息({{globalMessageBadge}}) + 消息(0) + - + + + + + {{teaUsername}} + - - + - - + + - - - 退出登录 - + + + + + + 退出登录 + +
-
- -
-
-
- +
+
+
+ - - +
+ + +
+ +
+ + {{item.name}}({{item.subName}}) + + {{node.name}} +
+ +
+ + +
+ {$TEA.VIEW} +
+
+
+ + + {$template "/footer"}
- -
- -
- - {{item.name}}({{item.subName}}) - {{node.name}} -
- -
- - -
- {$TEA.VIEW} -
-
-
- - - {$template "/footer"} -
- -{$echo "footer"} + {$echo "footer"} + diff --git a/EdgeAdmin/web/views/@default/@layout_popup.css b/EdgeAdmin/web/views/@default/@layout_popup.css index 6a5cb10..02acc26 100644 --- a/EdgeAdmin/web/views/@default/@layout_popup.css +++ b/EdgeAdmin/web/views/@default/@layout_popup.css @@ -3,60 +3,76 @@ scrollbar-color: rgba(0, 0, 0, 0.2) transparent; scrollbar-width: thin; } + .clear { clear: both; } + .hidden { display: none; } + pre { white-space: pre-wrap; } + a.disabled, a.disabled:hover, a.disabled:active, span.disabled { color: #ccc !important; } + a.enabled, span.enabled, span.green { color: #21ba45; } + span.grey, label.grey, p.grey { color: grey !important; } + p.grey { margin-top: 0.8em; } + span.red, pre.red { color: #db2828; } + span.blue { color: #4183c4; } + pre:not(.CodeMirror-line) { font-family: Lato, 'Helvetica Neue', Arial, Helvetica, sans-serif !important; } + tbody { background: transparent; } + .table.width30 { width: 30em !important; } + .table.width35 { width: 35em !important; } + .table.width40 { width: 40em !important; } + .table th, .table td { font-size: 0.9em !important; } + p.comment, div.comment { color: #959da6; @@ -65,37 +81,46 @@ div.comment { word-break: break-all; line-height: 1.8; } + p.comment em, div.comment em { font-style: italic !important; } + .truncate { white-space: nowrap; -ms-text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; } + div.margin, p.margin { margin-top: 1em; } + /** 操作按钮容器 **/ .op.one { width: 4em; } + .op.two { width: 7.4em; } + .op.three { width: 9em; } + .op.four { width: 10em; } + /** 扩展UI **/ .field.text { padding: 0.5em; } + /** 右侧主操作区 **/ .main { position: absolute; @@ -105,166 +130,210 @@ p.margin { padding-right: 1em; right: 1em; } + @media screen and (max-width: 512px) { .main { left: 4em; } } + .main.without-menu { left: 9em; } + .main.without-secondary-menu { top: 2.9em; } + @media screen and (max-width: 512px) { .main.without-menu { left: 4em; } } + .main table td.title { width: 10em; } + .main table td.middle-title { width: 14em; } + .main table td { vertical-align: top; } + table td.color-border { border-left: 1px #276ac6 solid !important; } + .main table td.vertical-top { vertical-align: top; } + .main table td.vertical-middle { vertical-align: middle; } + .main table td[colspan="2"] a { font-weight: normal; } + .main table td em { font-weight: normal; font-style: normal; font-size: 0.9em; } + .main h3 { font-weight: normal; margin-top: 0.5em !important; } + .main h3 span { font-size: 0.8em; } + .main h3 span.label { color: #6435c9; } + .main h3 a { margin-left: 1em; font-size: 14px !important; right: 1em; } + .main h3 a::before { content: "["; } + .main h3 a::after { content: "]"; } + .main h4 { font-weight: normal; } + .main td span.small { font-size: 0.8em; } + .main .button.mini { font-size: 0.8em; padding: 0.2em; margin-left: 1em; } + /** 右侧文本子菜单 **/ .text.menu { overflow-x: auto; } + .text.menu::-webkit-scrollbar { width: 4px; height: 4px; } + /** Vue **/ [v-cloak] { display: none !important; } + /** auto complete **/ .autocomplete-box .menu { background: #eee !important; } + .autocomplete-box .menu::-webkit-scrollbar { width: 4px; } + .autocomplete-box .menu .item { border-top: none !important; } + select.auto-width { width: auto !important; } + /** column **/ @media screen and (max-width: 512px) { .column:not(.one) { width: 100% !important; } } + /** label **/ label[for] { cursor: pointer !important; } + label.blue { color: #2185d0 !important; } + /** Menu **/ .first-menu .menu.text { margin-top: 0 !important; margin-bottom: 0 !important; } + .first-menu .divider { margin-top: 0 !important; margin-bottom: 0 !important; } + .second-menu .menu.text { margin-top: 0 !important; margin-bottom: 0 !important; } + .second-menu .menu.text em { font-style: normal; } + .second-menu .divider { margin-top: 0 !important; } + .menu a { outline: none; } + /** var **/ span.olive, var.olive { color: #b5cc18 !important; } + span.dash { border-bottom: 1px dashed grey; } + span.hover:hover { background: #eee; } + /** Message **/ .message .gopher { width: 30px; margin-right: 10px; } + /** checkbox **/ .checkbox label a, .checkbox label { font-size: 0.8em !important; } + /** page **/ .page { margin-top: 1em; border-left: 1px solid #ddd; } + .page a { display: inline-block; background: #fafafa; @@ -275,40 +344,50 @@ span.hover:hover { border: 1px solid #ddd; border-left: 0; } + .page a.active { background: #2185d0 !important; color: white; } + .page a:hover { background: #eee; } + .page select { padding-top: 0.3em !important; padding-bottom: 0.3em !important; } + .swal2-html-container { overflow-x: hidden; } + .swal2-confirm:focus, .swal2-cancel:focus, .swal2-close:focus { border: 3px #ddd solid !important; } + .swal2-confirm, .swal2-cancel, .swal2-close { border: 3px #fff solid !important; } + .swal2-cancel { margin-left: 2em !important; } + input.error { border: 1px #e0b4b4 solid !important; } + textarea.wide-code { font-family: Menlo, Monaco, "Courier New", monospace !important; line-height: 1.6 !important; } + .combo-box .menu { max-height: 17em; overflow-y: auto; @@ -317,9 +396,11 @@ textarea.wide-code { border-top: 0; z-index: 100; } + .combo-box .menu::-webkit-scrollbar { width: 4px; } + code-label { background: #fff; border: 1px solid rgba(34, 36, 38, 0.15); @@ -333,4 +414,62 @@ code-label { font-weight: 700; vertical-align: baseline; } -/*# sourceMappingURL=@layout_popup.css.map */ \ No newline at end of file + +/*# sourceMappingURL=@layout_popup.css.map */ +/* Override Primary Button Color for WAF Platform */ +.ui.primary.button, +.ui.primary.buttons .button { + background-color: #0f2c54 !important; + color: #ffffff !important; +} + +.ui.primary.button:hover, +.ui.primary.buttons .button:hover { + background-color: #0a1f3a !important; +} + +.ui.primary.button:focus, +.ui.primary.buttons .button:focus { + background-color: #08192e !important; +} + +.ui.primary.button:active, +.ui.primary.buttons .button:active, +.ui.primary.active.button { + background-color: #050d18 !important; +} + +.text-primary, +.blue { + color: #0f2c54 !important; +} + +/* Override Semantic UI Default Blue */ +.ui.blue.button, +.ui.blue.buttons .button { + background-color: #0f2c54 !important; + color: #ffffff !important; +} + +.ui.blue.button:hover, +.ui.blue.buttons .button:hover { + background-color: #0a1f3a !important; +} + +.ui.basic.blue.button, +.ui.basic.blue.buttons .button { + box-shadow: 0 0 0 1px #0f2c54 inset !important; + color: #0f2c54 !important; +} + +.ui.basic.blue.button:hover, +.ui.basic.blue.buttons .button:hover { + background: transparent !important; + box-shadow: 0 0 0 1px #0a1f3a inset !important; + color: #0a1f3a !important; +} + +.ui.menu .active.item { + border-color: #2185d0 !important; + color: #2185d0 !important; +} \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/addPortPopup.html b/EdgeAdmin/web/views/@default/httpdns/addPortPopup.html new file mode 100644 index 0000000..eefd320 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/addPortPopup.html @@ -0,0 +1,28 @@ +{$layout "layout_popup"} + +

添加端口绑定

+

修改端口绑定

+
+ + + + + + + + + + +
网络协议 + +
端口 * + +

可以是一个数字端口（通常不超过65535），也可以是"地址:端口"的方式。支持端口范围，形式为port1-port2。 + HTTP常用端口为80。 + HTTPS常用端口为443。 +

+
+ +
\ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/addPortPopup.js b/EdgeAdmin/web/views/@default/httpdns/addPortPopup.js new file mode 100644 index 0000000..cb2fe54 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/addPortPopup.js @@ -0,0 +1,47 @@ +Tea.context(function () { + this.success = NotifyPopup; + + this.isUpdating = false + + this.address = "" + this.protocol = this.protocols[0].code + + // 初始化 + // from 用来标记是否为特殊的节点 + if (this.from.length == 0) { + if (this.protocol == "http") { + this.address = "80" + } else if (this.protocol == "https") { + this.address = "443" + } + } + + if (window.parent.UPDATING_ADDR != null) { + this.isUpdating = true + let addr = window.parent.UPDATING_ADDR + this.protocol = addr.protocol + if (addr.host.length == 0) { + this.address = addr.portRange + } else { + this.address = addr.host.quoteIP() + ":" + addr.portRange + } + } + + this.changeProtocol = function () { + if (this.from.length > 0) { + return + } + switch (this.protocol) { + case "http": + this.address = "80" + break + case "https": + this.address = "443" + break + } + } + + this.addPort = function (port) { + this.address = port + } +}); \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/@menu.html b/EdgeAdmin/web/views/@default/httpdns/apps/@menu.html new file mode 100644 index 0000000..dda96cc --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/@menu.html @@ -0,0 +1,4 @@ + + 应用列表 + [添加应用] + \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/appSettings.html b/EdgeAdmin/web/views/@default/httpdns/apps/appSettings.html new file mode 100644 index 0000000..91d0c0b --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/appSettings.html @@ -0,0 +1,148 @@ +{$layout} +{$template "menu"} +{$template "/left_menu_with_menu"} + + + +
+
+ + + + + + + + + + + + + + + + +
所属集群 + + +

选择该应用绑定的集群。

+
应用启用 + +
SNI 防护配置 + 隐匿 SNI +

当前默认采用隐匿 SNI 策略，避免在 TLS 握手阶段暴露业务域名。

+
+ + + + + + + + + + + + + + + + + + +
App ID + {{settings.appId}} + +
服务地址 +
+
+ {{sa.address}} +
+
+ 未配置集群 +
请求验签 + {{settings.signEnabled + ? "已开启" : "已关闭"}} + {{settings.signEnabled ? "关闭请求验签" : "开启请求验签"}} +

打开后，服务端会对请求进行签名校验。

+
加签 Secret +
+ {{signSecretVisible ? settings.signSecretPlain : settings.signSecretMasked}} + + + +
+

最近更新：{{settings.signSecretUpdatedAt}}

+

请求验签已关闭，当前不使用加签 Secret。

+

用于生成鉴权接口的安全密钥。

+
+ + +
+
\ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/appSettings.js b/EdgeAdmin/web/views/@default/httpdns/apps/appSettings.js new file mode 100644 index 0000000..1f5d8f6 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/appSettings.js @@ -0,0 +1,95 @@ +Tea.context(function () { + this.activeSection = this.activeSection || "basic"; + this.success = NotifyReloadSuccess("保存成功"); + this.signSecretVisible = false; + + this.toggleSignEnabled = function () { + let that = this; + let targetIsOn = !this.settings.signEnabled; + + if (targetIsOn) { + teaweb.confirm("html:开启后，服务端会对解析请求进行签名鉴权，未签名、签名无效或过期的请求都会解析失败，确认开启吗？", function () { + that.$post("/httpdns/apps/app/settings/toggleSignEnabled") + .params({ + appId: that.app.id, + isOn: 1 + }) + .success(function () { + that.settings.signEnabled = true; + teaweb.success("请求验签已开启"); + }); + }); + return; + } + + teaweb.confirm("html:关闭后，服务端不会对解析请求进行签名鉴权，可能存在被刷风险，确认关闭吗？", function () { + that.$post("/httpdns/apps/app/settings/toggleSignEnabled") + .params({ + appId: that.app.id, + isOn: 0 + }) + .success(function () { + that.settings.signEnabled = false; + teaweb.success("请求验签已关闭"); + }); + }); + }; + + this.copySecret = function (text, name) { + if (typeof text != "string" || text.length == 0) { + teaweb.warn("没有可复制的内容"); + return; + } + + if (navigator.clipboard && navigator.clipboard.writeText) { + navigator.clipboard.writeText(text).then(function () { + teaweb.success(name + "已复制"); + }).catch(function () { + this.copyByTextarea(text, name); + }.bind(this)); + return; + } + + this.copyByTextarea(text, name); + }; + + this.copyByTextarea = function (text, name) { + let input = document.createElement("textarea"); + input.value = text; + input.setAttribute("readonly", "readonly"); + input.style.position = "fixed"; + input.style.left = "-10000px"; + input.style.top = "-10000px"; + document.body.appendChild(input); + input.select(); + + let ok = false; + try { + ok = document.execCommand("copy"); + } catch (e) { + ok = false; + } + document.body.removeChild(input); + + if (ok) { + teaweb.success(name + "已复制"); + } else { + teaweb.warn("复制失败，请手动复制"); + } + }; + + this.resetSignSecret = function () { + let that = this; + teaweb.confirm("确定要重置加签 Secret 吗？", function () { + that.$post("/httpdns/apps/app/settings/resetSignSecret") + .params({ + appId: that.app.id + }) + .success(function () { + teaweb.success("加签 Secret 已重置", function () { + teaweb.reload(); + }); + }); + }); + }; +}); diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/create.html b/EdgeAdmin/web/views/@default/httpdns/apps/create.html new file mode 100644 index 0000000..4fc405a --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/create.html @@ -0,0 +1,31 @@ +{$layout} +{$template "menu"} + +
+ + + + + + + + + + + + + + +
应用名称 * + +

为该 HTTPDNS 应用设置一个便于识别的名称。

+
所属集群 * + + +

选择该应用绑定的集群。

+
所属用户 + +

可以选择当前应用所属的平台用户。

+
+ +
\ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/create.js b/EdgeAdmin/web/views/@default/httpdns/apps/create.js new file mode 100644 index 0000000..79b655f Binary files /dev/null and b/EdgeAdmin/web/views/@default/httpdns/apps/create.js differ diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/customRecords.html b/EdgeAdmin/web/views/@default/httpdns/apps/customRecords.html new file mode 100644 index 0000000..9a0763c --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/customRecords.html @@ -0,0 +1,55 @@ +{$layout} + + + + + {{app.name}} + » + 域名列表 + » +
{{domain.name}}
+ 创建规则 + + + + + + + + + + + + + + + + + + + + + + + +
线路规则名称解析记录TTL状态操作
{{record.lineText}}{{record.ruleName}}{{record.recordValueText}}{{record.ttl}}s + 已启用 + 已停用 + + 编辑  |  + {{record.isOn ? "停用" : "启用"}}  |  + 删除 +
+ +当前应用暂无可用域名，请先到域名管理中添加域名。 +当前域名还没有自定义解析规则。 diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/customRecords.js b/EdgeAdmin/web/views/@default/httpdns/apps/customRecords.js new file mode 100644 index 0000000..cd65c73 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/customRecords.js @@ -0,0 +1,60 @@ +Tea.context(function () { + if (typeof this.records == "undefined") { + this.records = []; + } + + this.createRecord = function () { + if (!this.domain || !this.domain.id) { + return; + } + teaweb.popup("/httpdns/apps/customRecords/createPopup?appId=" + this.app.id + "&domainId=" + this.domain.id, { + width: "42em", + height: "33em", + title: "新增自定义解析规则", + callback: function () { + teaweb.success("保存成功", function () { + teaweb.reload(); + }); + } + }); + }; + + this.editRecord = function (recordId) { + if (!this.domain || !this.domain.id) { + return; + } + teaweb.popup("/httpdns/apps/customRecords/createPopup?appId=" + this.app.id + "&domainId=" + this.domain.id + "&recordId=" + recordId, { + width: "42em", + height: "33em", + title: "编辑自定义解析规则", + callback: function () { + teaweb.success("保存成功", function () { + teaweb.reload(); + }); + } + }); + }; + + this.deleteRecord = function (recordId) { + let that = this; + teaweb.confirm("确定要删除这条自定义解析规则吗？", function () { + that.$post("/httpdns/apps/customRecords/delete") + .params({ + appId: that.app.id, + recordId: recordId + }) + .refresh(); + }); + }; + + this.toggleRecord = function (record) { + let that = this; + that.$post("/httpdns/apps/customRecords/toggle") + .params({ + appId: that.app.id, + recordId: record.id, + isOn: record.isOn ? 0 : 1 + }) + .refresh(); + }; +}); diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/customRecordsCreatePopup.html b/EdgeAdmin/web/views/@default/httpdns/apps/customRecordsCreatePopup.html new file mode 100644 index 0000000..c286ddc --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/customRecordsCreatePopup.html @@ -0,0 +1,160 @@ +{$layout "layout_popup"} + + + +

编辑自定义解析规则

+

新增自定义解析规则

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
域名 *{{record.domain}}
规则名称 * + +

例如：上海电信灰度-v2

+
线路 +
+ + + + + + + +
+
解析记录值 * +
+
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + 添加记录值 + + {{recordItems.length}}/10 +
+
TTL * +
+ + 秒 +
+
状态 +
+ + +
+
+ + +
diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/customRecordsCreatePopup.js b/EdgeAdmin/web/views/@default/httpdns/apps/customRecordsCreatePopup.js new file mode 100644 index 0000000..e148e5d --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/customRecordsCreatePopup.js @@ -0,0 +1,158 @@ +Tea.context(function () { + var vm = this; + + if (typeof vm.record == "undefined" || vm.record == null) { + vm.record = {}; + } + + vm.chinaCarriers = ["默认", "电信", "联通", "移动", "教育网", "鹏博士", "广电"]; + vm.chinaRegions = ["默认", "东北", "华北", "华东", "华南", "华中", "西北", "西南"]; + vm.chinaRegionProvinces = { + "默认": ["默认"], + "东北": ["默认", "辽宁", "吉林", "黑龙江"], + "华北": ["默认", "北京", "天津", "河北", "山西", "内蒙古"], + "华东": ["默认", "上海", "江苏", "浙江", "安徽", "福建", "江西", "山东"], + "华南": ["默认", "广东", "广西", "海南"], + "华中": ["默认", "河南", "湖北", "湖南"], + "西北": ["默认", "陕西", "甘肃", "青海", "宁夏", "新疆"], + "西南": ["默认", "重庆", "四川", "贵州", "云南", "西藏"] + }; + + vm.continents = ["默认", "亚洲", "欧洲", "北美洲", "南美洲", "非洲", "大洋洲"]; + vm.continentCountries = { + "默认": ["默认"], + "亚洲": ["默认", "中国香港", "中国澳门", "中国台湾", "日本", "韩国", "新加坡", "印度", "泰国", "越南", + "印度尼西亚", "马来西亚", "菲律宾", "柬埔寨", "缅甸", "老挝", "斯里兰卡", "孟加拉国", "巴基斯坦", "尼泊尔", + "阿联酋", "沙特阿拉伯", "土耳其", "以色列", "伊朗", "伊拉克", "卡塔尔", "科威特", "蒙古"], + "欧洲": ["默认", "德国", "英国", "法国", "荷兰", "西班牙", "意大利", "俄罗斯", + "波兰", "瑞典", "瑞士", "挪威", "芬兰", "丹麦", "葡萄牙", "爱尔兰", "比利时", "奥地利", + "乌克兰", "捷克", "罗马尼亚", "匈牙利", "希腊"], + "北美洲": ["默认", "美国", "加拿大", "墨西哥", "巴拿马", "哥斯达黎加", "古巴"], + "南美洲": ["默认", "巴西", "阿根廷", "智利", "哥伦比亚", "秘鲁", "委内瑞拉", "厄瓜多尔"], + "非洲": ["默认", "南非", "埃及", "尼日利亚", "肯尼亚", "摩洛哥", "阿尔及利亚", "坦桑尼亚", "埃塞俄比亚", "加纳", "突尼斯"], + "大洋洲": ["默认", "澳大利亚", "新西兰"] + }; + + vm.parseJSONList = function (raw) { + if (typeof raw == "undefined" || raw == null || raw == "") { + return []; + } + + if (Array.isArray(raw)) { + return raw; + } + + try { + var list = JSON.parse(raw); + if (Array.isArray(list)) { + return list; + } + } catch (e) { + } + + return []; + }; + + vm.normalizeBoolean = function (value, defaultValue) { + if (typeof value == "boolean") { + return value; + } + if (typeof value == "number") { + return value > 0; + } + if (typeof value == "string") { + value = value.toLowerCase(); + return value == "1" || value == "true" || value == "yes" || value == "on"; + } + return defaultValue; + }; + + vm.record.lineScope = vm.record.lineScope == "overseas" ? "overseas" : "china"; + vm.record.lineCarrier = vm.record.lineCarrier || "默认"; + vm.record.lineRegion = vm.record.lineRegion || "默认"; + vm.record.lineProvince = vm.record.lineProvince || "默认"; + vm.record.lineContinent = vm.record.lineContinent || "默认"; + vm.record.lineCountry = vm.record.lineCountry || "默认"; + vm.record.ruleName = vm.record.ruleName || ""; + vm.record.ttl = vm.record.ttl || 60; + vm.record.weightEnabled = vm.normalizeBoolean(vm.record.weightEnabled, false); + vm.record.isOn = vm.normalizeBoolean(vm.record.isOn, true); + + vm.recordItems = vm.parseJSONList(vm.record.recordItemsJson); + if (vm.recordItems.length == 0) { + vm.recordItems.push({type: "A", value: "", weight: 100}); + } else { + for (var i = 0; i < vm.recordItems.length; i++) { + var item = vm.recordItems[i]; + if (item.type != "A" && item.type != "AAAA") { + item.type = "A"; + } + if (typeof item.weight == "undefined" || item.weight == null || item.weight === "") { + item.weight = 100; + } + } + } + + vm.provinceOptions = ["默认"]; + vm.countryOptions = ["默认"]; + + vm.refreshProvinceOptions = function () { + var provinces = vm.chinaRegionProvinces[vm.record.lineRegion]; + if (!Array.isArray(provinces) || provinces.length == 0) { + provinces = ["默认"]; + } + vm.provinceOptions = provinces; + if (vm.provinceOptions.indexOf(vm.record.lineProvince) < 0) { + vm.record.lineProvince = vm.provinceOptions[0]; + } + }; + + vm.refreshCountryOptions = function () { + var countries = vm.continentCountries[vm.record.lineContinent]; + if (!Array.isArray(countries) || countries.length == 0) { + countries = ["默认"]; + } + vm.countryOptions = countries; + if (vm.countryOptions.indexOf(vm.record.lineCountry) < 0) { + vm.record.lineCountry = vm.countryOptions[0]; + } + }; + + vm.onChinaRegionChange = function () { + vm.refreshProvinceOptions(); + }; + + vm.onContinentChange = function () { + vm.refreshCountryOptions(); + }; + + vm.onLineScopeChange = function () { + if (vm.record.lineScope == "overseas") { + vm.record.lineContinent = vm.record.lineContinent || "默认"; + vm.refreshCountryOptions(); + } else { + vm.record.lineCarrier = vm.record.lineCarrier || "默认"; + vm.record.lineRegion = vm.record.lineRegion || "默认"; + vm.refreshProvinceOptions(); + } + }; + + vm.addRecordItem = function () { + if (vm.recordItems.length >= 10) { + return; + } + vm.recordItems.push({type: "A", value: "", weight: 100}); + }; + + vm.removeRecordItem = function (index) { + if (index < 0 || index >= vm.recordItems.length) { + return; + } + vm.recordItems.splice(index, 1); + if (vm.recordItems.length == 0) { + vm.recordItems.push({type: "A", value: "", weight: 100}); + } + }; + + vm.onLineScopeChange(); +}); diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/delete.html b/EdgeAdmin/web/views/@default/httpdns/apps/delete.html new file mode 100644 index 0000000..b374ce3 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/delete.html @@ -0,0 +1,12 @@ +{$layout} + + + {{app.name}} + » +
删除应用
+ + +
+ +

包含{{domainCount}}域名

+
diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/delete.js b/EdgeAdmin/web/views/@default/httpdns/apps/delete.js new file mode 100644 index 0000000..6c30c8e --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/delete.js @@ -0,0 +1,16 @@ +Tea.context(function () { + this.deleteApp = function (appId) { + let that = this; + teaweb.confirm("确定要删除此应用吗？", function () { + that.$post("/httpdns/apps/delete") + .params({ + appId: appId + }) + .success(function () { + teaweb.success("删除成功", function () { + window.location = "/httpdns/apps"; + }); + }); + }); + }; +}); diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/docs/android.md b/EdgeAdmin/web/views/@default/httpdns/apps/docs/android.md new file mode 100644 index 0000000..795d558 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/docs/android.md @@ -0,0 +1,36 @@ +# Android SDK + +## 初始化 + +```java +new InitConfig.Builder() + .setContext(context) + .setPrimaryServiceHost("httpdns-a.example.com") + .setBackupServiceHost("httpdns-b.example.com") + .setServicePort(443) + .setSecretKey("your-sign-secret") + .setEnableHttps(true) + .buildFor("app1f1ndpo9"); +``` + +## 解析 + +```java +HTTPDNSResult result = httpDnsService.getHttpDnsResultForHostSyncNonBlocking( + "api.business.com", + RequestIpType.auto, + null, + null +); +``` + +## 官方业务适配器 + +```java +HttpDnsHttpAdapter adapter = HttpDns.buildHttpClientAdapter(httpDnsService); +HttpDnsAdapterResponse resp = adapter.execute( + new HttpDnsAdapterRequest("GET", "https://api.business.com/v1/ping") +); +``` + +固定策略：IP 直连 + 空 SNI + Host=真实域名，不回退到带 SNI。 diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/docs/flutter.md b/EdgeAdmin/web/views/@default/httpdns/apps/docs/flutter.md new file mode 100644 index 0000000..7a1b112 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/docs/flutter.md @@ -0,0 +1,35 @@ +# Flutter SDK + +## 初始化 + +```dart +await AliyunHttpdns.init( + appId: 'app1f1ndpo9', + primaryServiceHost: 'httpdns-a.example.com', + backupServiceHost: 'httpdns-b.example.com', + servicePort: 443, + secretKey: 'your-sign-secret', +); +await AliyunHttpdns.build(); +``` + +## 解析 + +```dart +final result = await AliyunHttpdns.resolveHostSyncNonBlocking( + 'api.business.com', + ipType: 'both', +); +``` + +## 官方业务适配器 + +```dart +final adapter = AliyunHttpdns.createHttpAdapter(); +final resp = await adapter.request( + Uri.parse('https://api.business.com/v1/ping'), + method: 'GET', +); +``` + +固定策略：IP 直连 + 空 SNI + Host=真实域名，不回退到带 SNI。 diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/docs/ios.md b/EdgeAdmin/web/views/@default/httpdns/apps/docs/ios.md new file mode 100644 index 0000000..a90381e --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/docs/ios.md @@ -0,0 +1,31 @@ +# iOS SDK + +## 初始化 + +```objc +HttpdnsEdgeService *service = [[HttpdnsEdgeService alloc] + initWithAppId:@"app1f1ndpo9" +primaryServiceHost:@"httpdns-a.example.com" + backupServiceHost:@"httpdns-b.example.com" + servicePort:443 + signSecret:@"your-sign-secret"]; +``` + +## 解析 + +```objc +[service resolveHost:@"api.business.com" queryType:@"A" completion:^(HttpdnsEdgeResolveResult * _Nullable result, NSError * _Nullable error) { + // result.ipv4s / result.ipv6s +}]; +``` + +## 官方业务适配器 + +```objc +NSURL *url = [NSURL URLWithString:@"https://api.business.com/v1/ping"]; +[service requestURL:url method:@"GET" headers:nil body:nil completion:^(NSData * _Nullable data, NSHTTPURLResponse * _Nullable response, NSError * _Nullable error) { + // handle +}]; +``` + +固定策略：IP 直连 + 空 SNI + Host=真实域名，不回退到带 SNI。 diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/domains.html b/EdgeAdmin/web/views/@default/httpdns/apps/domains.html new file mode 100644 index 0000000..0bc9c0a --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/domains.html @@ -0,0 +1,62 @@ +{$layout} + +
+ + + + {{app.name}} + » +
域名列表
+ 创建域名 + + +
+
+
+ +
+
+ +   + [清除条件] +
+
+
+ + + + + + + + + + + + + + + + + + + + + +
服务域名规则策略操作
+
{{domain.name}}
+ 		+ {{domain.customRecordCount}} + + 自定义解析 +  |  + 解绑 +
+ +当前应用尚未绑定域名。 +没有匹配的域名。 \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/domains.js b/EdgeAdmin/web/views/@default/httpdns/apps/domains.js new file mode 100644 index 0000000..290ffbf --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/domains.js @@ -0,0 +1,71 @@ +Tea.context(function () { + if (typeof this.keywordInput == "undefined") { + this.keywordInput = ""; + } + if (typeof this.keyword == "undefined") { + this.keyword = ""; + } + + if (typeof this.domains == "undefined") { + this.domains = []; + } + + this.keywordInput = this.keyword; + + this.doSearch = function () { + this.keyword = this.keywordInput.trim(); + }; + + this.clearSearch = function () { + this.keywordInput = ""; + this.keyword = ""; + }; + + this.filteredDomains = function () { + let keyword = this.keyword.trim().toLowerCase(); + if (keyword.length == 0) { + return this.domains; + } + return this.domains.filter(function (domain) { + let name = (domain.name || "").toLowerCase(); + return name.indexOf(keyword) >= 0; + }); + }; + + this.bindDomain = function () { + teaweb.popup("/httpdns/apps/domains/createPopup?appId=" + this.app.id, { + height: "12em", + width: "36em", + title: "添加域名", + callback: function () { + teaweb.success("保存成功", function () { + teaweb.reload(); + }); + } + }); + }; + + this.deleteApp = function () { + let that = this; + teaweb.confirm("确定要删除当前应用吗？", function () { + that.$post("/httpdns/apps/delete") + .params({ + appId: that.app.id + }) + .success(function () { + window.location = "/httpdns/apps"; + }); + }); + }; + + this.deleteDomain = function (domainId) { + let that = this; + teaweb.confirm("确定要解绑这个域名吗？", function () { + that.$post("/httpdns/apps/domains/delete") + .params({ + domainId: domainId + }) + .refresh(); + }); + }; +}); diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/domainsCreatePopup.html b/EdgeAdmin/web/views/@default/httpdns/apps/domainsCreatePopup.html new file mode 100644 index 0000000..f55fd69 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/domainsCreatePopup.html @@ -0,0 +1,18 @@ +{$layout "layout_popup"} + +

添加域名

+ +
+ + + + + + + +
域名 * + +

请输入完整 FQDN，例如 api.example.com。

+
+ +
diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/index.html b/EdgeAdmin/web/views/@default/httpdns/apps/index.html new file mode 100644 index 0000000..87e4fe2 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/index.html @@ -0,0 +1,89 @@ +{$layout} +{$template "menu"} + +
+ + + +
+
+
+
+ +
+
+ + [清除条件] +
+
+
+ +

暂时没有符合条件的 HTTPDNS 应用。

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
应用名称AppID集群用户绑定域名数状态操作
+ + + {{app.name}} + + + + {{app.appId}} + + + + + {{cluster.name || ('#' + cluster.id)}}、 + + + - + + + {{app.user.fullname}} ({{app.user.username}}) + + - + {{app.domainCount}} + + + 域名管理  |  + 应用设置  |  + SDK集成 +
+ +
+
diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/index.js b/EdgeAdmin/web/views/@default/httpdns/apps/index.js new file mode 100644 index 0000000..a415a1d --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/index.js @@ -0,0 +1,9 @@ +Tea.context(function () { + if (typeof this.apps == "undefined") { + this.apps = []; + } + + this.createApp = function () { + window.location = "/httpdns/apps/create"; + }; +}); diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/sdk.html b/EdgeAdmin/web/views/@default/httpdns/apps/sdk.html new file mode 100644 index 0000000..117e4ef --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/sdk.html @@ -0,0 +1,85 @@ +{$layout} + + + + + {{app.name}} + » +
SDK 集成
+ + +
+ + 上传 SDK/文档 + +
+ +
+
+
+
Android SDK
+
Java / Kotlin
+
适用于 Android 客户端接入。
+
+
+
+ 下载 SDK + 下载文档 +
+
+
+ +
+
+
iOS SDK
+
Objective-C / Swift
+
适用于 iOS 客户端接入。
+
+
+
+ 下载 SDK + 下载文档 +
+
+
+ +
+
+
Flutter SDK
+
Dart / Plugin
+
适用于 Flutter 跨平台接入。
+
+
+
+ 下载 SDK + 下载文档 +
+
+
+
diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/sdk.js b/EdgeAdmin/web/views/@default/httpdns/apps/sdk.js new file mode 100644 index 0000000..fcf5fd4 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/sdk.js @@ -0,0 +1,123 @@ +Tea.context(function () { + this.downloadSDK = function (platform, event) { + this.checkAndDownload(platform, "sdk", event) + } + + this.downloadDoc = function (platform, event) { + this.checkAndDownload(platform, "doc", event) + } + + this.checkAndDownload = function (platform, type, event) { + if (event != null && typeof event.preventDefault == "function") { + event.preventDefault() + } + + this.$get("/httpdns/apps/sdk/check") + .params({ + platform: platform, + type: type + }) + .success(function (resp) { + let data = (resp != null && resp.data != null) ? resp.data : {} + if (!data.exists) { + teaweb.warn(data.message || "当前暂无可下载文件") + return + } + if (typeof data.url == "string" && data.url.length > 0) { + this.downloadByBlob(data.url, platform, type) + return + } + teaweb.warn("下载地址生成失败，请稍后重试") + }.bind(this)) + } + + this.downloadByBlob = function (url, platform, type) { + let defaultFileName = "httpdns-sdk-" + platform + (type == "doc" ? ".md" : ".zip") + + let xhr = new XMLHttpRequest() + xhr.open("GET", url, true) + xhr.responseType = "blob" + + xhr.onload = function () { + if (xhr.status < 200 || xhr.status >= 300) { + teaweb.warn("下载失败（HTTP " + xhr.status + "）") + return + } + if (xhr.status == 204) { + teaweb.warn("下载被浏览器扩展或下载工具拦截，请暂时关闭相关扩展后重试") + return + } + + let contentType = (xhr.getResponseHeader("Content-Type") || "").toLowerCase() + if (contentType.indexOf("application/json") >= 0) { + let reader = new FileReader() + reader.onload = function () { + try { + let json = JSON.parse(reader.result) + teaweb.warn((json && json.message) ? json.message : "下载失败，请稍后重试") + } catch (_e) { + teaweb.warn("下载失败，请稍后重试") + } + } + reader.readAsText(xhr.response) + return + } + + let disposition = xhr.getResponseHeader("Content-Disposition") || "" + let fileName = xhr.getResponseHeader("X-SDK-Filename") || this.parseFileName(disposition) || defaultFileName + if (xhr.response == null || xhr.response.size <= 0) { + teaweb.warn("下载文件为空，请检查已上传 SDK 包是否完整") + return + } + this.saveBlob(xhr.response, fileName) + }.bind(this) + + xhr.onerror = function () { + teaweb.warn("下载失败，请检查网络后重试") + } + + xhr.send() + } + + this.parseFileName = function (disposition) { + if (typeof disposition != "string" || disposition.length == 0) { + return "" + } + + let utf8Match = disposition.match(/filename\*=UTF-8''([^;]+)/i) + if (utf8Match != null && utf8Match.length > 1) { + try { + return decodeURIComponent(utf8Match[1]) + } catch (_e) { + } + } + + let plainMatch = disposition.match(/filename="?([^";]+)"?/i) + if (plainMatch != null && plainMatch.length > 1) { + return plainMatch[1] + } + + return "" + } + + this.saveBlob = function (blob, fileName) { + if (window.navigator != null && typeof window.navigator.msSaveOrOpenBlob == "function") { + window.navigator.msSaveOrOpenBlob(blob, fileName) + return + } + + let objectURL = window.URL.createObjectURL(blob) + let a = document.createElement("a") + a.style.display = "none" + a.href = objectURL + a.download = fileName + document.body.appendChild(a) + a.click() + setTimeout(function () { + window.URL.revokeObjectURL(objectURL) + if (a.parentNode != null) { + a.parentNode.removeChild(a) + } + }, 30000) + } +}) diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/sdkUpload.html b/EdgeAdmin/web/views/@default/httpdns/apps/sdkUpload.html new file mode 100644 index 0000000..3e1265a --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/sdkUpload.html @@ -0,0 +1,86 @@ +{$layout} + + + {{app.name}} + » + SDK 集成 + » +
上传 SDK
+ + +
+ + + + + + + + + + + + + + + + + + + + +
平台 * + +
版本号 * + +

默认 `1.0.0`。同平台+同版本再次上传会覆盖该版本文件。

+
SDK 包 + +

支持 zip 包，例如 `httpdns-sdk-android.zip`，单文件最大 20MB。

+
集成文档 + +

支持 Markdown 文件（`.md`），单文件最大 20MB。

+
+ +
+ 正在上传，请稍候... +
+ + 上传并生效 + + 返回 +
+ +

已上传文件

+ + + + + + + + + + + + + + + + + + + + + + + +
平台类型版本文件名大小更新时间操作
{{file.platform}}{{file.fileType}}{{file.version}}{{file.name}}{{file.sizeText}}{{file.updatedAt}}删除
+
+ 暂无上传记录。 +
diff --git a/EdgeAdmin/web/views/@default/httpdns/apps/sdkUpload.js b/EdgeAdmin/web/views/@default/httpdns/apps/sdkUpload.js new file mode 100644 index 0000000..67f5df2 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/apps/sdkUpload.js @@ -0,0 +1,50 @@ +Tea.context(function () { + this.platform = "android"; + this.version = this.defaultVersion || "1.0.0"; + this.isUploading = false; + + if (!Array.isArray(this.uploadedFiles)) { + this.uploadedFiles = []; + } + + this.beforeUpload = function () { + var maxSize = 20 * 1024 * 1024; // 20MB + var inputs = document.querySelectorAll("input[type=file]"); + for (var i = 0; i < inputs.length; i++) { + var files = inputs[i].files; + if (files != null && files.length > 0) { + if (files[0].size > maxSize) { + teaweb.warn("文件 \"" + files[0].name + "\" 超过 20MB 限制（" + (files[0].size / 1024 / 1024).toFixed(1) + "MB），请压缩后重试"); + return false; + } + } + } + this.isUploading = true; + }; + + this.doneUpload = function () { + this.isUploading = false; + }; + + this.successUpload = function () { + teaweb.success("上传成功", function () { + window.location = "/httpdns/apps/sdk?appId=" + this.app.id; + }.bind(this)); + }; + + this.deleteUploadedFile = function (filename) { + let that = this; + teaweb.confirm("确定要删除文件 " + filename + " 吗？", function () { + that.$post("/httpdns/apps/sdk/upload/delete") + .params({ + appId: that.app.id, + filename: filename + }) + .success(function () { + teaweb.success("删除成功", function () { + window.location.reload(); + }); + }); + }); + }; +}); diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/@cluster_menu.html b/EdgeAdmin/web/views/@default/httpdns/clusters/@cluster_menu.html new file mode 100644 index 0000000..7eccc6c --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/@cluster_menu.html @@ -0,0 +1,4 @@ + + {{cluster.name}} + » + \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/@menu.html b/EdgeAdmin/web/views/@default/httpdns/clusters/@menu.html new file mode 100644 index 0000000..f130779 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/@menu.html @@ -0,0 +1,6 @@ + + + 集群列表 + | + [创建新集群] + diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/certs.html b/EdgeAdmin/web/views/@default/httpdns/clusters/certs.html new file mode 100644 index 0000000..6955460 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/certs.html @@ -0,0 +1,30 @@ +{$layout} +{$template "menu"} +{$template "/left_menu_with_menu"} + +
+

HTTPS 接口证书

+

用于 HTTPDNS 接口证书管理与展示。

+ + + + + + + + + + + + + + + + + + + + + +
证书名称颁发机构到期时间证书ID
{{cert.name}}{{cert.issuer}}{{cert.expiresAt}}{{cert.id}}
暂无证书。
+
diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster.html b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster.html new file mode 100644 index 0000000..acabed0 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster.html @@ -0,0 +1,105 @@ +{$layout} + + + {{cluster.name}} + » +
节点列表
+ 创建节点 + + +
+ +
+
+ +
+
+ +
+
+ +
+
+ +   + [清除条件] +
+
+
+ +
+

当前集群下暂时还没有节点。

+ + + + + + + + + + + + + + + + + + + + + + + + +
节点名称IP地址CPU内存负载状态操作
+ {{node.name}} + +
+ {{node.region.name}} +
+ 		+ - +
+
{{addr.ip}} + （{{addr.name}}） + [内] +
+
+ 		+ {{node.status.cpuUsageText}} + - + + {{node.status.memUsageText}} + - + + {{node.status.load1m}} + - + +
+ 宕机 +
+
+ 未启用 +
+
+ 在线 + 离线 +
+ 		+ 详情   + 删除 +
+
diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster.js b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster.js new file mode 100644 index 0000000..3271457 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster.js @@ -0,0 +1,17 @@ +Tea.context(function () { + this.deleteNode = function (nodeId) { + let that = this + teaweb.confirm("确定要删除此节点吗？", function () { + that.$post("/httpdns/clusters/deleteNode") + .params({ + clusterId: that.clusterId, + nodeId: nodeId + }) + .success(function () { + teaweb.success("删除成功", function () { + teaweb.reload() + }) + }) + }) + } +}) diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/@node_menu.html b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/@node_menu.html new file mode 100644 index 0000000..20f6854 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/@node_menu.html @@ -0,0 +1,10 @@ + + {{currentCluster.name}} + » + 节点列表 + | + 节点详情 + 运行日志 + 修改设置 + 安装节点 + diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.css b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.css new file mode 100644 index 0000000..1b23bc8 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.css @@ -0,0 +1,4 @@ +a.underline { + border-bottom: 1px #db2828 dashed; +} +/*# sourceMappingURL=index.css.map */ \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.css.map b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.css.map new file mode 100644 index 0000000..31fa663 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,CAAC;EACA,iCAAA","file":"index.css"} \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.html b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.html new file mode 100644 index 0000000..3886c71 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.html @@ -0,0 +1,191 @@ +{$layout} + +{$template "node_menu"} + +

节点详情

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
节点名称{{node.name}}
状态
IP地址 +
+
+
+ {{address.ip}} + （{{address.name}}，不公开访问）  + [off] + [down] + （不公开访问） +
+
+
+
+ 暂时还没有填写 IP 地址。 +
+
SSH主机地址 +
+ {{node.login.params.host}} + 尚未设置 +
+
尚未设置
+
SSH主机端口 +
+ {{node.login.params.port}} + 尚未设置 +
+ 尚未设置 +
SSH登录认证 + + 尚未设置 +
API节点地址 +
+ {{addr}} +
+ 使用全局设置 +
+
+ +

运行状态

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
运行状态 +
+ 运行中  + [通过SSH停止] + [停止中...] +
+
+ 已断开  + [通过SSH启动] + [启动中...] + 去安装 > +
+
CPU用量 + {{node.status.cpuUsageText}} +   + （{{node.status.cpuPhysicalCount}}核心/{{node.status.cpuLogicalCount}}线程） +
内存用量{{node.status.memUsageText}}
负载 + {{node.status.load1m}}   {{node.status.load5m}}   {{node.status.load15m}} +   + +
版本 + v{{node.status.buildVersion}} +   + 发现新版本 v{{newVersion}} » +
主程序位置{{node.status.exePath}}
最近API连接状况 + + 连接错误异常严重（{{round(100 - node.status.apiSuccessPercent)}}%失败），请改善当前节点和API节点之间通讯 + 连接错误较多（{{round(100 - node.status.apiSuccessPercent)}}%失败），请改善当前节点和API节点之间通讯 + 有连接错误发生（{{round(100 - node.status.apiSuccessPercent)}}%失败），请改善当前节点和API节点之间通讯 + + 连接良好 + 连接基本稳定（平均{{round(node.status.apiAvgCostSeconds)}}秒） + 连接速度较慢（平均{{round(node.status.apiAvgCostSeconds)}}秒） + 连接非常慢（平均{{round(node.status.apiAvgCostSeconds)}}秒），请改善当前节点和API节点之间通讯 + + + 尚未上报数据 +
上次更新时间 + {{nodeDatetime}} +

当前节点时间与API节点时间相差 {{nodeTimeDiff}} 秒，请同步节点时间。

+
+

每隔30秒钟更新一次运行状态。

+ +
+

安装信息

+ + + + + + + + + + + + + + + + + +
节点ID (id){{node.uniqueId}}
密钥 (secret){{node.secret}}
安装目录 +
使用集群设置（{{node.cluster.installDir}}）
+ {{node.installDir}} +
已安装 + 已安装 + 未安装 +
+ diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.js b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.js new file mode 100644 index 0000000..dabc459 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.js @@ -0,0 +1,39 @@ +Tea.context(function () { + this.isStarting = false + this.startNode = function () { + this.isStarting = true + this.$post('/httpdns/clusters/cluster/node/start') + .params({ + nodeId: this.node.id + }) + .success(function () { + teaweb.success('启动成功', function () { + teaweb.reload() + }) + }) + .done(function () { + this.isStarting = false + }) + } + + this.isStopping = false + this.stopNode = function () { + this.isStopping = true + this.$post('/httpdns/clusters/cluster/node/stop') + .params({ + nodeId: this.node.id + }) + .success(function () { + teaweb.success('执行成功', function () { + teaweb.reload() + }) + }) + .done(function () { + this.isStopping = false + }) + } + + this.round = function (f) { + return Math.round(f * 100) / 100 + } +}) diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.less b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.less new file mode 100644 index 0000000..48f0e93 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/index.less @@ -0,0 +1,3 @@ +a.underline { + border-bottom: 1px #db2828 dashed; +} \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.css b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.css new file mode 100644 index 0000000..9e8d1e9 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.css @@ -0,0 +1,7 @@ +.installing-box { + line-height: 1.8; +} +.installing-box .blue { + color: #2185d0; +} +/*# sourceMappingURL=install.css.map */ \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.css.map b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.css.map new file mode 100644 index 0000000..5e4d089 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["install.less"],"names":[],"mappings":"AAAA;EACC,gBAAA;;AADD,eAGC;EACC,cAAA","file":"install.css"} \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.html b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.html new file mode 100644 index 0000000..421f9a0 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.html @@ -0,0 +1,101 @@ +{$layout} +{$template "node_menu"} +{$template "/code_editor"} + + +
+
当前节点为已安装状态。
+ [重新安装] + +

配置文件

+ + + + + + + + + + + + + +
配置文件 + configs/api_httpdns.yaml   + [下载] +
配置内容 + rpc.endpoints: [ {{apiEndpoints}} ] +nodeId: "{{node.uniqueId}}" +secret: "{{node.secret}}" +

每个节点的配置文件内容均不相同，不能混用。

+
安装目录 +
使用集群设置（{{node.cluster.installDir}}） +
+ {{node.installDir}} +
+
+ + +
+

方法1：通过SSH自动安装

+ + + + + + +
SSH地址 + {{sshAddr}}   [修改] + 尚未设置   [设置] +
+ +
+
安装中...
+
+ 已安装成功 + 安装过程中发生错误：{{installStatus.error}} +
+
+
+ +
+
+ +
+ +

方法2：手动安装

+ + + + + + + + + + + + + +
配置文件 + configs/api_httpdns.yaml   + [下载] +
配置内容 + rpc.endpoints: [ {{apiEndpoints}} ] +nodeId: "{{node.uniqueId}}" +secret: "{{node.secret}}" +

每个节点的配置文件内容均不相同，不能混用。

+
安装目录 +
使用集群设置（{{node.cluster.installDir}}） +
+ {{node.installDir}} +
+ + [修改为已安装状态] +
\ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.js b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.js new file mode 100644 index 0000000..718182b --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.js @@ -0,0 +1,111 @@ +Tea.context(function () { + let isInstalling = false + + this.$delay(function () { + this.reloadStatus(this.nodeId) + }) + + this.install = function () { + isInstalling = true + this.$post("$") + .params({ + nodeId: this.nodeId + }) + .success(function () {}) + } + + this.updateNodeIsInstalled = function (isInstalled) { + let msg = isInstalled + ? "html:确认要将当前节点修改为 已安装 状态吗？" + : "html:确认要将当前节点修改为 未安装 状态吗？" + teaweb.confirm(msg, function () { + this.$post("/httpdns/clusters/cluster/node/updateInstallStatus") + .params({ + nodeId: this.nodeId, + isInstalled: isInstalled ? 1 : 0 + }) + .refresh() + }) + } + + // 刷新状态 + this.reloadStatus = function (nodeId) { + let that = this + + this.$post("/httpdns/clusters/cluster/node/status") + .params({ + nodeId: nodeId + }) + .success(function (resp) { + this.installStatus = resp.data.installStatus + this.node.isInstalled = resp.data.isInstalled + + if (!isInstalling) { + return + } + + let installStatus = this.installStatus || {} + let errMsg = installStatus.error || "" + + if (installStatus.errorCode != null && installStatus.errorCode.length > 0) { + isInstalling = false + } + + switch (installStatus.errorCode) { + case "EMPTY_LOGIN": + case "EMPTY_SSH_HOST": + case "EMPTY_SSH_PORT": + case "EMPTY_GRANT": + teaweb.warn("需要填写SSH登录信息", function () { + teaweb.popup("/httpdns/clusters/updateNodeSSH?nodeId=" + nodeId, { + height: "20em", + callback: function () { + that.install() + } + }) + }) + return + case "SSH_LOGIN_FAILED": + teaweb.warn("SSH登录失败，请检查设置", function () { + teaweb.popup("/httpdns/clusters/updateNodeSSH?nodeId=" + nodeId, { + height: "20em", + callback: function () { + that.install() + } + }) + }) + return + case "CREATE_ROOT_DIRECTORY_FAILED": + teaweb.warn("创建根目录失败，请检查目录权限或者手工创建：" + errMsg) + return + case "INSTALL_HELPER_FAILED": + teaweb.warn("安装助手失败：" + errMsg) + return + case "TEST_FAILED": + teaweb.warn("环境测试失败：" + errMsg) + return + case "RPC_TEST_FAILED": + teaweb.confirm("html:要安装的节点到API服务之间的RPC通讯测试失败，具体错误：" + errMsg + "，
现在修改API信息？", function () { + window.location = "/settings/api" + }) + return + } + }) + .done(function () { + this.$delay(function () { + that.reloadStatus(nodeId) + }, 1000) + }) + } + + this.showSSHPopup = function (nodeId) { + teaweb.popup("/httpdns/clusters/updateNodeSSH?nodeId=" + nodeId, { + height: "20em", + callback: function () { + teaweb.success("保存成功", function () { + teaweb.reload() + }) + } + }) + } +}) diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.less b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.less new file mode 100644 index 0000000..cbe1416 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.less @@ -0,0 +1,7 @@ +.installing-box { + line-height: 1.8; + + .blue { + color: #2185d0; + } +} \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.css b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.css new file mode 100644 index 0000000..dafa156 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.css @@ -0,0 +1,5 @@ +pre.log-box { + margin: 0; + padding: 0; +} +/*# sourceMappingURL=logs.css.map */ \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.css.map b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.css.map new file mode 100644 index 0000000..6ae867b --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["logs.less"],"names":[],"mappings":"AAAA,GAAG;EACF,SAAA;EACA,UAAA","file":"logs.css"} \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.html b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.html new file mode 100644 index 0000000..50e7cab --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.html @@ -0,0 +1,48 @@ +{$layout} +{$template "node_menu"} +{$template "/datepicker"} + +
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ [清除条件] +
+
+
+ +

暂时还没有日志。

+ + + + + + + +
+ +
+ +
diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.js b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.js new file mode 100644 index 0000000..29a9042 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.js @@ -0,0 +1,6 @@ +Tea.context(function () { + this.$delay(function () { + teaweb.datepicker("day-from-picker") + teaweb.datepicker("day-to-picker") + }) +}) \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.less b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.less new file mode 100644 index 0000000..9accd63 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/logs.less @@ -0,0 +1,4 @@ +pre.log-box { + margin: 0; + padding: 0; +} \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/update.html b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/update.html new file mode 100644 index 0000000..4f3cc14 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/update.html @@ -0,0 +1,62 @@ +{$layout} + +{$template "node_menu"} + +

修改节点

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
节点名称 * + +
所属集群 + +

当前版本暂不支持在此页面变更节点所属集群。

+
IP地址 + +
启用当前节点 +
+ + +
+
SSH 主机地址 + +

例如 192.168.1.100

+
SSH 主机端口 + +

例如 22

+
SSH 登录认证 + +
+ +
\ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/update.js b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/update.js new file mode 100644 index 0000000..40d03d1 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/update.js @@ -0,0 +1,25 @@ +Tea.context(function () { + if (typeof this.clusterId !== "number" || this.clusterId <= 0) { + this.clusterId = 0 + } + if (this.clusterId <= 0 && this.node.cluster != null && this.node.cluster.id > 0) { + this.clusterId = this.node.cluster.id + } + + this.success = NotifySuccess("保存成功", "/httpdns/clusters/cluster/node?clusterId=" + this.clusterId + "&nodeId=" + this.node.id) + + if (typeof this.sshHost !== "string") { + this.sshHost = "" + } + + let sshPort = parseInt(this.sshPort) + if (isNaN(sshPort) || sshPort <= 0) { + this.sshPort = 22 + } else { + this.sshPort = sshPort + } + + if (typeof this.loginId !== "number") { + this.loginId = 0 + } +}) diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/clusterSettings.html b/EdgeAdmin/web/views/@default/httpdns/clusters/clusterSettings.html new file mode 100644 index 0000000..cd411ec --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/clusterSettings.html @@ -0,0 +1,120 @@ +{$layout} + +{$var "header"} + + +{$end} + + + {{cluster.name}} + » +
集群设置
+ + +{$template "/left_menu_with_menu"} + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
集群名称 * + +

用于在系统内部标识该 HTTPDNS 集群。

+
服务域名 * + +

当前集群对外提供 HTTPDNS 服务的接入域名。

+
节点安装根目录 + +

边缘节点安装 HTTPDNS 服务的默认目录，通常保持默认即可。

+
默认解析 TTL +
+ + 秒 +
+

SDK 通过 HTTPDNS 解析域名时返回的默认 TTL。

+
降级超时容忍度 +
+ + 毫秒 +
+

节点回源查询上游 DNS 时的最大等待时间。

+
自动远程启动 + +

当检测到节点离线时，自动尝试远程启动（前提是节点已经设置了SSH登录认证）。

+
访问日志 + +

启用后，HTTPDNS 节点将会记录客户端的请求访问日志。

+
时区 +
+ 当前：{{timeZoneLocation.name}} + ({{timeZoneLocation.offset}}) +
+
+ +
+

HTTPDNS 节点进程使用的时区设置，默认为 Asia/Shanghai。

+
启用当前集群 + +

取消启用后，该集群不会参与 HTTPDNS 服务。

+
+ + + + + + +
绑定端口 * + +
+ + + + +
+
diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/clusterSettings.js b/EdgeAdmin/web/views/@default/httpdns/clusters/clusterSettings.js new file mode 100644 index 0000000..4f3f97c --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/clusterSettings.js @@ -0,0 +1,33 @@ +Tea.context(function () { + this.success = NotifyReloadSuccess("保存成功") + + this.activeSection = this.activeSection || "basic" + this.tlsAdvancedVisible = false + + if (!this.settings) { + this.settings = {} + } + + let toBool = function (v) { + if (typeof v === "boolean") { + return v + } + if (typeof v === "number") { + return v === 1 + } + if (typeof v === "string") { + let s = v.toLowerCase().trim() + return s === "1" || s === "true" || s === "on" || s === "yes" || s === "enabled" + } + return false + } + + this.settings.autoRemoteStart = toBool(this.settings.autoRemoteStart) + this.settings.accessLogIsOn = toBool(this.settings.accessLogIsOn) + this.settings.isOn = toBool(this.settings.isOn) + + if (!this.settings.timeZone || this.settings.timeZone.length == 0) { + this.settings.timeZone = "Asia/Shanghai" + } +}) + diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/create.html b/EdgeAdmin/web/views/@default/httpdns/clusters/create.html new file mode 100644 index 0000000..b1e532c --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/create.html @@ -0,0 +1,62 @@ +{$layout} +{$template "menu"} + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
集群名称 * + +

用于在系统内部标识该 HTTPDNS 集群。

+
服务域名 * + +

当前集群对外提供 HTTPDNS 服务的接入域名。

+
默认解析 TTL +
+ + 秒 +
+

SDK 通过 HTTPDNS 解析域名时返回的默认 TTL。

+
降级超时容忍度 +
+ + 毫秒 +
+

节点回源查询上游 DNS 时的最大等待时间。

+
节点安装根目录 + +

边缘节点安装 HTTPDNS 服务的默认目录。

+
启用当前集群 +
+ + +
+
+ +
diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/create.js b/EdgeAdmin/web/views/@default/httpdns/clusters/create.js new file mode 100644 index 0000000..0918023 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/create.js @@ -0,0 +1,19 @@ +Tea.context(function () { + this.isOn = true + + this.success = function (resp) { + let clusterId = 0 + if (resp != null && resp.data != null && typeof resp.data.clusterId != "undefined") { + clusterId = resp.data.clusterId + } + if (clusterId > 0) { + teaweb.success("保存成功", function () { + window.location = "/httpdns/clusters/cluster?clusterId=" + clusterId + }) + return + } + teaweb.success("保存成功", function () { + window.location = "/httpdns/clusters" + }) + } +}) diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.css b/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.css new file mode 100644 index 0000000..e2dadd6 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.css @@ -0,0 +1,7 @@ +.left-box { + top: 10em; +} +.right-box { + top: 10em; +} +/*# sourceMappingURL=createNode.css.map */ \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.css.map b/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.css.map new file mode 100644 index 0000000..fd804f1 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["createNode.less"],"names":[],"mappings":"AAAA;EACC,SAAA;;AAGD;EACC,SAAA","file":"createNode.css"} \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.html b/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.html new file mode 100644 index 0000000..2b9a796 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.html @@ -0,0 +1,28 @@ +{$layout} + + + {{cluster.name}} + » +
创建节点
+ + +
+ + + + + + + + + + + +
节点名称 * + +
安装目录 + +

默认使用集群配置目录。

+
+ +
diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.js b/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.js new file mode 100644 index 0000000..3299ea8 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.js @@ -0,0 +1,3 @@ +Tea.context(function () { + this.success = NotifySuccess("保存成功", "/httpdns/clusters/cluster?clusterId=" + this.clusterId) +}) diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.less b/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.less new file mode 100644 index 0000000..f54837f --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/createNode.less @@ -0,0 +1,7 @@ +.left-box { + top: 10em; +} + +.right-box { + top: 10em; +} \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/delete.html b/EdgeAdmin/web/views/@default/httpdns/clusters/delete.html new file mode 100644 index 0000000..0a1ca65 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/delete.html @@ -0,0 +1,11 @@ +{$layout} + + + {{cluster.name}} + » +
删除集群
+ + +
+ +
diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/delete.js b/EdgeAdmin/web/views/@default/httpdns/clusters/delete.js new file mode 100644 index 0000000..d8d3cfb --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/delete.js @@ -0,0 +1,16 @@ +Tea.context(function () { + this.deleteCluster = function (clusterId) { + let that = this + teaweb.confirm("确定要删除此集群吗？", function () { + that.$post("/httpdns/clusters/delete") + .params({ + clusterId: clusterId + }) + .success(function () { + teaweb.success("删除成功", function () { + window.location = "/httpdns/clusters" + }) + }) + }) + } +}) diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/index.html b/EdgeAdmin/web/views/@default/httpdns/clusters/index.html new file mode 100644 index 0000000..d8298c0 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/index.html @@ -0,0 +1,76 @@ +{$layout} +{$template "menu"} + +
+ +
+
+ +
有部分集群节点状态异常，请及时处理。
+
+ +
+
+
+ +
+
+ + [清除条件] +
+
+
+ +

暂时还没有 HTTPDNS 集群，现在去 [创建新集群]。

+ + + + + + + + + + + + + + + + + + + + + + +
集群名称API服务地址节点数在线节点数状态操作
+ + {{cluster.name}} + + + {{cluster.apiAddress}} + + + {{cluster.countAllNodes}} + + - + + + + + {{cluster.countActiveNodes}} + + - + + 详情 +
+ +
+
diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/index.js b/EdgeAdmin/web/views/@default/httpdns/clusters/index.js new file mode 100644 index 0000000..a49983b --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/index.js @@ -0,0 +1,17 @@ +Tea.context(function () { + this.hasErrorLogs = false; // Mock data + if (typeof this.clusters == "undefined") { + this.clusters = []; + } + + this.deleteCluster = function (clusterId) { + let that = this; + teaweb.confirm("确定要删除这个集群吗？", function () { + that.$post(".delete") + .params({ + clusterId: clusterId + }) + .refresh(); + }); + }; +}); diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/updateNodeSSH.html b/EdgeAdmin/web/views/@default/httpdns/clusters/updateNodeSSH.html new file mode 100644 index 0000000..b95ec99 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/updateNodeSSH.html @@ -0,0 +1,31 @@ +{$layout "layout_popup"} + +

修改节点"{{node.name}}"的SSH登录信息

+ +
+ + + + + + + + + + + + + + + +
SSH主机地址 * + +

比如 192.168.1.100

+
SSH主机端口 * + +

比如 22。

+
SSH登录认证 * + +
+ +
\ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/updateNodeSSH.js b/EdgeAdmin/web/views/@default/httpdns/clusters/updateNodeSSH.js new file mode 100644 index 0000000..1d5e8e7 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/updateNodeSSH.js @@ -0,0 +1,8 @@ +Tea.context(function () { + if (typeof this.params == "undefined" || this.params == null) { + this.params = {host: "", port: 22} + } + if (this.params.port <= 0) { + this.params.port = 22 + } +}) diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/upgradeRemote.html b/EdgeAdmin/web/views/@default/httpdns/clusters/upgradeRemote.html new file mode 100644 index 0000000..be8cc61 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/upgradeRemote.html @@ -0,0 +1,62 @@ +{$layout} + +

暂时没有需要升级的节点。

+ +
+

+ 所有需要升级的节点 + +

+ + + + + + + + + + + + + + + + + + + + + + + +
+ + 节点名访问IPSSH地址版本变化节点状态操作
+ + + {{node.name}} + [详情] + + {{node.accessIP}} + - + + + {{node.loginParams.host}}:{{node.loginParams.port}} + + 没有设置 + v{{node.oldVersion}} -> v{{node.newVersion}} +
+
升级中...
+
+ 已升级成功 + 升级过程中发生错误：{{node.installStatus.error}} +
+
+ 等待升级 + 		+ 升级 + 升级中... + 升级 +
+
diff --git a/EdgeAdmin/web/views/@default/httpdns/clusters/upgradeRemote.js b/EdgeAdmin/web/views/@default/httpdns/clusters/upgradeRemote.js new file mode 100644 index 0000000..ee7c383 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/clusters/upgradeRemote.js @@ -0,0 +1,147 @@ +Tea.context(function () { + this.isInstalling = false + this.isBatch = false + let installingNode = null + + this.nodes.forEach(function (v) { + v.isChecked = false + }) + + this.$delay(function () { + this.reload() + }) + + let that = this + + this.checkNodes = function (isChecked) { + this.nodes.forEach(function (v) { + v.isChecked = isChecked + }) + } + + this.countCheckedNodes = function () { + return that.nodes.$count(function (k, v) { + return v.isChecked + }) + } + + this.installNode = function (node) { + let that = this + if (this.isBatch) { + installingNode = node + that.isInstalling = true + node.isInstalling = true + + that.$post("$") + .params({ + nodeId: node.id + }) + } else { + teaweb.confirm("确定要开始升级此节点吗？", function () { + installingNode = node + that.isInstalling = true + node.isInstalling = true + + that.$post("$") + .params({ + nodeId: node.id + }) + }) + } + } + + this.installBatch = function () { + let that = this + this.isBatch = true + teaweb.confirm("确定要批量升级选中的节点吗？", function () { + that.installNext() + }) + } + + this.installNext = function () { + let nextNode = this.nodes.$find(function (k, v) { + return v.isChecked + }) + + if (nextNode == null) { + teaweb.success("全部升级成功", function () { + teaweb.reload() + }) + } else { + this.installNode(nextNode) + } + return + } + + this.reload = function () { + let that = this + if (installingNode != null) { + this.$post("/httpdns/clusters/upgradeStatus") + .params({ + nodeId: installingNode.id + }) + .success(function (resp) { + if (resp.data.status != null) { + installingNode.installStatus = resp.data.status + if (installingNode.installStatus.isFinished) { + if (installingNode.installStatus.isOk) { + installingNode.isChecked = false + installingNode = null + if (that.isBatch) { + that.installNext() + } else { + teaweb.success("升级成功", function () { + teaweb.reload() + }) + } + } else { + let nodeId = installingNode.id + let errMsg = installingNode.installStatus.error + that.isInstalling = false + installingNode.isInstalling = false + installingNode = null + + switch (resp.data.status.errorCode) { + case "EMPTY_LOGIN": + case "EMPTY_SSH_HOST": + case "EMPTY_SSH_PORT": + case "EMPTY_GRANT": + teaweb.warn("需要填写SSH登录信息", function () { + teaweb.popup("/httpdns/clusters/updateNodeSSH?nodeId=" + nodeId, { + height: "20em", + callback: function () { + teaweb.reload() + } + }) + }) + return + case "CREATE_ROOT_DIRECTORY_FAILED": + teaweb.warn("创建根目录失败，请检查目录权限或手工创建：" + errMsg) + return + case "INSTALL_HELPER_FAILED": + teaweb.warn("安装助手失败：" + errMsg) + return + case "TEST_FAILED": + teaweb.warn("环境测试失败：" + errMsg) + return + case "RPC_TEST_FAILED": + teaweb.confirm("html:要升级的节点到API服务之间的RPC通讯测试失败，具体错误：" + errMsg + "，
现在修改API信息？", function () { + window.location = "/settings/api" + }) + return + default: + teaweb.warn("升级失败：" + errMsg) + } + } + } + } + }) + .done(function () { + setTimeout(this.reload, 3000) + }) + } else { + setTimeout(this.reload, 3000) + } + } +}) + diff --git a/EdgeAdmin/web/views/@default/httpdns/ech/@menu.html b/EdgeAdmin/web/views/@default/httpdns/ech/@menu.html new file mode 100644 index 0000000..b4f2af8 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/ech/@menu.html @@ -0,0 +1,4 @@ + + + ECH 控制台 + \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/ech/audit.html b/EdgeAdmin/web/views/@default/httpdns/ech/audit.html new file mode 100644 index 0000000..734b7c2 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/ech/audit.html @@ -0,0 +1,26 @@ +{$layout} +{$template "menu"} +{$template "/left_menu_with_menu"} + +
+

ECH Degrade Audit Logs

+ + + + + + + + + + + + + + + + + + +
ScopeOperatorResultTime
{{item.scope}}{{item.operator}}{{item.result}}{{item.createdAt}}
+
diff --git a/EdgeAdmin/web/views/@default/httpdns/ech/index.html b/EdgeAdmin/web/views/@default/httpdns/ech/index.html new file mode 100644 index 0000000..2948eeb --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/ech/index.html @@ -0,0 +1,69 @@ +{$layout} +{$template "menu"} + +
+
+
+
+

全网私钥热加载成功率

+
{{ (health.keySyncRate * + 100).toFixed(2) }}%
+
+
+
+
+

全网 ECH 解密失败阻断率

+
{{ (health.decryptFailRate * + 100).toFixed(4) }}%
+
+
+
+ +
+ +
+ 生产证书轮换日志 + 降级操作审计 +
+
+ + + + + + + + + + + + + + + + + + + + + + +
发行版本号记录分发类型公钥发布时间边缘扩散状态受控回落通道
{{log.version}}当前生效{{log.recordType}} +
+ {{log.publicKey.substring(0,30)}}...{{log.publicKey.substring(log.publicKey.length-10)}} +
+ 		{{log.publishTime}} + 100% 同步 + 正在扩散到 {{log.nodesPending}} + 节点 + 部分节点超时 + + 回滚降级 + (MFA验证) + - +
+
\ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/ech/index.js b/EdgeAdmin/web/views/@default/httpdns/ech/index.js new file mode 100644 index 0000000..e1c1433 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/ech/index.js @@ -0,0 +1,25 @@ +Tea.context(function () { + if (typeof this.health == "undefined") { + this.health = { + keySyncRate: 1.0, + decryptFailRate: 0.0 + }; + } + + if (typeof this.echLogs == "undefined") { + this.echLogs = []; + } + + this.openMfaRollback = function (logId) { + teaweb.popup("/httpdns/ech/rollbackMfaPopup?logId=" + logId, { + height: "26em", + width: "48em", + title: "全域安全受控降级告警：双人MFA授权", + callback: function () { + teaweb.success("保存成功", function () { + teaweb.reload(); + }); + } + }); + }; +}); diff --git a/EdgeAdmin/web/views/@default/httpdns/ech/rollbackMfaPopup.html b/EdgeAdmin/web/views/@default/httpdns/ech/rollbackMfaPopup.html new file mode 100644 index 0000000..8232582 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/ech/rollbackMfaPopup.html @@ -0,0 +1,27 @@ +{$layout "layout_popup"} + +

受控 ECH 回滚降级

+ +
+ + + + + + + + + + + + + + + + + + + +
日志编号{{logId}}
回滚原因 *
审批人 OTP 验证码 #1 *
审批人 OTP 验证码 #2 *
+ +
diff --git a/EdgeAdmin/web/views/@default/httpdns/resolveLogs/@menu.html b/EdgeAdmin/web/views/@default/httpdns/resolveLogs/@menu.html new file mode 100644 index 0000000..72927ed --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/resolveLogs/@menu.html @@ -0,0 +1,3 @@ + + 访问日志 + diff --git a/EdgeAdmin/web/views/@default/httpdns/resolveLogs/index.html b/EdgeAdmin/web/views/@default/httpdns/resolveLogs/index.html new file mode 100644 index 0000000..36be1e5 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/resolveLogs/index.html @@ -0,0 +1,103 @@ +{$layout} + +
+ + + +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ [清除条件] +
+
+
+
+ +
+ +暂时还没有访问日志。 + +
+
+ + + + + + + + + + + + + + + + + + + +
集群节点域名类型概要
{{log.clusterName}}{{log.nodeName}}{{log.domain}}{{log.query}} +
+ {{log.time}} + | {{log.appName}} ({{log.appId}}) + | {{log.clientIp}} + | {{log.os}}/{{log.sdkVersion}} + | {{log.query}} {{log.domain}} -> + {{log.ips}} + [无记录] + | + 成功 + 失败 + ({{log.errorCode}}) + | {{log.costMs}}ms +
+
+
+
\ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/runtimeLogs/@menu.html b/EdgeAdmin/web/views/@default/httpdns/runtimeLogs/@menu.html new file mode 100644 index 0000000..df3b9e1 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/runtimeLogs/@menu.html @@ -0,0 +1,3 @@ + + 运行日志 + diff --git a/EdgeAdmin/web/views/@default/httpdns/runtimeLogs/index.html b/EdgeAdmin/web/views/@default/httpdns/runtimeLogs/index.html new file mode 100644 index 0000000..18cd978 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/runtimeLogs/index.html @@ -0,0 +1,98 @@ +{$layout} + +
+{$template "/datepicker"} + + + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ [清除条件] +
+
+
+ +
+ +暂时还没有运行日志。 + + + + + + + + + + + + + + + + +
集群节点信息
+ {{log.clusterName}} + + + - + + {{log.nodeName}} + + + - + +
+ + [{{log.createdTime}}] + [{{log.tag}}] + {{log.description}} + + 共{{log.count}}条 +
+
\ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/runtimeLogs/index.js b/EdgeAdmin/web/views/@default/httpdns/runtimeLogs/index.js new file mode 100644 index 0000000..3047bcc --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/runtimeLogs/index.js @@ -0,0 +1,9 @@ +Tea.context(function () { + this.clusterId = ""; + this.nodeId = ""; + + this.$delay(function () { + teaweb.datepicker("day-from-picker"); + teaweb.datepicker("day-to-picker"); + }); +}); diff --git a/EdgeAdmin/web/views/@default/httpdns/sandbox/@menu.html b/EdgeAdmin/web/views/@default/httpdns/sandbox/@menu.html new file mode 100644 index 0000000..397eae3 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/sandbox/@menu.html @@ -0,0 +1,4 @@ + + + 解析测试 + \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/httpdns/sandbox/index.html b/EdgeAdmin/web/views/@default/httpdns/sandbox/index.html new file mode 100644 index 0000000..fc0e481 --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/sandbox/index.html @@ -0,0 +1,147 @@ +{$layout} + +
+ +
+
+ +
+
+

解析测试

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +

用于测试 ECS 掩码与区域调度效果。

+
+
+ +
+ + +
+
+ +
+ + + +
+
+
+ + +
+ +
+

请在左侧配置参数后点击「在线解析」。

+
+ + +
+
+
解析中...
+
+
+ + +
+ +
+
+ 解析成功 + 解析失败 ({{response.code}}) +
+

{{response.message}}

+

Request ID: {{response.requestId}}

+
+ + +
+
解析结果
+
+
请求URL
+
+ {{response.data.request_url || '-'}} +
+
+ +
解析结果详情
+
+
+
+
客户端 IP
+
+ {{response.data.client_ip || request.clientIp || '-'}}
+
+
+
+
+
地区
+
{{response.data.client_region || '-'}}
+
+
+
+
+
线路
+
{{response.data.line_name || '-'}}
+
+
+
+ + +
解析记录
+ + + + + + + + + + + + + + + + + + + + + +
解析域名解析类型IP地址TTL地区线路
{{row.domain || + request.domain}}{{row.type || request.qtype}}{{row.ip}}{{row.ttl}}s{{row.region || '-'}}{{row.line || '-'}}
+
+
+
+
+
diff --git a/EdgeAdmin/web/views/@default/httpdns/sandbox/index.js b/EdgeAdmin/web/views/@default/httpdns/sandbox/index.js new file mode 100644 index 0000000..f7c6bcf --- /dev/null +++ b/EdgeAdmin/web/views/@default/httpdns/sandbox/index.js @@ -0,0 +1,160 @@ +Tea.context(function () { + this.newRequest = function () { + return { + appId: "", + clusterId: "", + domain: "", + clientIp: "", + qtype: "A" + } + } + + this.request = this.newRequest() + + this.response = { + hasResult: false, + code: -1, + message: "", + data: null, + requestId: "", + resultRows: [] + } + + this.isRequesting = false + this.currentDomains = [] + this.currentClusters = [] + + if (typeof this.apps === "undefined") { + this.apps = [] + } + if (typeof this.clusters === "undefined") { + this.clusters = [] + } + + this.onAppChanged = function () { + let selectedApp = null + for (let i = 0; i < this.apps.length; i++) { + if (this.apps[i].appId === this.request.appId) { + selectedApp = this.apps[i] + break + } + } + + if (selectedApp == null) { + this.currentDomains = [] + this.currentClusters = [] + this.request.domain = "" + this.request.clusterId = "" + return + } + + this.currentDomains = Array.isArray(selectedApp.domains) ? selectedApp.domains : [] + + if (this.currentDomains.length > 0) { + if (this.currentDomains.indexOf(this.request.domain) < 0) { + this.request.domain = this.currentDomains[0] + } + } else { + this.request.domain = "" + } + + let appClusterIds = Array.isArray(selectedApp.clusterIds) ? selectedApp.clusterIds.map(Number) : [] + + let allowed = [] + for (let i = 0; i < this.clusters.length; i++) { + let cluster = this.clusters[i] + let clusterId = Number(cluster.id) + if (clusterId <= 0) { + continue + } + if (appClusterIds.indexOf(clusterId) >= 0) { + allowed.push(cluster) + } + } + this.currentClusters = allowed + + if (allowed.length > 0) { + if (!allowed.some((c) => String(c.id) === String(this.request.clusterId))) { + this.request.clusterId = String(allowed[0].id) + } + } else { + this.request.clusterId = "" + } + } + + this.normalizeResultRows = function (data) { + if (typeof data === "undefined" || data == null) { + return [] + } + + if (Array.isArray(data.records) && data.records.length > 0) { + return data.records + } + + let rows = [] + let ips = Array.isArray(data.ips) ? data.ips : [] + let domain = this.request.domain + let qtype = this.request.qtype + let ttl = data.ttl || 0 + let region = data.client_region || "-" + let line = data.line_name || "-" + + ips.forEach(function (ip) { + rows.push({ + domain: domain, + type: qtype, + ip: ip, + ttl: ttl, + region: region, + line: line + }) + }) + + return rows + } + + this.sendTestRequest = function () { + if (this.request.appId.length === 0) { + teaweb.warn("请选择目标应用") + return + } + if (this.request.clusterId.length === 0) { + teaweb.warn("当前应用未绑定可用集群，请先在应用设置中配置所属集群") + return + } + if (this.request.domain.length === 0) { + teaweb.warn("请选择要解析的域名") + return + } + + this.isRequesting = true + this.response.hasResult = false + + let payload = Object.assign({}, this.request) + + this.$post("/httpdns/sandbox/test") + .params(payload) + .success(function (resp) { + this.response = resp.data.result + this.response.hasResult = true + this.response.resultRows = this.normalizeResultRows(this.response.data) + }) + .done(function () { + this.isRequesting = false + }) + } + + this.resetForm = function () { + this.request = this.newRequest() + this.currentDomains = [] + this.currentClusters = [] + this.response = { + hasResult: false, + code: -1, + message: "", + data: null, + requestId: "", + resultRows: [] + } + } +}) diff --git a/EdgeAdmin/web/views/@default/ns/clusters/cluster/index.html b/EdgeAdmin/web/views/@default/ns/clusters/cluster/index.html index 57b5f7c..78b0bfd 100644 --- a/EdgeAdmin/web/views/@default/ns/clusters/cluster/index.html +++ b/EdgeAdmin/web/views/@default/ns/clusters/cluster/index.html @@ -52,7 +52,7 @@ {{node.name}} -
+
v{{node.status.version}} -> v{{latestVersion}}
@@ -112,4 +112,4 @@ -
\ No newline at end of file +
diff --git a/EdgeAdmin/web/views/@default/settings/authority/index.html b/EdgeAdmin/web/views/@default/settings/authority/index.html index 0696884..7e50216 100644 --- a/EdgeAdmin/web/views/@default/settings/authority/index.html +++ b/EdgeAdmin/web/views/@default/settings/authority/index.html @@ -97,4 +97,4 @@

数据更新于{{key.updatedTime}}。

-
+
\ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/settings/ui/index.html b/EdgeAdmin/web/views/@default/settings/ui/index.html index bca8794..3c528df 100644 --- a/EdgeAdmin/web/views/@default/settings/ui/index.html +++ b/EdgeAdmin/web/views/@default/settings/ui/index.html @@ -1,45 +1,38 @@ {$layout}
- + - - - - - - - - - - - - - - - - - - - +
产品名称 * - -

可以使用变量${product.name}在网页里展示此名称，建议仅包含英文和数字字符。

-
管理员系统名称 * - -

当前管理系统界面上显示的名称。

-
显示版本号 - -

选中后，在界面中显示系统版本号。

-
定制版本号 - -

定制自己的版本号，留空表示使用系统自带的版本号。

-
显示模块
+ + + + + + + + + + + + + + + @@ -66,25 +60,27 @@ -
产品名称 * - CDN       - 智能DNS -

当前管理系统中可以显示的模块，不能为空。

+ +

可以使用变量${product.name}在网页里展示此名称，建议仅包含英文和数字字符。
管理员系统名称 * + +

当前管理系统界面上显示的名称。

+
显示版本号 + +

选中后，在界面中显示系统版本号。

+
定制版本号 + +

定制自己的版本号，留空表示使用系统自带的版本号。

+
显示财务相关功能 @@ -51,13 +44,14 @@ 浏览器图标
- +
还没有上传。
- +

在浏览器标签栏显示的图标，请使用PNG格式。

Logo
- +
还没有上传。
- +

显示在系统界面上的图标，请使用PNG格式。
+

其他

@@ -94,12 +90,15 @@
@@ -119,5 +118,5 @@
每页显示数 - +

在有分页的地方每页显示数量；不能超过100。
- +
\ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/settings/upgrade/index.html b/EdgeAdmin/web/views/@default/settings/upgrade/index.html index 79a92a0..53ab4c6 100644 --- a/EdgeAdmin/web/views/@default/settings/upgrade/index.html +++ b/EdgeAdmin/web/views/@default/settings/upgrade/index.html @@ -1,3 +1,139 @@ {$layout} -

此功能暂未开放，敬请期待。

\ No newline at end of file +
+ + +
+

自动升级

+ + + + + +
开启自动升级 +
+ + +
+

开启后，边缘节点、DNS节点、HTTPDNS节点每分钟检查新版本并自动下载升级。关闭后节点不会自动升级，但管理员仍可在下方手动升级。

+
+
+ +
+ + +
+

+ 手动升级 + +

+ +
+

暂无需要升级的节点。

+
+ +
+

+
+ + + {{mod.name}} + {{mod.count}}个待升级 +
+ +

+ +
+
+
+
+ + + {{cluster.name}} + {{cluster.count}}个待升级 +
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+ 		节点名访问IPSSH地址版本变化节点状态操作
+
+ + +
+ 		+ {{node.name}} + + + {{node.accessIP}} + - + + + {{node.loginParams.host}}:{{node.loginParams.port}} + + 没有设置 + + v{{node.oldVersion}} + 未知 + -> v{{node.newVersion}} + +
+
+ 升级中... +
+
+ + 已升级成功 + + 升级过程中发生错误：{{node.installStatus.error}} +
+
+ 等待升级 + 		+ 升级 + 升级中... +
+
+
+
+
+
diff --git a/EdgeAdmin/web/views/@default/settings/upgrade/index.js b/EdgeAdmin/web/views/@default/settings/upgrade/index.js new file mode 100644 index 0000000..3a984c4 --- /dev/null +++ b/EdgeAdmin/web/views/@default/settings/upgrade/index.js @@ -0,0 +1,457 @@ +Tea.context(function () { + let that = this + + // 计算总待升级数 + this.totalUpgradeCount = 0 + this.modules.forEach(function (mod) { + mod.expanded = true + that.totalUpgradeCount += mod.count + if (mod.clusters != null) { + mod.clusters.forEach(function (cluster) { + cluster.expanded = true + if (cluster.nodes != null) { + cluster.nodes.forEach(function (node) { + node.isUpgrading = false + node.isChecked = false + }) + } + }) + } + }) + + // 正在升级的节点ID集合（按模块） + this.upgradingNodeIds = { + "node": [], + "dns": [], + "httpdns": [] + } + + // 启动状态轮询 + this.$delay(function () { + this.pollStatus() + }) + + /** + * 获取节点详情页URL + */ + this.nodeDetailURL = function (moduleCode, clusterId, nodeId) { + switch (moduleCode) { + case "node": + return "/clusters/cluster/node?clusterId=" + clusterId + "&nodeId=" + nodeId + case "dns": + return "/ns/clusters/cluster/node?clusterId=" + clusterId + "&nodeId=" + nodeId + case "httpdns": + return "/httpdns/clusters/cluster/node?clusterId=" + clusterId + "&nodeId=" + nodeId + default: + return "#" + } + } + + /** + * 判断节点升级是否已完成（成功） + */ + this.isNodeUpgradeFinished = function (node) { + return node.installStatus != null && node.installStatus.isFinished && node.installStatus.isOk + } + + /** + * 全选/取消全选 + */ + this.toggleCheckAll = function (cluster) { + if (cluster.nodes == null) return + let allChecked = that.isAllChecked(cluster) + cluster.nodes.forEach(function (node) { + if (!that.isNodeUpgradeFinished(node)) { + node.isChecked = !allChecked + } + }) + } + + /** + * 是否全部选中 + */ + this.isAllChecked = function (cluster) { + if (cluster.nodes == null || cluster.nodes.length == 0) return false + let checkableNodes = cluster.nodes.filter(function (node) { + return !that.isNodeUpgradeFinished(node) + }) + if (checkableNodes.length == 0) return false + return checkableNodes.every(function (node) { return node.isChecked }) + } + + /** + * 计算集群内选中的节点数 + */ + this.countCheckedNodesInCluster = function (cluster) { + if (cluster.nodes == null) return 0 + return cluster.nodes.filter(function (node) { return node.isChecked }).length + } + + /** + * 全部升级 + */ + this.upgradeAll = function () { + var vue = this + teaweb.confirm("确定要升级所有模块的所有待升级节点吗？", function () { + vue.$post("/settings/upgrade/upgradeNode") + .params({ + module: "", + scope: "all", + clusterId: 0, + nodeId: 0 + }) + .success(function () { + // 标记所有节点为升级中 + that.modules.forEach(function (mod) { + if (mod.clusters != null) { + mod.clusters.forEach(function (cluster) { + if (cluster.nodes != null) { + cluster.nodes.forEach(function (node) { + node.installStatus = { + isRunning: true, + isFinished: false, + isOk: false, + error: "", + errorCode: "" + } + node.isUpgrading = true + that.trackNode(mod.code, node.id) + }) + } + }) + } + }) + }) + .fail(function (resp) { + teaweb.warn("升级请求失败：" + resp.message) + }) + }) + } + + /** + * 按模块升级 + */ + this.upgradeModule = function (moduleCode) { + var vue = this + teaweb.confirm("确定要升级该模块的所有待升级节点吗？", function () { + vue.$post("/settings/upgrade/upgradeNode") + .params({ + module: moduleCode, + scope: "module", + clusterId: 0, + nodeId: 0 + }) + .success(function () { + that.markModuleUpgrading(moduleCode) + }) + .fail(function (resp) { + teaweb.warn("升级请求失败：" + resp.message) + }) + }) + } + + /** + * 按集群升级 + */ + this.upgradeCluster = function (moduleCode, clusterId) { + var vue = this + teaweb.confirm("确定要升级该集群的所有待升级节点吗？", function () { + vue.$post("/settings/upgrade/upgradeNode") + .params({ + module: moduleCode, + scope: "cluster", + clusterId: clusterId, + nodeId: 0 + }) + .success(function () { + that.markClusterUpgrading(moduleCode, clusterId) + }) + .fail(function (resp) { + teaweb.warn("升级请求失败：" + resp.message) + }) + }) + } + + /** + * 批量升级集群内选中的节点 + */ + this.upgradeBatchInCluster = function (moduleCode, cluster) { + if (cluster.nodes == null) return + var checkedNodes = cluster.nodes.filter(function (node) { return node.isChecked }) + if (checkedNodes.length == 0) return + + var vue = this + teaweb.confirm("确定要批量升级选中的 " + checkedNodes.length + " 个节点吗？", function () { + checkedNodes.forEach(function (node) { + node.installStatus = { + isRunning: true, + isFinished: false, + isOk: false, + error: "", + errorCode: "" + } + node.isUpgrading = true + node.isChecked = false + that.trackNode(moduleCode, node.id) + + vue.$post("/settings/upgrade/upgradeNode") + .params({ + module: moduleCode, + scope: "node", + clusterId: 0, + nodeId: node.id + }) + }) + }) + } + + /** + * 升级单个节点 + */ + this.upgradeNode = function (moduleCode, node) { + var vue = this + teaweb.confirm("确定要升级节点 \"" + node.name + "\" 吗？", function () { + node.installStatus = { + isRunning: true, + isFinished: false, + isOk: false, + error: "", + errorCode: "" + } + node.isUpgrading = true + that.trackNode(moduleCode, node.id) + + vue.$post("/settings/upgrade/upgradeNode") + .params({ + module: moduleCode, + scope: "node", + clusterId: 0, + nodeId: node.id + }) + .success(function () { }) + .fail(function (resp) { + node.isUpgrading = false + teaweb.warn("升级请求失败：" + resp.message) + }) + }) + } + + /** + * 标记模块下所有节点为升级中 + */ + this.markModuleUpgrading = function (moduleCode) { + that.modules.forEach(function (mod) { + if (mod.code == moduleCode && mod.clusters != null) { + mod.clusters.forEach(function (cluster) { + if (cluster.nodes != null) { + cluster.nodes.forEach(function (node) { + node.installStatus = { + isRunning: true, + isFinished: false, + isOk: false, + error: "", + errorCode: "" + } + node.isUpgrading = true + that.trackNode(moduleCode, node.id) + }) + } + }) + } + }) + } + + /** + * 标记集群下所有节点为升级中 + */ + this.markClusterUpgrading = function (moduleCode, clusterId) { + that.modules.forEach(function (mod) { + if (mod.code == moduleCode && mod.clusters != null) { + mod.clusters.forEach(function (cluster) { + if (cluster.id == clusterId && cluster.nodes != null) { + cluster.nodes.forEach(function (node) { + node.installStatus = { + isRunning: true, + isFinished: false, + isOk: false, + error: "", + errorCode: "" + } + node.isUpgrading = true + that.trackNode(moduleCode, node.id) + }) + } + }) + } + }) + } + + /** + * 追踪节点升级状态 + */ + this.trackNode = function (moduleCode, nodeId) { + if (that.upgradingNodeIds[moduleCode] == null) { + that.upgradingNodeIds[moduleCode] = [] + } + if (that.upgradingNodeIds[moduleCode].indexOf(nodeId) < 0) { + that.upgradingNodeIds[moduleCode].push(nodeId) + } + } + + /** + * 状态轮询 + */ + this.pollStatus = function () { + var vue = this + + // 检查是否有正在升级的节点 + let hasUpgrading = false + for (let key in that.upgradingNodeIds) { + if (that.upgradingNodeIds[key].length > 0) { + hasUpgrading = true + break + } + } + + if (!hasUpgrading) { + setTimeout(function () { that.pollStatus() }, 5000) + return + } + + vue.$post("/settings/upgrade/status") + .params({ + nodeIdsJSON: JSON.stringify(that.upgradingNodeIds) + }) + .success(function (resp) { + let statuses = resp.data.statuses + if (statuses == null) { + return + } + + // 更新各模块节点状态 + for (let moduleCode in statuses) { + let nodeStatuses = statuses[moduleCode] + if (nodeStatuses == null) { + continue + } + nodeStatuses.forEach(function (ns) { + that.updateNodeStatus(moduleCode, ns.id, ns.installStatus) + }) + } + }) + .done(function () { + setTimeout(function () { that.pollStatus() }, 3000) + }) + } + + /** + * 更新节点安装状态 + */ + this.updateNodeStatus = function (moduleCode, nodeId, installStatus) { + that.modules.forEach(function (mod) { + if (mod.code == moduleCode && mod.clusters != null) { + mod.clusters.forEach(function (cluster) { + if (cluster.nodes != null) { + cluster.nodes.forEach(function (node) { + if (node.id == nodeId && installStatus != null) { + node.installStatus = installStatus + // 升级完成后移除跟踪 + if (installStatus.isFinished) { + node.isUpgrading = false + let idx = that.upgradingNodeIds[moduleCode].indexOf(nodeId) + if (idx >= 0) { + that.upgradingNodeIds[moduleCode].splice(idx, 1) + } + + if (installStatus.isOk) { + // 升级成功，延迟后从列表中移除 + setTimeout(function () { + let nIdx = cluster.nodes.indexOf(node) + if (nIdx >= 0) { + cluster.nodes.splice(nIdx, 1) + cluster.count-- + mod.count-- + that.totalUpgradeCount-- + + if (cluster.count <= 0) { + let cIdx = mod.clusters.indexOf(cluster) + if (cIdx >= 0) { + mod.clusters.splice(cIdx, 1) + } + } + if (mod.count <= 0) { + let mIdx = that.modules.indexOf(mod) + if (mIdx >= 0) { + that.modules.splice(mIdx, 1) + } + } + } + }, 2000) + } else { + // 升级失败，根据 errorCode 给出具体提示 + that.handleUpgradeError(moduleCode, node, installStatus) + } + } + } + }) + } + }) + } + }) + } + + /** + * 处理升级错误，根据 errorCode 提供更友好的提示 + */ + this.handleUpgradeError = function (moduleCode, node, installStatus) { + let errorCode = installStatus.errorCode || "" + let errMsg = installStatus.error || "" + + switch (errorCode) { + case "EMPTY_LOGIN": + case "EMPTY_SSH_HOST": + case "EMPTY_SSH_PORT": + case "EMPTY_GRANT": + // SSH 信息未配置的错误，不弹窗（页面上已有"没有设置"提示） + break + case "CREATE_ROOT_DIRECTORY_FAILED": + teaweb.warn("节点 \"" + node.name + "\" 创建根目录失败：" + errMsg) + break + case "INSTALL_HELPER_FAILED": + teaweb.warn("节点 \"" + node.name + "\" 安装助手失败：" + errMsg) + break + case "TEST_FAILED": + teaweb.warn("节点 \"" + node.name + "\" 环境测试失败：" + errMsg) + break + case "RPC_TEST_FAILED": + teaweb.warn("节点 \"" + node.name + "\" RPC通讯测试失败：" + errMsg) + break + } + } + + /** + * 更新自动升级状态 + */ + this.updateAutoUpgrade = function () { + var vue = this + + // @change 已经翻转了值，先记录新值并立即恢复 + let newValue = that.config.autoUpgrade + that.config.autoUpgrade = !newValue + + let msg = newValue ? "确定要开启自动升级功能吗？开启后节点会自动下载安装新版本。" : "确定要关闭自动升级功能吗？关闭后只能通过这里手动执行升级。" + teaweb.confirm(msg, function () { + vue.$post("/settings/upgrade") + .params({ + autoUpgrade: newValue ? 1 : 0 + }) + .success(function () { + that.config.autoUpgrade = newValue + teaweb.successToast("设置保存成功") + }) + .fail(function (resp) { + teaweb.warn("设置保存失败：" + resp.message) + }) + }) + } +}) diff --git a/EdgeAdmin/web/views/@default/users/createPopup.html b/EdgeAdmin/web/views/@default/users/createPopup.html index 77c5d3c..63de930 100644 --- a/EdgeAdmin/web/views/@default/users/createPopup.html +++ b/EdgeAdmin/web/views/@default/users/createPopup.html @@ -3,41 +3,51 @@

创建用户

- - + +
- + + + + + @@ -83,6 +93,6 @@ -
用户名 * - +

用户名只能是英文、数字、下划线的组合。
密码 * - +
确认密码 * - +
全名 * - +

用户姓名或者公司名称等等。
关联集群 *CDN关联集群 *

用户发布的网站会自动部署到此集群。
HTTPDNS关联集群 + +

用户发布的 HTTPDNS 应用会自动关联到此集群。

+
开通功能 @@ -54,19 +64,19 @@
手机号 - +
联系电话 - +
电子邮箱 - +
- + +
\ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/users/setting/index.css b/EdgeAdmin/web/views/@default/users/setting/index.css index 98fa343..985fb65 100644 --- a/EdgeAdmin/web/views/@default/users/setting/index.css +++ b/EdgeAdmin/web/views/@default/users/setting/index.css @@ -1,3 +1,6 @@ +.ui.table.definition td.title { + min-width: 12em; +} .feature-boxes .feature-box { margin-bottom: 1em; width: 24em; diff --git a/EdgeAdmin/web/views/@default/users/setting/index.html b/EdgeAdmin/web/views/@default/users/setting/index.html index 15573fe..1ac64cb 100644 --- a/EdgeAdmin/web/views/@default/users/setting/index.html +++ b/EdgeAdmin/web/views/@default/users/setting/index.html @@ -6,7 +6,7 @@ - +
允许注册允许注册

选中表示允许用户自行注册。

@@ -40,10 +40,12 @@

登录设置

- +
检查客户端区域检查客户端区域 -

选中后，表示每次用户访问时都检查客户端所在地理区域是否和登录时一致，以提升安全性；如果当前系统下游有反向代理设置，请在[用户界面设置]中设置“自定义客户端IP报头”选项。

+

选中后，表示每次用户访问时都检查客户端所在地理区域是否和登录时一致，以提升安全性；如果当前系统下游有反向代理设置，请在[用户界面设置]中设置“自定义客户端IP报头”选项。 +

@@ -51,17 +53,19 @@

电子邮箱相关

- + @@ -73,20 +77,25 @@ - + @@ -98,7 +107,7 @@

通过邮箱找回密码

启用电子邮箱绑定功能启用电子邮箱绑定功能 -

选中后，电子邮箱需要激活之后可以使用邮箱登录、找回密码等。此功能需要事先设置 [激活邮件设置]。

+

选中后，电子邮箱需要激活之后可以使用邮箱登录、找回密码等。此功能需要事先设置 [激活邮件设置]。
提示用户未绑定 - + +

选中后，将在页面上提示用户尚未绑定电子邮箱.
+
激活邮件标题 - -

其中${product.name}为当前设置的产品名称。

+ +

其中${product.name}为当前设置的产品名称。
激活邮件内容 -

可以使用简单的HTML，其中${product.name}为当前设置的产品名称，${url.verify}为生成的激活地址，${url.home}为用户平台主页地址，由用户节点访问地址组合而成。

+

可以使用简单的HTML，其中${product.name}为当前设置的产品名称，${url.verify}为生成的激活地址，${url.home}为用户平台主页地址，由用户节点访问地址组合而成。
- + - + @@ -130,17 +146,19 @@

手机号码相关

启用找回密码功能启用找回密码功能

选中后，用户可以通过已绑定的电子邮箱找回密码；此功能需要同时开启电子邮箱绑定功能。

@@ -106,20 +115,27 @@
找回密码邮件标题 - -

其中${product.name}为当前设置的产品名称。

+ +

其中${product.name}为当前设置的产品名称。
找回密码邮件内容 - -

可以使用简单的HTML，其中${product.name}为当前设置的产品名称，${code}为找回密码时用到的验证码，${url.home}为用户平台主页地址，由用户节点访问地址组合而成。

+ +

可以使用简单的HTML，其中${product.name}为当前设置的产品名称，${code}为找回密码时用到的验证码，${url.home}为用户平台主页地址，由用户节点访问地址组合而成。
- + @@ -159,12 +177,14 @@ - + @@ -176,7 +196,7 @@

CDN服务

启用手机号码绑定功能启用手机号码绑定功能 -

选中后，手机号码需要激活之后可以使用手机号码、找回密码等。此功能需要事先设置 [激活短信设置]。

+

选中后，手机号码需要激活之后可以使用手机号码、找回密码等。此功能需要事先设置 [激活短信设置]。
提示用户未绑定 - + +

选中后，将在页面上提示用户尚未绑定手机号码.
激活短信内容 - +

其中使用${code}表示验证码。
- + - + + + + + diff --git a/EdgeAdmin/web/views/@default/users/user.html b/EdgeAdmin/web/views/@default/users/user.html index 51e28b8..03f06cd 100644 --- a/EdgeAdmin/web/views/@default/users/user.html +++ b/EdgeAdmin/web/views/@default/users/user.html @@ -9,12 +9,13 @@ 信息未审核   [审核]已拒绝 -   [重新审核] +   [重新审核] -

拒绝原因：{{user.rejectReason}}

+

+ 拒绝原因：{{user.rejectReason}}

@@ -30,9 +31,18 @@ - + + + + + @@ -106,8 +116,9 @@ diff --git a/EdgeCommon/pkg/iplibrary/reader_maxmind.go b/EdgeCommon/pkg/iplibrary/reader_maxmind.go index 15d3557..828198e 100644 --- a/EdgeCommon/pkg/iplibrary/reader_maxmind.go +++ b/EdgeCommon/pkg/iplibrary/reader_maxmind.go @@ -7,9 +7,7 @@ import ( "github.com/oschwald/geoip2-golang" "net" "os" - "path/filepath" "sync" - "time" ) // MaxMindReader MaxMind GeoIP2 Reader @@ -19,6 +17,9 @@ type MaxMindReader struct { meta *Meta initialized bool mutex sync.RWMutex + + // 临时文件路径，Destroy 时自动清理 + tmpFiles []string } // NewMaxMindReader 创建 MaxMind Reader @@ -66,27 +67,9 @@ func NewMaxMindReaderFromBytes(cityDBData, asnDBData []byte) (*MaxMindReader, er return nil, fmt.Errorf("city database data is required") } - // 创建临时文件，使用更唯一的文件名避免冲突 - tmpDir := os.TempDir() - pid := os.Getpid() - // 使用时间戳增加唯一性，避免同一进程多次调用时的冲突 - timestamp := time.Now().UnixNano() - cityTmpFile := filepath.Join(tmpDir, fmt.Sprintf("geolite2-city-%d-%d.mmdb", pid, timestamp)) - asnTmpFile := filepath.Join(tmpDir, fmt.Sprintf("geolite2-asn-%d-%d.mmdb", pid, timestamp)) - - // 如果临时文件已存在，先删除（可能是之前崩溃留下的） - os.Remove(cityTmpFile) - os.Remove(asnTmpFile) - - // 写入 City 数据库到临时文件 - if err := os.WriteFile(cityTmpFile, cityDBData, 0644); err != nil { - return nil, fmt.Errorf("write city database to temp file failed: %w", err) - } - - // 打开 City 数据库 - db, err := geoip2.Open(cityTmpFile) + // 直接从内存字节加载，避免在 /tmp 持续生成 mmdb 临时文件。 + db, err := geoip2.FromBytes(cityDBData) if err != nil { - os.Remove(cityTmpFile) return nil, fmt.Errorf("open MaxMind city database failed: %w", err) } @@ -94,16 +77,11 @@ func NewMaxMindReaderFromBytes(cityDBData, asnDBData []byte) (*MaxMindReader, er db: db, } - // 写入并打开 ASN 数据库（可选） + // 加载 ASN 数据库（可选） if len(asnDBData) > 0 { - if err := os.WriteFile(asnTmpFile, asnDBData, 0644); err == nil { - dbASN, err := geoip2.Open(asnTmpFile) - if err == nil { - reader.dbASN = dbASN - } else { - // ASN 数据库打开失败，清理临时文件但不影响主功能 - os.Remove(asnTmpFile) - } + dbASN, err := geoip2.FromBytes(asnDBData) + if err == nil { + reader.dbASN = dbASN } } @@ -174,7 +152,7 @@ func (this *MaxMindReader) Meta() *Meta { return this.meta } -// Destroy 销毁 Reader +// Destroy 销毁 Reader 并清理临时文件 func (this *MaxMindReader) Destroy() { this.mutex.Lock() defer this.mutex.Unlock() @@ -187,6 +165,10 @@ func (this *MaxMindReader) Destroy() { this.dbASN.Close() this.dbASN = nil } + for _, f := range this.tmpFiles { + os.Remove(f) + } + this.tmpFiles = nil this.initialized = false } diff --git a/EdgeCommon/pkg/nodeconfigs/node_roles.go b/EdgeCommon/pkg/nodeconfigs/node_roles.go index fab0553..4a46434 100644 --- a/EdgeCommon/pkg/nodeconfigs/node_roles.go +++ b/EdgeCommon/pkg/nodeconfigs/node_roles.go @@ -10,6 +10,7 @@ const ( NodeRoleDatabase NodeRole = "database" NodeRoleLog NodeRole = "log" NodeRoleDNS NodeRole = "dns" + NodeRoleHTTPDNS NodeRole = "httpdns" NodeRoleMonitor NodeRole = "monitor" NodeRoleNode NodeRole = "node" NodeRoleCluster NodeRole = "cluster" diff --git a/EdgeCommon/pkg/rpc/pb/model_httpdns_access_log.pb.go b/EdgeCommon/pkg/rpc/pb/model_httpdns_access_log.pb.go new file mode 100644 index 0000000..f75b0c1 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/model_httpdns_access_log.pb.go @@ -0,0 +1,329 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc v3.21.12 +// source: models/model_httpdns_access_log.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type HTTPDNSAccessLog struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + RequestId string `protobuf:"bytes,2,opt,name=requestId,proto3" json:"requestId,omitempty"` + ClusterId int64 `protobuf:"varint,3,opt,name=clusterId,proto3" json:"clusterId,omitempty"` + NodeId int64 `protobuf:"varint,4,opt,name=nodeId,proto3" json:"nodeId,omitempty"` + AppId string `protobuf:"bytes,5,opt,name=appId,proto3" json:"appId,omitempty"` + AppName string `protobuf:"bytes,6,opt,name=appName,proto3" json:"appName,omitempty"` + Domain string `protobuf:"bytes,7,opt,name=domain,proto3" json:"domain,omitempty"` + Qtype string `protobuf:"bytes,8,opt,name=qtype,proto3" json:"qtype,omitempty"` + ClientIP string `protobuf:"bytes,9,opt,name=clientIP,proto3" json:"clientIP,omitempty"` + ClientRegion string `protobuf:"bytes,10,opt,name=clientRegion,proto3" json:"clientRegion,omitempty"` + Carrier string `protobuf:"bytes,11,opt,name=carrier,proto3" json:"carrier,omitempty"` + SdkVersion string `protobuf:"bytes,12,opt,name=sdkVersion,proto3" json:"sdkVersion,omitempty"` + Os string `protobuf:"bytes,13,opt,name=os,proto3" json:"os,omitempty"` + ResultIPs string `protobuf:"bytes,14,opt,name=resultIPs,proto3" json:"resultIPs,omitempty"` + Status string `protobuf:"bytes,15,opt,name=status,proto3" json:"status,omitempty"` + ErrorCode string `protobuf:"bytes,16,opt,name=errorCode,proto3" json:"errorCode,omitempty"` + CostMs int32 `protobuf:"varint,17,opt,name=costMs,proto3" json:"costMs,omitempty"` + CreatedAt int64 `protobuf:"varint,18,opt,name=createdAt,proto3" json:"createdAt,omitempty"` + Day string `protobuf:"bytes,19,opt,name=day,proto3" json:"day,omitempty"` + Summary string `protobuf:"bytes,20,opt,name=summary,proto3" json:"summary,omitempty"` + NodeName string `protobuf:"bytes,21,opt,name=nodeName,proto3" json:"nodeName,omitempty"` + ClusterName string `protobuf:"bytes,22,opt,name=clusterName,proto3" json:"clusterName,omitempty"` +} + +func (x *HTTPDNSAccessLog) Reset() { + *x = HTTPDNSAccessLog{} + mi := &file_models_model_httpdns_access_log_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *HTTPDNSAccessLog) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HTTPDNSAccessLog) ProtoMessage() {} + +func (x *HTTPDNSAccessLog) ProtoReflect() protoreflect.Message { + mi := &file_models_model_httpdns_access_log_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use HTTPDNSAccessLog.ProtoReflect.Descriptor instead. +func (*HTTPDNSAccessLog) Descriptor() ([]byte, []int) { + return file_models_model_httpdns_access_log_proto_rawDescGZIP(), []int{0} +} + +func (x *HTTPDNSAccessLog) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *HTTPDNSAccessLog) GetRequestId() string { + if x != nil { + return x.RequestId + } + return "" +} + +func (x *HTTPDNSAccessLog) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +func (x *HTTPDNSAccessLog) GetNodeId() int64 { + if x != nil { + return x.NodeId + } + return 0 +} + +func (x *HTTPDNSAccessLog) GetAppId() string { + if x != nil { + return x.AppId + } + return "" +} + +func (x *HTTPDNSAccessLog) GetAppName() string { + if x != nil { + return x.AppName + } + return "" +} + +func (x *HTTPDNSAccessLog) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *HTTPDNSAccessLog) GetQtype() string { + if x != nil { + return x.Qtype + } + return "" +} + +func (x *HTTPDNSAccessLog) GetClientIP() string { + if x != nil { + return x.ClientIP + } + return "" +} + +func (x *HTTPDNSAccessLog) GetClientRegion() string { + if x != nil { + return x.ClientRegion + } + return "" +} + +func (x *HTTPDNSAccessLog) GetCarrier() string { + if x != nil { + return x.Carrier + } + return "" +} + +func (x *HTTPDNSAccessLog) GetSdkVersion() string { + if x != nil { + return x.SdkVersion + } + return "" +} + +func (x *HTTPDNSAccessLog) GetOs() string { + if x != nil { + return x.Os + } + return "" +} + +func (x *HTTPDNSAccessLog) GetResultIPs() string { + if x != nil { + return x.ResultIPs + } + return "" +} + +func (x *HTTPDNSAccessLog) GetStatus() string { + if x != nil { + return x.Status + } + return "" +} + +func (x *HTTPDNSAccessLog) GetErrorCode() string { + if x != nil { + return x.ErrorCode + } + return "" +} + +func (x *HTTPDNSAccessLog) GetCostMs() int32 { + if x != nil { + return x.CostMs + } + return 0 +} + +func (x *HTTPDNSAccessLog) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *HTTPDNSAccessLog) GetDay() string { + if x != nil { + return x.Day + } + return "" +} + +func (x *HTTPDNSAccessLog) GetSummary() string { + if x != nil { + return x.Summary + } + return "" +} + +func (x *HTTPDNSAccessLog) GetNodeName() string { + if x != nil { + return x.NodeName + } + return "" +} + +func (x *HTTPDNSAccessLog) GetClusterName() string { + if x != nil { + return x.ClusterName + } + return "" +} + +var File_models_model_httpdns_access_log_proto protoreflect.FileDescriptor + +var file_models_model_httpdns_access_log_proto_rawDesc = []byte{ + 0x0a, 0x25, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x68, + 0x74, 0x74, 0x70, 0x64, 0x6e, 0x73, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, + 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xd2, 0x04, 0x0a, 0x10, + 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x12, 0x1c, + 0x0a, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, + 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x6f, + 0x64, 0x65, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x70, + 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x70, 0x70, + 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x14, 0x0a, 0x05, + 0x71, 0x74, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x71, 0x74, 0x79, + 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x50, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x50, 0x12, 0x22, + 0x0a, 0x0c, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, 0x0a, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x67, 0x69, + 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x61, 0x72, 0x72, 0x69, 0x65, 0x72, 0x18, 0x0b, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x61, 0x72, 0x72, 0x69, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, + 0x73, 0x64, 0x6b, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0a, 0x73, 0x64, 0x6b, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, + 0x6f, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x6f, 0x73, 0x12, 0x1c, 0x0a, 0x09, + 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x50, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x50, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, + 0x75, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, + 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, + 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x73, 0x74, 0x4d, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x63, 0x6f, 0x73, 0x74, 0x4d, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, 0x13, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6d, 0x6d, + 0x61, 0x72, 0x79, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, + 0x72, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x15, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, + 0x0a, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x16, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_models_model_httpdns_access_log_proto_rawDescOnce sync.Once + file_models_model_httpdns_access_log_proto_rawDescData = file_models_model_httpdns_access_log_proto_rawDesc +) + +func file_models_model_httpdns_access_log_proto_rawDescGZIP() []byte { + file_models_model_httpdns_access_log_proto_rawDescOnce.Do(func() { + file_models_model_httpdns_access_log_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_httpdns_access_log_proto_rawDescData) + }) + return file_models_model_httpdns_access_log_proto_rawDescData +} + +var file_models_model_httpdns_access_log_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_models_model_httpdns_access_log_proto_goTypes = []any{ + (*HTTPDNSAccessLog)(nil), // 0: pb.HTTPDNSAccessLog +} +var file_models_model_httpdns_access_log_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_models_model_httpdns_access_log_proto_init() } +func file_models_model_httpdns_access_log_proto_init() { + if File_models_model_httpdns_access_log_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_models_model_httpdns_access_log_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_models_model_httpdns_access_log_proto_goTypes, + DependencyIndexes: file_models_model_httpdns_access_log_proto_depIdxs, + MessageInfos: file_models_model_httpdns_access_log_proto_msgTypes, + }.Build() + File_models_model_httpdns_access_log_proto = out.File + file_models_model_httpdns_access_log_proto_rawDesc = nil + file_models_model_httpdns_access_log_proto_goTypes = nil + file_models_model_httpdns_access_log_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/model_httpdns_app.pb.go b/EdgeCommon/pkg/rpc/pb/model_httpdns_app.pb.go new file mode 100644 index 0000000..36c43f1 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/model_httpdns_app.pb.go @@ -0,0 +1,225 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.36.11 +// protoc v3.21.12 +// source: models/model_httpdns_app.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" + unsafe "unsafe" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type HTTPDNSApp struct { + state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + AppId string `protobuf:"bytes,3,opt,name=appId,proto3" json:"appId,omitempty"` + IsOn bool `protobuf:"varint,4,opt,name=isOn,proto3" json:"isOn,omitempty"` + SniMode string `protobuf:"bytes,7,opt,name=sniMode,proto3" json:"sniMode,omitempty"` + SignEnabled bool `protobuf:"varint,8,opt,name=signEnabled,proto3" json:"signEnabled,omitempty"` + SignSecret string `protobuf:"bytes,9,opt,name=signSecret,proto3" json:"signSecret,omitempty"` + SignUpdatedAt int64 `protobuf:"varint,10,opt,name=signUpdatedAt,proto3" json:"signUpdatedAt,omitempty"` + CreatedAt int64 `protobuf:"varint,11,opt,name=createdAt,proto3" json:"createdAt,omitempty"` + UpdatedAt int64 `protobuf:"varint,12,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` + UserId int64 `protobuf:"varint,13,opt,name=userId,proto3" json:"userId,omitempty"` + ClusterIdsJSON []byte `protobuf:"bytes,14,opt,name=clusterIdsJSON,proto3" json:"clusterIdsJSON,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *HTTPDNSApp) Reset() { + *x = HTTPDNSApp{} + mi := &file_models_model_httpdns_app_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *HTTPDNSApp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HTTPDNSApp) ProtoMessage() {} + +func (x *HTTPDNSApp) ProtoReflect() protoreflect.Message { + mi := &file_models_model_httpdns_app_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use HTTPDNSApp.ProtoReflect.Descriptor instead. +func (*HTTPDNSApp) Descriptor() ([]byte, []int) { + return file_models_model_httpdns_app_proto_rawDescGZIP(), []int{0} +} + +func (x *HTTPDNSApp) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *HTTPDNSApp) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *HTTPDNSApp) GetAppId() string { + if x != nil { + return x.AppId + } + return "" +} + +func (x *HTTPDNSApp) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +func (x *HTTPDNSApp) GetSniMode() string { + if x != nil { + return x.SniMode + } + return "" +} + +func (x *HTTPDNSApp) GetSignEnabled() bool { + if x != nil { + return x.SignEnabled + } + return false +} + +func (x *HTTPDNSApp) GetSignSecret() string { + if x != nil { + return x.SignSecret + } + return "" +} + +func (x *HTTPDNSApp) GetSignUpdatedAt() int64 { + if x != nil { + return x.SignUpdatedAt + } + return 0 +} + +func (x *HTTPDNSApp) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *HTTPDNSApp) GetUpdatedAt() int64 { + if x != nil { + return x.UpdatedAt + } + return 0 +} + +func (x *HTTPDNSApp) GetUserId() int64 { + if x != nil { + return x.UserId + } + return 0 +} + +func (x *HTTPDNSApp) GetClusterIdsJSON() []byte { + if x != nil { + return x.ClusterIdsJSON + } + return nil +} + +var File_models_model_httpdns_app_proto protoreflect.FileDescriptor + +const file_models_model_httpdns_app_proto_rawDesc = "" + + "\n" + + "\x1emodels/model_httpdns_app.proto\x12\x02pb\"\xe4\x02\n" + + "\n" + + "HTTPDNSApp\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x12\n" + + "\x04name\x18\x02 \x01(\tR\x04name\x12\x14\n" + + "\x05appId\x18\x03 \x01(\tR\x05appId\x12\x12\n" + + "\x04isOn\x18\x04 \x01(\bR\x04isOn\x12\x18\n" + + "\asniMode\x18\a \x01(\tR\asniMode\x12 \n" + + "\vsignEnabled\x18\b \x01(\bR\vsignEnabled\x12\x1e\n" + + "\n" + + "signSecret\x18\t \x01(\tR\n" + + "signSecret\x12$\n" + + "\rsignUpdatedAt\x18\n" + + " \x01(\x03R\rsignUpdatedAt\x12\x1c\n" + + "\tcreatedAt\x18\v \x01(\x03R\tcreatedAt\x12\x1c\n" + + "\tupdatedAt\x18\f \x01(\x03R\tupdatedAt\x12\x16\n" + + "\x06userId\x18\r \x01(\x03R\x06userId\x12&\n" + + "\x0eclusterIdsJSON\x18\x0e \x01(\fR\x0eclusterIdsJSONJ\x04\b\x05\x10\x06J\x04\b\x06\x10\aB\x06Z\x04./pbb\x06proto3" + +var ( + file_models_model_httpdns_app_proto_rawDescOnce sync.Once + file_models_model_httpdns_app_proto_rawDescData []byte +) + +func file_models_model_httpdns_app_proto_rawDescGZIP() []byte { + file_models_model_httpdns_app_proto_rawDescOnce.Do(func() { + file_models_model_httpdns_app_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_models_model_httpdns_app_proto_rawDesc), len(file_models_model_httpdns_app_proto_rawDesc))) + }) + return file_models_model_httpdns_app_proto_rawDescData +} + +var file_models_model_httpdns_app_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_models_model_httpdns_app_proto_goTypes = []any{ + (*HTTPDNSApp)(nil), // 0: pb.HTTPDNSApp +} +var file_models_model_httpdns_app_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_models_model_httpdns_app_proto_init() } +func file_models_model_httpdns_app_proto_init() { + if File_models_model_httpdns_app_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_models_model_httpdns_app_proto_rawDesc), len(file_models_model_httpdns_app_proto_rawDesc)), + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_models_model_httpdns_app_proto_goTypes, + DependencyIndexes: file_models_model_httpdns_app_proto_depIdxs, + MessageInfos: file_models_model_httpdns_app_proto_msgTypes, + }.Build() + File_models_model_httpdns_app_proto = out.File + file_models_model_httpdns_app_proto_goTypes = nil + file_models_model_httpdns_app_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/model_httpdns_cluster.pb.go b/EdgeCommon/pkg/rpc/pb/model_httpdns_cluster.pb.go new file mode 100644 index 0000000..4a4935f --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/model_httpdns_cluster.pb.go @@ -0,0 +1,250 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc v3.21.12 +// source: models/model_httpdns_cluster.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type HTTPDNSCluster struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + IsOn bool `protobuf:"varint,2,opt,name=isOn,proto3" json:"isOn,omitempty"` + IsDefault bool `protobuf:"varint,3,opt,name=isDefault,proto3" json:"isDefault,omitempty"` + Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` + ServiceDomain string `protobuf:"bytes,5,opt,name=serviceDomain,proto3" json:"serviceDomain,omitempty"` + DefaultTTL int32 `protobuf:"varint,6,opt,name=defaultTTL,proto3" json:"defaultTTL,omitempty"` + FallbackTimeoutMs int32 `protobuf:"varint,7,opt,name=fallbackTimeoutMs,proto3" json:"fallbackTimeoutMs,omitempty"` + InstallDir string `protobuf:"bytes,8,opt,name=installDir,proto3" json:"installDir,omitempty"` + TlsPolicyJSON []byte `protobuf:"bytes,9,opt,name=tlsPolicyJSON,proto3" json:"tlsPolicyJSON,omitempty"` + CreatedAt int64 `protobuf:"varint,10,opt,name=createdAt,proto3" json:"createdAt,omitempty"` + UpdatedAt int64 `protobuf:"varint,11,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` + AutoRemoteStart bool `protobuf:"varint,12,opt,name=autoRemoteStart,proto3" json:"autoRemoteStart,omitempty"` + AccessLogIsOn bool `protobuf:"varint,13,opt,name=accessLogIsOn,proto3" json:"accessLogIsOn,omitempty"` + TimeZone string `protobuf:"bytes,14,opt,name=timeZone,proto3" json:"timeZone,omitempty"` +} + +func (x *HTTPDNSCluster) Reset() { + *x = HTTPDNSCluster{} + mi := &file_models_model_httpdns_cluster_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *HTTPDNSCluster) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HTTPDNSCluster) ProtoMessage() {} + +func (x *HTTPDNSCluster) ProtoReflect() protoreflect.Message { + mi := &file_models_model_httpdns_cluster_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use HTTPDNSCluster.ProtoReflect.Descriptor instead. +func (*HTTPDNSCluster) Descriptor() ([]byte, []int) { + return file_models_model_httpdns_cluster_proto_rawDescGZIP(), []int{0} +} + +func (x *HTTPDNSCluster) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *HTTPDNSCluster) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +func (x *HTTPDNSCluster) GetIsDefault() bool { + if x != nil { + return x.IsDefault + } + return false +} + +func (x *HTTPDNSCluster) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *HTTPDNSCluster) GetServiceDomain() string { + if x != nil { + return x.ServiceDomain + } + return "" +} + +func (x *HTTPDNSCluster) GetDefaultTTL() int32 { + if x != nil { + return x.DefaultTTL + } + return 0 +} + +func (x *HTTPDNSCluster) GetFallbackTimeoutMs() int32 { + if x != nil { + return x.FallbackTimeoutMs + } + return 0 +} + +func (x *HTTPDNSCluster) GetInstallDir() string { + if x != nil { + return x.InstallDir + } + return "" +} + +func (x *HTTPDNSCluster) GetTlsPolicyJSON() []byte { + if x != nil { + return x.TlsPolicyJSON + } + return nil +} + +func (x *HTTPDNSCluster) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *HTTPDNSCluster) GetUpdatedAt() int64 { + if x != nil { + return x.UpdatedAt + } + return 0 +} + +func (x *HTTPDNSCluster) GetAutoRemoteStart() bool { + if x != nil { + return x.AutoRemoteStart + } + return false +} + +func (x *HTTPDNSCluster) GetAccessLogIsOn() bool { + if x != nil { + return x.AccessLogIsOn + } + return false +} + +func (x *HTTPDNSCluster) GetTimeZone() string { + if x != nil { + return x.TimeZone + } + return "" +} + +var File_models_model_httpdns_cluster_proto protoreflect.FileDescriptor + +var file_models_model_httpdns_cluster_proto_rawDesc = []byte{ + 0x0a, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x68, + 0x74, 0x74, 0x70, 0x64, 0x6e, 0x73, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xdc, 0x02, 0x0a, 0x0e, 0x48, 0x54, 0x54, + 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, + 0x73, 0x4f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, + 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x54, 0x54, 0x4c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x54, 0x54, 0x4c, 0x12, 0x2c, 0x0a, 0x11, 0x66, 0x61, 0x6c, 0x6c, 0x62, + 0x61, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x11, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, + 0x44, 0x69, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, + 0x6c, 0x6c, 0x44, 0x69, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x74, 0x6c, 0x73, 0x50, 0x6f, 0x6c, 0x69, + 0x63, 0x79, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x74, 0x6c, + 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x1c, 0x0a, 0x09, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x75, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_models_model_httpdns_cluster_proto_rawDescOnce sync.Once + file_models_model_httpdns_cluster_proto_rawDescData = file_models_model_httpdns_cluster_proto_rawDesc +) + +func file_models_model_httpdns_cluster_proto_rawDescGZIP() []byte { + file_models_model_httpdns_cluster_proto_rawDescOnce.Do(func() { + file_models_model_httpdns_cluster_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_httpdns_cluster_proto_rawDescData) + }) + return file_models_model_httpdns_cluster_proto_rawDescData +} + +var file_models_model_httpdns_cluster_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_models_model_httpdns_cluster_proto_goTypes = []any{ + (*HTTPDNSCluster)(nil), // 0: pb.HTTPDNSCluster +} +var file_models_model_httpdns_cluster_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_models_model_httpdns_cluster_proto_init() } +func file_models_model_httpdns_cluster_proto_init() { + if File_models_model_httpdns_cluster_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_models_model_httpdns_cluster_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_models_model_httpdns_cluster_proto_goTypes, + DependencyIndexes: file_models_model_httpdns_cluster_proto_depIdxs, + MessageInfos: file_models_model_httpdns_cluster_proto_msgTypes, + }.Build() + File_models_model_httpdns_cluster_proto = out.File + file_models_model_httpdns_cluster_proto_rawDesc = nil + file_models_model_httpdns_cluster_proto_goTypes = nil + file_models_model_httpdns_cluster_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/model_httpdns_domain.pb.go b/EdgeCommon/pkg/rpc/pb/model_httpdns_domain.pb.go new file mode 100644 index 0000000..0f2c157 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/model_httpdns_domain.pb.go @@ -0,0 +1,184 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc v3.21.12 +// source: models/model_httpdns_domain.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type HTTPDNSDomain struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + AppId int64 `protobuf:"varint,2,opt,name=appId,proto3" json:"appId,omitempty"` + Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` + IsOn bool `protobuf:"varint,4,opt,name=isOn,proto3" json:"isOn,omitempty"` + CreatedAt int64 `protobuf:"varint,5,opt,name=createdAt,proto3" json:"createdAt,omitempty"` + UpdatedAt int64 `protobuf:"varint,6,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` + RuleCount int64 `protobuf:"varint,7,opt,name=ruleCount,proto3" json:"ruleCount,omitempty"` +} + +func (x *HTTPDNSDomain) Reset() { + *x = HTTPDNSDomain{} + mi := &file_models_model_httpdns_domain_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *HTTPDNSDomain) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HTTPDNSDomain) ProtoMessage() {} + +func (x *HTTPDNSDomain) ProtoReflect() protoreflect.Message { + mi := &file_models_model_httpdns_domain_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use HTTPDNSDomain.ProtoReflect.Descriptor instead. +func (*HTTPDNSDomain) Descriptor() ([]byte, []int) { + return file_models_model_httpdns_domain_proto_rawDescGZIP(), []int{0} +} + +func (x *HTTPDNSDomain) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *HTTPDNSDomain) GetAppId() int64 { + if x != nil { + return x.AppId + } + return 0 +} + +func (x *HTTPDNSDomain) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *HTTPDNSDomain) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +func (x *HTTPDNSDomain) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *HTTPDNSDomain) GetUpdatedAt() int64 { + if x != nil { + return x.UpdatedAt + } + return 0 +} + +func (x *HTTPDNSDomain) GetRuleCount() int64 { + if x != nil { + return x.RuleCount + } + return 0 +} + +var File_models_model_httpdns_domain_proto protoreflect.FileDescriptor + +var file_models_model_httpdns_domain_proto_rawDesc = []byte{ + 0x0a, 0x21, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x68, + 0x74, 0x74, 0x70, 0x64, 0x6e, 0x73, 0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xbb, 0x01, 0x0a, 0x0d, 0x48, 0x54, 0x54, 0x50, + 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, + 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x75, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x75, 0x6c, 0x65, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x72, 0x75, 0x6c, 0x65, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_models_model_httpdns_domain_proto_rawDescOnce sync.Once + file_models_model_httpdns_domain_proto_rawDescData = file_models_model_httpdns_domain_proto_rawDesc +) + +func file_models_model_httpdns_domain_proto_rawDescGZIP() []byte { + file_models_model_httpdns_domain_proto_rawDescOnce.Do(func() { + file_models_model_httpdns_domain_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_httpdns_domain_proto_rawDescData) + }) + return file_models_model_httpdns_domain_proto_rawDescData +} + +var file_models_model_httpdns_domain_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_models_model_httpdns_domain_proto_goTypes = []any{ + (*HTTPDNSDomain)(nil), // 0: pb.HTTPDNSDomain +} +var file_models_model_httpdns_domain_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_models_model_httpdns_domain_proto_init() } +func file_models_model_httpdns_domain_proto_init() { + if File_models_model_httpdns_domain_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_models_model_httpdns_domain_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_models_model_httpdns_domain_proto_goTypes, + DependencyIndexes: file_models_model_httpdns_domain_proto_depIdxs, + MessageInfos: file_models_model_httpdns_domain_proto_msgTypes, + }.Build() + File_models_model_httpdns_domain_proto = out.File + file_models_model_httpdns_domain_proto_rawDesc = nil + file_models_model_httpdns_domain_proto_goTypes = nil + file_models_model_httpdns_domain_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/model_httpdns_node.pb.go b/EdgeCommon/pkg/rpc/pb/model_httpdns_node.pb.go new file mode 100644 index 0000000..204d8bd --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/model_httpdns_node.pb.go @@ -0,0 +1,256 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.36.11 +// protoc v3.21.12 +// source: models/model_httpdns_node.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" + unsafe "unsafe" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type HTTPDNSNode struct { + state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + ClusterId int64 `protobuf:"varint,2,opt,name=clusterId,proto3" json:"clusterId,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + IsOn bool `protobuf:"varint,4,opt,name=isOn,proto3" json:"isOn,omitempty"` + IsUp bool `protobuf:"varint,5,opt,name=isUp,proto3" json:"isUp,omitempty"` + IsInstalled bool `protobuf:"varint,6,opt,name=isInstalled,proto3" json:"isInstalled,omitempty"` + IsActive bool `protobuf:"varint,7,opt,name=isActive,proto3" json:"isActive,omitempty"` + UniqueId string `protobuf:"bytes,8,opt,name=uniqueId,proto3" json:"uniqueId,omitempty"` + Secret string `protobuf:"bytes,9,opt,name=secret,proto3" json:"secret,omitempty"` + InstallDir string `protobuf:"bytes,10,opt,name=installDir,proto3" json:"installDir,omitempty"` + StatusJSON []byte `protobuf:"bytes,11,opt,name=statusJSON,proto3" json:"statusJSON,omitempty"` + InstallStatusJSON []byte `protobuf:"bytes,12,opt,name=installStatusJSON,proto3" json:"installStatusJSON,omitempty"` + CreatedAt int64 `protobuf:"varint,13,opt,name=createdAt,proto3" json:"createdAt,omitempty"` + UpdatedAt int64 `protobuf:"varint,14,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` + NodeLogin *NodeLogin `protobuf:"bytes,15,opt,name=nodeLogin,proto3" json:"nodeLogin,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *HTTPDNSNode) Reset() { + *x = HTTPDNSNode{} + mi := &file_models_model_httpdns_node_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *HTTPDNSNode) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HTTPDNSNode) ProtoMessage() {} + +func (x *HTTPDNSNode) ProtoReflect() protoreflect.Message { + mi := &file_models_model_httpdns_node_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use HTTPDNSNode.ProtoReflect.Descriptor instead. +func (*HTTPDNSNode) Descriptor() ([]byte, []int) { + return file_models_model_httpdns_node_proto_rawDescGZIP(), []int{0} +} + +func (x *HTTPDNSNode) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *HTTPDNSNode) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +func (x *HTTPDNSNode) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *HTTPDNSNode) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +func (x *HTTPDNSNode) GetIsUp() bool { + if x != nil { + return x.IsUp + } + return false +} + +func (x *HTTPDNSNode) GetIsInstalled() bool { + if x != nil { + return x.IsInstalled + } + return false +} + +func (x *HTTPDNSNode) GetIsActive() bool { + if x != nil { + return x.IsActive + } + return false +} + +func (x *HTTPDNSNode) GetUniqueId() string { + if x != nil { + return x.UniqueId + } + return "" +} + +func (x *HTTPDNSNode) GetSecret() string { + if x != nil { + return x.Secret + } + return "" +} + +func (x *HTTPDNSNode) GetInstallDir() string { + if x != nil { + return x.InstallDir + } + return "" +} + +func (x *HTTPDNSNode) GetStatusJSON() []byte { + if x != nil { + return x.StatusJSON + } + return nil +} + +func (x *HTTPDNSNode) GetInstallStatusJSON() []byte { + if x != nil { + return x.InstallStatusJSON + } + return nil +} + +func (x *HTTPDNSNode) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *HTTPDNSNode) GetUpdatedAt() int64 { + if x != nil { + return x.UpdatedAt + } + return 0 +} + +func (x *HTTPDNSNode) GetNodeLogin() *NodeLogin { + if x != nil { + return x.NodeLogin + } + return nil +} + +var File_models_model_httpdns_node_proto protoreflect.FileDescriptor + +const file_models_model_httpdns_node_proto_rawDesc = "" + + "\n" + + "\x1fmodels/model_httpdns_node.proto\x12\x02pb\x1a\x1dmodels/model_node_login.proto\"\xc0\x03\n" + + "\vHTTPDNSNode\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1c\n" + + "\tclusterId\x18\x02 \x01(\x03R\tclusterId\x12\x12\n" + + "\x04name\x18\x03 \x01(\tR\x04name\x12\x12\n" + + "\x04isOn\x18\x04 \x01(\bR\x04isOn\x12\x12\n" + + "\x04isUp\x18\x05 \x01(\bR\x04isUp\x12 \n" + + "\visInstalled\x18\x06 \x01(\bR\visInstalled\x12\x1a\n" + + "\bisActive\x18\a \x01(\bR\bisActive\x12\x1a\n" + + "\buniqueId\x18\b \x01(\tR\buniqueId\x12\x16\n" + + "\x06secret\x18\t \x01(\tR\x06secret\x12\x1e\n" + + "\n" + + "installDir\x18\n" + + " \x01(\tR\n" + + "installDir\x12\x1e\n" + + "\n" + + "statusJSON\x18\v \x01(\fR\n" + + "statusJSON\x12,\n" + + "\x11installStatusJSON\x18\f \x01(\fR\x11installStatusJSON\x12\x1c\n" + + "\tcreatedAt\x18\r \x01(\x03R\tcreatedAt\x12\x1c\n" + + "\tupdatedAt\x18\x0e \x01(\x03R\tupdatedAt\x12+\n" + + "\tnodeLogin\x18\x0f \x01(\v2\r.pb.NodeLoginR\tnodeLoginB\x06Z\x04./pbb\x06proto3" + +var ( + file_models_model_httpdns_node_proto_rawDescOnce sync.Once + file_models_model_httpdns_node_proto_rawDescData []byte +) + +func file_models_model_httpdns_node_proto_rawDescGZIP() []byte { + file_models_model_httpdns_node_proto_rawDescOnce.Do(func() { + file_models_model_httpdns_node_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_models_model_httpdns_node_proto_rawDesc), len(file_models_model_httpdns_node_proto_rawDesc))) + }) + return file_models_model_httpdns_node_proto_rawDescData +} + +var file_models_model_httpdns_node_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_models_model_httpdns_node_proto_goTypes = []any{ + (*HTTPDNSNode)(nil), // 0: pb.HTTPDNSNode + (*NodeLogin)(nil), // 1: pb.NodeLogin +} +var file_models_model_httpdns_node_proto_depIdxs = []int32{ + 1, // 0: pb.HTTPDNSNode.nodeLogin:type_name -> pb.NodeLogin + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_models_model_httpdns_node_proto_init() } +func file_models_model_httpdns_node_proto_init() { + if File_models_model_httpdns_node_proto != nil { + return + } + file_models_model_node_login_proto_init() + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_models_model_httpdns_node_proto_rawDesc), len(file_models_model_httpdns_node_proto_rawDesc)), + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_models_model_httpdns_node_proto_goTypes, + DependencyIndexes: file_models_model_httpdns_node_proto_depIdxs, + MessageInfos: file_models_model_httpdns_node_proto_msgTypes, + }.Build() + File_models_model_httpdns_node_proto = out.File + file_models_model_httpdns_node_proto_goTypes = nil + file_models_model_httpdns_node_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/model_httpdns_rule.pb.go b/EdgeCommon/pkg/rpc/pb/model_httpdns_rule.pb.go new file mode 100644 index 0000000..7d01941 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/model_httpdns_rule.pb.go @@ -0,0 +1,363 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc v3.21.12 +// source: models/model_httpdns_rule.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type HTTPDNSRuleRecord struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + RuleId int64 `protobuf:"varint,2,opt,name=ruleId,proto3" json:"ruleId,omitempty"` + RecordType string `protobuf:"bytes,3,opt,name=recordType,proto3" json:"recordType,omitempty"` + RecordValue string `protobuf:"bytes,4,opt,name=recordValue,proto3" json:"recordValue,omitempty"` + Weight int32 `protobuf:"varint,5,opt,name=weight,proto3" json:"weight,omitempty"` + Sort int32 `protobuf:"varint,6,opt,name=sort,proto3" json:"sort,omitempty"` +} + +func (x *HTTPDNSRuleRecord) Reset() { + *x = HTTPDNSRuleRecord{} + mi := &file_models_model_httpdns_rule_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *HTTPDNSRuleRecord) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HTTPDNSRuleRecord) ProtoMessage() {} + +func (x *HTTPDNSRuleRecord) ProtoReflect() protoreflect.Message { + mi := &file_models_model_httpdns_rule_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use HTTPDNSRuleRecord.ProtoReflect.Descriptor instead. +func (*HTTPDNSRuleRecord) Descriptor() ([]byte, []int) { + return file_models_model_httpdns_rule_proto_rawDescGZIP(), []int{0} +} + +func (x *HTTPDNSRuleRecord) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *HTTPDNSRuleRecord) GetRuleId() int64 { + if x != nil { + return x.RuleId + } + return 0 +} + +func (x *HTTPDNSRuleRecord) GetRecordType() string { + if x != nil { + return x.RecordType + } + return "" +} + +func (x *HTTPDNSRuleRecord) GetRecordValue() string { + if x != nil { + return x.RecordValue + } + return "" +} + +func (x *HTTPDNSRuleRecord) GetWeight() int32 { + if x != nil { + return x.Weight + } + return 0 +} + +func (x *HTTPDNSRuleRecord) GetSort() int32 { + if x != nil { + return x.Sort + } + return 0 +} + +type HTTPDNSCustomRule struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + AppId int64 `protobuf:"varint,2,opt,name=appId,proto3" json:"appId,omitempty"` + DomainId int64 `protobuf:"varint,3,opt,name=domainId,proto3" json:"domainId,omitempty"` + RuleName string `protobuf:"bytes,4,opt,name=ruleName,proto3" json:"ruleName,omitempty"` + LineScope string `protobuf:"bytes,5,opt,name=lineScope,proto3" json:"lineScope,omitempty"` + LineCarrier string `protobuf:"bytes,6,opt,name=lineCarrier,proto3" json:"lineCarrier,omitempty"` + LineRegion string `protobuf:"bytes,7,opt,name=lineRegion,proto3" json:"lineRegion,omitempty"` + LineProvince string `protobuf:"bytes,8,opt,name=lineProvince,proto3" json:"lineProvince,omitempty"` + LineContinent string `protobuf:"bytes,9,opt,name=lineContinent,proto3" json:"lineContinent,omitempty"` + LineCountry string `protobuf:"bytes,10,opt,name=lineCountry,proto3" json:"lineCountry,omitempty"` + Ttl int32 `protobuf:"varint,11,opt,name=ttl,proto3" json:"ttl,omitempty"` + IsOn bool `protobuf:"varint,12,opt,name=isOn,proto3" json:"isOn,omitempty"` + Priority int32 `protobuf:"varint,13,opt,name=priority,proto3" json:"priority,omitempty"` + UpdatedAt int64 `protobuf:"varint,14,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` + Records []*HTTPDNSRuleRecord `protobuf:"bytes,15,rep,name=records,proto3" json:"records,omitempty"` +} + +func (x *HTTPDNSCustomRule) Reset() { + *x = HTTPDNSCustomRule{} + mi := &file_models_model_httpdns_rule_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *HTTPDNSCustomRule) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HTTPDNSCustomRule) ProtoMessage() {} + +func (x *HTTPDNSCustomRule) ProtoReflect() protoreflect.Message { + mi := &file_models_model_httpdns_rule_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use HTTPDNSCustomRule.ProtoReflect.Descriptor instead. +func (*HTTPDNSCustomRule) Descriptor() ([]byte, []int) { + return file_models_model_httpdns_rule_proto_rawDescGZIP(), []int{1} +} + +func (x *HTTPDNSCustomRule) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *HTTPDNSCustomRule) GetAppId() int64 { + if x != nil { + return x.AppId + } + return 0 +} + +func (x *HTTPDNSCustomRule) GetDomainId() int64 { + if x != nil { + return x.DomainId + } + return 0 +} + +func (x *HTTPDNSCustomRule) GetRuleName() string { + if x != nil { + return x.RuleName + } + return "" +} + +func (x *HTTPDNSCustomRule) GetLineScope() string { + if x != nil { + return x.LineScope + } + return "" +} + +func (x *HTTPDNSCustomRule) GetLineCarrier() string { + if x != nil { + return x.LineCarrier + } + return "" +} + +func (x *HTTPDNSCustomRule) GetLineRegion() string { + if x != nil { + return x.LineRegion + } + return "" +} + +func (x *HTTPDNSCustomRule) GetLineProvince() string { + if x != nil { + return x.LineProvince + } + return "" +} + +func (x *HTTPDNSCustomRule) GetLineContinent() string { + if x != nil { + return x.LineContinent + } + return "" +} + +func (x *HTTPDNSCustomRule) GetLineCountry() string { + if x != nil { + return x.LineCountry + } + return "" +} + +func (x *HTTPDNSCustomRule) GetTtl() int32 { + if x != nil { + return x.Ttl + } + return 0 +} + +func (x *HTTPDNSCustomRule) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +func (x *HTTPDNSCustomRule) GetPriority() int32 { + if x != nil { + return x.Priority + } + return 0 +} + +func (x *HTTPDNSCustomRule) GetUpdatedAt() int64 { + if x != nil { + return x.UpdatedAt + } + return 0 +} + +func (x *HTTPDNSCustomRule) GetRecords() []*HTTPDNSRuleRecord { + if x != nil { + return x.Records + } + return nil +} + +var File_models_model_httpdns_rule_proto protoreflect.FileDescriptor + +var file_models_model_httpdns_rule_proto_rawDesc = []byte{ + 0x0a, 0x1f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x68, + 0x74, 0x74, 0x70, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xa9, 0x01, 0x0a, 0x11, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, + 0x53, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, + 0x75, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x75, 0x6c, + 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x54, 0x79, 0x70, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x54, + 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x56, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, + 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x12, 0x0a, + 0x04, 0x73, 0x6f, 0x72, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x6f, 0x72, + 0x74, 0x22, 0xce, 0x03, 0x0a, 0x11, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, + 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, + 0x08, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x08, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x75, 0x6c, + 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x75, 0x6c, + 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x63, 0x6f, + 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x63, + 0x6f, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x61, 0x72, 0x72, 0x69, + 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x61, + 0x72, 0x72, 0x69, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x67, + 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x69, 0x6e, 0x65, 0x52, + 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x6f, + 0x76, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6c, 0x69, 0x6e, + 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x6c, 0x69, 0x6e, + 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x65, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0d, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x65, 0x6e, 0x74, 0x12, + 0x20, 0x0a, 0x0b, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x0a, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x74, 0x74, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, + 0x69, 0x74, 0x79, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, + 0x69, 0x74, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, + 0x18, 0x0e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, + 0x74, 0x12, 0x2f, 0x0a, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x0f, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, + 0x75, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, +} + +var ( + file_models_model_httpdns_rule_proto_rawDescOnce sync.Once + file_models_model_httpdns_rule_proto_rawDescData = file_models_model_httpdns_rule_proto_rawDesc +) + +func file_models_model_httpdns_rule_proto_rawDescGZIP() []byte { + file_models_model_httpdns_rule_proto_rawDescOnce.Do(func() { + file_models_model_httpdns_rule_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_httpdns_rule_proto_rawDescData) + }) + return file_models_model_httpdns_rule_proto_rawDescData +} + +var file_models_model_httpdns_rule_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_models_model_httpdns_rule_proto_goTypes = []any{ + (*HTTPDNSRuleRecord)(nil), // 0: pb.HTTPDNSRuleRecord + (*HTTPDNSCustomRule)(nil), // 1: pb.HTTPDNSCustomRule +} +var file_models_model_httpdns_rule_proto_depIdxs = []int32{ + 0, // 0: pb.HTTPDNSCustomRule.records:type_name -> pb.HTTPDNSRuleRecord + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_models_model_httpdns_rule_proto_init() } +func file_models_model_httpdns_rule_proto_init() { + if File_models_model_httpdns_rule_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_models_model_httpdns_rule_proto_rawDesc, + NumEnums: 0, + NumMessages: 2, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_models_model_httpdns_rule_proto_goTypes, + DependencyIndexes: file_models_model_httpdns_rule_proto_depIdxs, + MessageInfos: file_models_model_httpdns_rule_proto_msgTypes, + }.Build() + File_models_model_httpdns_rule_proto = out.File + file_models_model_httpdns_rule_proto_rawDesc = nil + file_models_model_httpdns_rule_proto_goTypes = nil + file_models_model_httpdns_rule_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/model_httpdns_runtime_log.pb.go b/EdgeCommon/pkg/rpc/pb/model_httpdns_runtime_log.pb.go new file mode 100644 index 0000000..e408505 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/model_httpdns_runtime_log.pb.go @@ -0,0 +1,242 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc v3.21.12 +// source: models/model_httpdns_runtime_log.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type HTTPDNSRuntimeLog struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + ClusterId int64 `protobuf:"varint,2,opt,name=clusterId,proto3" json:"clusterId,omitempty"` + NodeId int64 `protobuf:"varint,3,opt,name=nodeId,proto3" json:"nodeId,omitempty"` + Level string `protobuf:"bytes,4,opt,name=level,proto3" json:"level,omitempty"` + Type string `protobuf:"bytes,5,opt,name=type,proto3" json:"type,omitempty"` + Module string `protobuf:"bytes,6,opt,name=module,proto3" json:"module,omitempty"` + Description string `protobuf:"bytes,7,opt,name=description,proto3" json:"description,omitempty"` + Count int64 `protobuf:"varint,8,opt,name=count,proto3" json:"count,omitempty"` + RequestId string `protobuf:"bytes,9,opt,name=requestId,proto3" json:"requestId,omitempty"` + CreatedAt int64 `protobuf:"varint,10,opt,name=createdAt,proto3" json:"createdAt,omitempty"` + Day string `protobuf:"bytes,11,opt,name=day,proto3" json:"day,omitempty"` + ClusterName string `protobuf:"bytes,12,opt,name=clusterName,proto3" json:"clusterName,omitempty"` + NodeName string `protobuf:"bytes,13,opt,name=nodeName,proto3" json:"nodeName,omitempty"` +} + +func (x *HTTPDNSRuntimeLog) Reset() { + *x = HTTPDNSRuntimeLog{} + mi := &file_models_model_httpdns_runtime_log_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *HTTPDNSRuntimeLog) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HTTPDNSRuntimeLog) ProtoMessage() {} + +func (x *HTTPDNSRuntimeLog) ProtoReflect() protoreflect.Message { + mi := &file_models_model_httpdns_runtime_log_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use HTTPDNSRuntimeLog.ProtoReflect.Descriptor instead. +func (*HTTPDNSRuntimeLog) Descriptor() ([]byte, []int) { + return file_models_model_httpdns_runtime_log_proto_rawDescGZIP(), []int{0} +} + +func (x *HTTPDNSRuntimeLog) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *HTTPDNSRuntimeLog) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +func (x *HTTPDNSRuntimeLog) GetNodeId() int64 { + if x != nil { + return x.NodeId + } + return 0 +} + +func (x *HTTPDNSRuntimeLog) GetLevel() string { + if x != nil { + return x.Level + } + return "" +} + +func (x *HTTPDNSRuntimeLog) GetType() string { + if x != nil { + return x.Type + } + return "" +} + +func (x *HTTPDNSRuntimeLog) GetModule() string { + if x != nil { + return x.Module + } + return "" +} + +func (x *HTTPDNSRuntimeLog) GetDescription() string { + if x != nil { + return x.Description + } + return "" +} + +func (x *HTTPDNSRuntimeLog) GetCount() int64 { + if x != nil { + return x.Count + } + return 0 +} + +func (x *HTTPDNSRuntimeLog) GetRequestId() string { + if x != nil { + return x.RequestId + } + return "" +} + +func (x *HTTPDNSRuntimeLog) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *HTTPDNSRuntimeLog) GetDay() string { + if x != nil { + return x.Day + } + return "" +} + +func (x *HTTPDNSRuntimeLog) GetClusterName() string { + if x != nil { + return x.ClusterName + } + return "" +} + +func (x *HTTPDNSRuntimeLog) GetNodeName() string { + if x != nil { + return x.NodeName + } + return "" +} + +var File_models_model_httpdns_runtime_log_proto protoreflect.FileDescriptor + +var file_models_model_httpdns_runtime_log_proto_rawDesc = []byte{ + 0x0a, 0x26, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x68, + 0x74, 0x74, 0x70, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6c, + 0x6f, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xdf, 0x02, 0x0a, + 0x11, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, + 0x6f, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, + 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, + 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, + 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, + 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, + 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, + 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x10, + 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x61, 0x79, + 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, + 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, + 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0d, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_models_model_httpdns_runtime_log_proto_rawDescOnce sync.Once + file_models_model_httpdns_runtime_log_proto_rawDescData = file_models_model_httpdns_runtime_log_proto_rawDesc +) + +func file_models_model_httpdns_runtime_log_proto_rawDescGZIP() []byte { + file_models_model_httpdns_runtime_log_proto_rawDescOnce.Do(func() { + file_models_model_httpdns_runtime_log_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_httpdns_runtime_log_proto_rawDescData) + }) + return file_models_model_httpdns_runtime_log_proto_rawDescData +} + +var file_models_model_httpdns_runtime_log_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_models_model_httpdns_runtime_log_proto_goTypes = []any{ + (*HTTPDNSRuntimeLog)(nil), // 0: pb.HTTPDNSRuntimeLog +} +var file_models_model_httpdns_runtime_log_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_models_model_httpdns_runtime_log_proto_init() } +func file_models_model_httpdns_runtime_log_proto_init() { + if File_models_model_httpdns_runtime_log_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_models_model_httpdns_runtime_log_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_models_model_httpdns_runtime_log_proto_goTypes, + DependencyIndexes: file_models_model_httpdns_runtime_log_proto_depIdxs, + MessageInfos: file_models_model_httpdns_runtime_log_proto_msgTypes, + }.Build() + File_models_model_httpdns_runtime_log_proto = out.File + file_models_model_httpdns_runtime_log_proto_rawDesc = nil + file_models_model_httpdns_runtime_log_proto_goTypes = nil + file_models_model_httpdns_runtime_log_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/model_user.pb.go b/EdgeCommon/pkg/rpc/pb/model_user.pb.go index c2f9bb3..8724012 100644 --- a/EdgeCommon/pkg/rpc/pb/model_user.pb.go +++ b/EdgeCommon/pkg/rpc/pb/model_user.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.0 -// protoc v6.33.2 +// protoc-gen-go v1.36.11 +// protoc v3.21.12 // source: models/model_user.proto package pb @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -42,6 +43,7 @@ type User struct { IsEnterpriseIdentified bool `protobuf:"varint,18,opt,name=isEnterpriseIdentified,proto3" json:"isEnterpriseIdentified,omitempty"` // 是否已通过企业验证 BandwidthAlgo string `protobuf:"bytes,21,opt,name=bandwidthAlgo,proto3" json:"bandwidthAlgo,omitempty"` // 带宽算法 Lang string `protobuf:"bytes,22,opt,name=lang,proto3" json:"lang,omitempty"` // 语言代号 + HttpdnsClusterIdsJSON []byte `protobuf:"bytes,24,opt,name=httpdnsClusterIdsJSON,proto3" json:"httpdnsClusterIdsJSON,omitempty"` // HTTPDNS关联集群ID列表 OtpLogin *Login `protobuf:"bytes,19,opt,name=otpLogin,proto3" json:"otpLogin,omitempty"` // OTP认证 NodeCluster *NodeCluster `protobuf:"bytes,10,opt,name=nodeCluster,proto3" json:"nodeCluster,omitempty"` // 集群信息 Features []*UserFeature `protobuf:"bytes,11,rep,name=features,proto3" json:"features,omitempty"` // 开通功能 @@ -219,6 +221,13 @@ func (x *User) GetLang() string { return "" } +func (x *User) GetHttpdnsClusterIdsJSON() []byte { + if x != nil { + return x.HttpdnsClusterIdsJSON + } + return nil +} + func (x *User) GetOtpLogin() *Login { if x != nil { return x.OtpLogin @@ -242,74 +251,48 @@ func (x *User) GetFeatures() []*UserFeature { var File_models_model_user_proto protoreflect.FileDescriptor -var file_models_model_user_proto_rawDesc = []byte{ - 0x0a, 0x17, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x75, - 0x73, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x1f, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e, 0x6f, 0x64, 0x65, - 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x75, 0x73, 0x65, - 0x72, 0x5f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, - 0x18, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6c, 0x6f, - 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfd, 0x05, 0x0a, 0x04, 0x55, 0x73, - 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, - 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, - 0x0a, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x6f, - 0x62, 0x69, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x6f, 0x62, 0x69, - 0x6c, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x74, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x76, 0x65, - 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x14, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0d, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, 0x6d, 0x61, 0x69, 0x6c, - 0x12, 0x26, 0x0a, 0x0e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x4d, 0x6f, 0x62, 0x69, - 0x6c, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, - 0x65, 0x64, 0x4d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x61, - 0x72, 0x6b, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x61, 0x72, 0x6b, - 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, - 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, - 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, - 0x41, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, - 0x49, 0x50, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x65, 0x72, 0x65, 0x64, 0x49, 0x50, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x56, 0x65, 0x72, 0x69, - 0x66, 0x69, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x56, 0x65, - 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x52, 0x65, 0x6a, 0x65, - 0x63, 0x74, 0x65, 0x64, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x52, 0x65, - 0x6a, 0x65, 0x63, 0x74, 0x65, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, - 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, - 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, - 0x73, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x12, 0x36, 0x0a, 0x16, 0x69, 0x73, 0x49, 0x6e, - 0x64, 0x69, 0x76, 0x69, 0x64, 0x75, 0x61, 0x6c, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, - 0x65, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x16, 0x69, 0x73, 0x49, 0x6e, 0x64, 0x69, - 0x76, 0x69, 0x64, 0x75, 0x61, 0x6c, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, - 0x12, 0x36, 0x0a, 0x16, 0x69, 0x73, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, - 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x16, 0x69, 0x73, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x49, 0x64, - 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x62, 0x61, 0x6e, 0x64, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x41, 0x6c, 0x67, 0x6f, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0d, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x41, 0x6c, 0x67, 0x6f, 0x12, 0x12, - 0x0a, 0x04, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x61, - 0x6e, 0x67, 0x12, 0x25, 0x0a, 0x08, 0x6f, 0x74, 0x70, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x18, 0x13, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, - 0x08, 0x6f, 0x74, 0x70, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x31, 0x0a, 0x0b, 0x6e, 0x6f, 0x64, - 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, - 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, - 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x08, - 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, - 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, - 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +const file_models_model_user_proto_rawDesc = "" + + "\n" + + "\x17models/model_user.proto\x12\x02pb\x1a\x1fmodels/model_node_cluster.proto\x1a\x1fmodels/model_user_feature.proto\x1a\x18models/model_login.proto\"\xb3\x06\n" + + "\x04User\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + + "\busername\x18\x02 \x01(\tR\busername\x12\x1a\n" + + "\bfullname\x18\x03 \x01(\tR\bfullname\x12\x16\n" + + "\x06mobile\x18\x04 \x01(\tR\x06mobile\x12\x10\n" + + "\x03tel\x18\x05 \x01(\tR\x03tel\x12\x14\n" + + "\x05email\x18\x06 \x01(\tR\x05email\x12$\n" + + "\rverifiedEmail\x18\x14 \x01(\tR\rverifiedEmail\x12&\n" + + "\x0everifiedMobile\x18\x17 \x01(\tR\x0everifiedMobile\x12\x16\n" + + "\x06remark\x18\a \x01(\tR\x06remark\x12\x12\n" + + "\x04isOn\x18\b \x01(\bR\x04isOn\x12\x1c\n" + + "\tcreatedAt\x18\t \x01(\x03R\tcreatedAt\x12\"\n" + + "\fregisteredIP\x18\f \x01(\tR\fregisteredIP\x12\x1e\n" + + "\n" + + "isVerified\x18\r \x01(\bR\n" + + "isVerified\x12\x1e\n" + + "\n" + + "isRejected\x18\x0e \x01(\bR\n" + + "isRejected\x12\"\n" + + "\frejectReason\x18\x0f \x01(\tR\frejectReason\x12\x1c\n" + + "\tisDeleted\x18\x10 \x01(\bR\tisDeleted\x126\n" + + "\x16isIndividualIdentified\x18\x11 \x01(\bR\x16isIndividualIdentified\x126\n" + + "\x16isEnterpriseIdentified\x18\x12 \x01(\bR\x16isEnterpriseIdentified\x12$\n" + + "\rbandwidthAlgo\x18\x15 \x01(\tR\rbandwidthAlgo\x12\x12\n" + + "\x04lang\x18\x16 \x01(\tR\x04lang\x124\n" + + "\x15httpdnsClusterIdsJSON\x18\x18 \x01(\fR\x15httpdnsClusterIdsJSON\x12%\n" + + "\botpLogin\x18\x13 \x01(\v2\t.pb.LoginR\botpLogin\x121\n" + + "\vnodeCluster\x18\n" + + " \x01(\v2\x0f.pb.NodeClusterR\vnodeCluster\x12+\n" + + "\bfeatures\x18\v \x03(\v2\x0f.pb.UserFeatureR\bfeaturesB\x06Z\x04./pbb\x06proto3" var ( file_models_model_user_proto_rawDescOnce sync.Once - file_models_model_user_proto_rawDescData = file_models_model_user_proto_rawDesc + file_models_model_user_proto_rawDescData []byte ) func file_models_model_user_proto_rawDescGZIP() []byte { file_models_model_user_proto_rawDescOnce.Do(func() { - file_models_model_user_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_user_proto_rawDescData) + file_models_model_user_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_models_model_user_proto_rawDesc), len(file_models_model_user_proto_rawDesc))) }) return file_models_model_user_proto_rawDescData } @@ -344,7 +327,7 @@ func file_models_model_user_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_models_model_user_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_models_model_user_proto_rawDesc), len(file_models_model_user_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, @@ -355,7 +338,6 @@ func file_models_model_user_proto_init() { MessageInfos: file_models_model_user_proto_msgTypes, }.Build() File_models_model_user_proto = out.File - file_models_model_user_proto_rawDesc = nil file_models_model_user_proto_goTypes = nil file_models_model_user_proto_depIdxs = nil } diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_access_log.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_access_log.pb.go new file mode 100644 index 0000000..291a198 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_access_log.pb.go @@ -0,0 +1,377 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc v3.21.12 +// source: service_httpdns_access_log.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type CreateHTTPDNSAccessLogsRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Logs []*HTTPDNSAccessLog `protobuf:"bytes,1,rep,name=logs,proto3" json:"logs,omitempty"` +} + +func (x *CreateHTTPDNSAccessLogsRequest) Reset() { + *x = CreateHTTPDNSAccessLogsRequest{} + mi := &file_service_httpdns_access_log_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSAccessLogsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSAccessLogsRequest) ProtoMessage() {} + +func (x *CreateHTTPDNSAccessLogsRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_access_log_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSAccessLogsRequest.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSAccessLogsRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_access_log_proto_rawDescGZIP(), []int{0} +} + +func (x *CreateHTTPDNSAccessLogsRequest) GetLogs() []*HTTPDNSAccessLog { + if x != nil { + return x.Logs + } + return nil +} + +type CreateHTTPDNSAccessLogsResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *CreateHTTPDNSAccessLogsResponse) Reset() { + *x = CreateHTTPDNSAccessLogsResponse{} + mi := &file_service_httpdns_access_log_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSAccessLogsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSAccessLogsResponse) ProtoMessage() {} + +func (x *CreateHTTPDNSAccessLogsResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_access_log_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSAccessLogsResponse.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSAccessLogsResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_access_log_proto_rawDescGZIP(), []int{1} +} + +type ListHTTPDNSAccessLogsRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Day string `protobuf:"bytes,1,opt,name=day,proto3" json:"day,omitempty"` + ClusterId int64 `protobuf:"varint,2,opt,name=clusterId,proto3" json:"clusterId,omitempty"` + NodeId int64 `protobuf:"varint,3,opt,name=nodeId,proto3" json:"nodeId,omitempty"` + AppId string `protobuf:"bytes,4,opt,name=appId,proto3" json:"appId,omitempty"` + Domain string `protobuf:"bytes,5,opt,name=domain,proto3" json:"domain,omitempty"` + Status string `protobuf:"bytes,6,opt,name=status,proto3" json:"status,omitempty"` + Keyword string `protobuf:"bytes,7,opt,name=keyword,proto3" json:"keyword,omitempty"` + Offset int64 `protobuf:"varint,8,opt,name=offset,proto3" json:"offset,omitempty"` + Size int64 `protobuf:"varint,9,opt,name=size,proto3" json:"size,omitempty"` +} + +func (x *ListHTTPDNSAccessLogsRequest) Reset() { + *x = ListHTTPDNSAccessLogsRequest{} + mi := &file_service_httpdns_access_log_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSAccessLogsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSAccessLogsRequest) ProtoMessage() {} + +func (x *ListHTTPDNSAccessLogsRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_access_log_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSAccessLogsRequest.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSAccessLogsRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_access_log_proto_rawDescGZIP(), []int{2} +} + +func (x *ListHTTPDNSAccessLogsRequest) GetDay() string { + if x != nil { + return x.Day + } + return "" +} + +func (x *ListHTTPDNSAccessLogsRequest) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +func (x *ListHTTPDNSAccessLogsRequest) GetNodeId() int64 { + if x != nil { + return x.NodeId + } + return 0 +} + +func (x *ListHTTPDNSAccessLogsRequest) GetAppId() string { + if x != nil { + return x.AppId + } + return "" +} + +func (x *ListHTTPDNSAccessLogsRequest) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *ListHTTPDNSAccessLogsRequest) GetStatus() string { + if x != nil { + return x.Status + } + return "" +} + +func (x *ListHTTPDNSAccessLogsRequest) GetKeyword() string { + if x != nil { + return x.Keyword + } + return "" +} + +func (x *ListHTTPDNSAccessLogsRequest) GetOffset() int64 { + if x != nil { + return x.Offset + } + return 0 +} + +func (x *ListHTTPDNSAccessLogsRequest) GetSize() int64 { + if x != nil { + return x.Size + } + return 0 +} + +type ListHTTPDNSAccessLogsResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Logs []*HTTPDNSAccessLog `protobuf:"bytes,1,rep,name=logs,proto3" json:"logs,omitempty"` + Total int64 `protobuf:"varint,2,opt,name=total,proto3" json:"total,omitempty"` +} + +func (x *ListHTTPDNSAccessLogsResponse) Reset() { + *x = ListHTTPDNSAccessLogsResponse{} + mi := &file_service_httpdns_access_log_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSAccessLogsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSAccessLogsResponse) ProtoMessage() {} + +func (x *ListHTTPDNSAccessLogsResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_access_log_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSAccessLogsResponse.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSAccessLogsResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_access_log_proto_rawDescGZIP(), []int{3} +} + +func (x *ListHTTPDNSAccessLogsResponse) GetLogs() []*HTTPDNSAccessLog { + if x != nil { + return x.Logs + } + return nil +} + +func (x *ListHTTPDNSAccessLogsResponse) GetTotal() int64 { + if x != nil { + return x.Total + } + return 0 +} + +var File_service_httpdns_access_log_proto protoreflect.FileDescriptor + +var file_service_httpdns_access_log_proto_rawDesc = []byte{ + 0x0a, 0x20, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x64, 0x6e, + 0x73, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x25, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x64, 0x6e, 0x73, 0x5f, 0x61, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4a, 0x0a, + 0x1e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x41, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x28, 0x0a, 0x04, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x70, 0x62, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x4c, 0x6f, 0x67, 0x52, 0x04, 0x6c, 0x6f, 0x67, 0x73, 0x22, 0x21, 0x0a, 0x1f, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xf2, 0x01, 0x0a, + 0x1c, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x41, 0x63, 0x63, 0x65, + 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, + 0x03, 0x64, 0x61, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, + 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a, + 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, + 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, + 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, + 0x61, 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x06, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x6b, + 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, + 0x79, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x12, 0x12, 0x0a, + 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, + 0x65, 0x22, 0x5f, 0x0a, 0x1d, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, + 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x41, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x52, 0x04, 0x6c, 0x6f, 0x67, 0x73, 0x12, 0x14, 0x0a, 0x05, + 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, + 0x61, 0x6c, 0x32, 0xdb, 0x01, 0x0a, 0x17, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x41, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x62, + 0x0a, 0x17, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x41, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x22, 0x2e, 0x70, 0x62, 0x2e, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x41, 0x63, 0x63, 0x65, + 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, + 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, + 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x5c, 0x0a, 0x15, 0x6c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, + 0x53, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x20, 0x2e, 0x70, 0x62, + 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x41, 0x63, 0x63, 0x65, + 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, + 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x41, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_service_httpdns_access_log_proto_rawDescOnce sync.Once + file_service_httpdns_access_log_proto_rawDescData = file_service_httpdns_access_log_proto_rawDesc +) + +func file_service_httpdns_access_log_proto_rawDescGZIP() []byte { + file_service_httpdns_access_log_proto_rawDescOnce.Do(func() { + file_service_httpdns_access_log_proto_rawDescData = protoimpl.X.CompressGZIP(file_service_httpdns_access_log_proto_rawDescData) + }) + return file_service_httpdns_access_log_proto_rawDescData +} + +var file_service_httpdns_access_log_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_service_httpdns_access_log_proto_goTypes = []any{ + (*CreateHTTPDNSAccessLogsRequest)(nil), // 0: pb.CreateHTTPDNSAccessLogsRequest + (*CreateHTTPDNSAccessLogsResponse)(nil), // 1: pb.CreateHTTPDNSAccessLogsResponse + (*ListHTTPDNSAccessLogsRequest)(nil), // 2: pb.ListHTTPDNSAccessLogsRequest + (*ListHTTPDNSAccessLogsResponse)(nil), // 3: pb.ListHTTPDNSAccessLogsResponse + (*HTTPDNSAccessLog)(nil), // 4: pb.HTTPDNSAccessLog +} +var file_service_httpdns_access_log_proto_depIdxs = []int32{ + 4, // 0: pb.CreateHTTPDNSAccessLogsRequest.logs:type_name -> pb.HTTPDNSAccessLog + 4, // 1: pb.ListHTTPDNSAccessLogsResponse.logs:type_name -> pb.HTTPDNSAccessLog + 0, // 2: pb.HTTPDNSAccessLogService.createHTTPDNSAccessLogs:input_type -> pb.CreateHTTPDNSAccessLogsRequest + 2, // 3: pb.HTTPDNSAccessLogService.listHTTPDNSAccessLogs:input_type -> pb.ListHTTPDNSAccessLogsRequest + 1, // 4: pb.HTTPDNSAccessLogService.createHTTPDNSAccessLogs:output_type -> pb.CreateHTTPDNSAccessLogsResponse + 3, // 5: pb.HTTPDNSAccessLogService.listHTTPDNSAccessLogs:output_type -> pb.ListHTTPDNSAccessLogsResponse + 4, // [4:6] is the sub-list for method output_type + 2, // [2:4] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name +} + +func init() { file_service_httpdns_access_log_proto_init() } +func file_service_httpdns_access_log_proto_init() { + if File_service_httpdns_access_log_proto != nil { + return + } + file_models_model_httpdns_access_log_proto_init() + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_service_httpdns_access_log_proto_rawDesc, + NumEnums: 0, + NumMessages: 4, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_service_httpdns_access_log_proto_goTypes, + DependencyIndexes: file_service_httpdns_access_log_proto_depIdxs, + MessageInfos: file_service_httpdns_access_log_proto_msgTypes, + }.Build() + File_service_httpdns_access_log_proto = out.File + file_service_httpdns_access_log_proto_rawDesc = nil + file_service_httpdns_access_log_proto_goTypes = nil + file_service_httpdns_access_log_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_access_log_grpc.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_access_log_grpc.pb.go new file mode 100644 index 0000000..72f8c12 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_access_log_grpc.pb.go @@ -0,0 +1,157 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.5.1 +// - protoc v3.21.12 +// source: service_httpdns_access_log.proto + +package pb + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + HTTPDNSAccessLogService_CreateHTTPDNSAccessLogs_FullMethodName = "/pb.HTTPDNSAccessLogService/createHTTPDNSAccessLogs" + HTTPDNSAccessLogService_ListHTTPDNSAccessLogs_FullMethodName = "/pb.HTTPDNSAccessLogService/listHTTPDNSAccessLogs" +) + +// HTTPDNSAccessLogServiceClient is the client API for HTTPDNSAccessLogService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type HTTPDNSAccessLogServiceClient interface { + CreateHTTPDNSAccessLogs(ctx context.Context, in *CreateHTTPDNSAccessLogsRequest, opts ...grpc.CallOption) (*CreateHTTPDNSAccessLogsResponse, error) + ListHTTPDNSAccessLogs(ctx context.Context, in *ListHTTPDNSAccessLogsRequest, opts ...grpc.CallOption) (*ListHTTPDNSAccessLogsResponse, error) +} + +type hTTPDNSAccessLogServiceClient struct { + cc grpc.ClientConnInterface +} + +func NewHTTPDNSAccessLogServiceClient(cc grpc.ClientConnInterface) HTTPDNSAccessLogServiceClient { + return &hTTPDNSAccessLogServiceClient{cc} +} + +func (c *hTTPDNSAccessLogServiceClient) CreateHTTPDNSAccessLogs(ctx context.Context, in *CreateHTTPDNSAccessLogsRequest, opts ...grpc.CallOption) (*CreateHTTPDNSAccessLogsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(CreateHTTPDNSAccessLogsResponse) + err := c.cc.Invoke(ctx, HTTPDNSAccessLogService_CreateHTTPDNSAccessLogs_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSAccessLogServiceClient) ListHTTPDNSAccessLogs(ctx context.Context, in *ListHTTPDNSAccessLogsRequest, opts ...grpc.CallOption) (*ListHTTPDNSAccessLogsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ListHTTPDNSAccessLogsResponse) + err := c.cc.Invoke(ctx, HTTPDNSAccessLogService_ListHTTPDNSAccessLogs_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +// HTTPDNSAccessLogServiceServer is the server API for HTTPDNSAccessLogService service. +// All implementations should embed UnimplementedHTTPDNSAccessLogServiceServer +// for forward compatibility. +type HTTPDNSAccessLogServiceServer interface { + CreateHTTPDNSAccessLogs(context.Context, *CreateHTTPDNSAccessLogsRequest) (*CreateHTTPDNSAccessLogsResponse, error) + ListHTTPDNSAccessLogs(context.Context, *ListHTTPDNSAccessLogsRequest) (*ListHTTPDNSAccessLogsResponse, error) +} + +// UnimplementedHTTPDNSAccessLogServiceServer should be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedHTTPDNSAccessLogServiceServer struct{} + +func (UnimplementedHTTPDNSAccessLogServiceServer) CreateHTTPDNSAccessLogs(context.Context, *CreateHTTPDNSAccessLogsRequest) (*CreateHTTPDNSAccessLogsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateHTTPDNSAccessLogs not implemented") +} +func (UnimplementedHTTPDNSAccessLogServiceServer) ListHTTPDNSAccessLogs(context.Context, *ListHTTPDNSAccessLogsRequest) (*ListHTTPDNSAccessLogsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListHTTPDNSAccessLogs not implemented") +} +func (UnimplementedHTTPDNSAccessLogServiceServer) testEmbeddedByValue() {} + +// UnsafeHTTPDNSAccessLogServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to HTTPDNSAccessLogServiceServer will +// result in compilation errors. +type UnsafeHTTPDNSAccessLogServiceServer interface { + mustEmbedUnimplementedHTTPDNSAccessLogServiceServer() +} + +func RegisterHTTPDNSAccessLogServiceServer(s grpc.ServiceRegistrar, srv HTTPDNSAccessLogServiceServer) { + // If the following call pancis, it indicates UnimplementedHTTPDNSAccessLogServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&HTTPDNSAccessLogService_ServiceDesc, srv) +} + +func _HTTPDNSAccessLogService_CreateHTTPDNSAccessLogs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateHTTPDNSAccessLogsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSAccessLogServiceServer).CreateHTTPDNSAccessLogs(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSAccessLogService_CreateHTTPDNSAccessLogs_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSAccessLogServiceServer).CreateHTTPDNSAccessLogs(ctx, req.(*CreateHTTPDNSAccessLogsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSAccessLogService_ListHTTPDNSAccessLogs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListHTTPDNSAccessLogsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSAccessLogServiceServer).ListHTTPDNSAccessLogs(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSAccessLogService_ListHTTPDNSAccessLogs_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSAccessLogServiceServer).ListHTTPDNSAccessLogs(ctx, req.(*ListHTTPDNSAccessLogsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// HTTPDNSAccessLogService_ServiceDesc is the grpc.ServiceDesc for HTTPDNSAccessLogService service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var HTTPDNSAccessLogService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "pb.HTTPDNSAccessLogService", + HandlerType: (*HTTPDNSAccessLogServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "createHTTPDNSAccessLogs", + Handler: _HTTPDNSAccessLogService_CreateHTTPDNSAccessLogs_Handler, + }, + { + MethodName: "listHTTPDNSAccessLogs", + Handler: _HTTPDNSAccessLogService_ListHTTPDNSAccessLogs_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "service_httpdns_access_log.proto", +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_app.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_app.pb.go new file mode 100644 index 0000000..45cfd7d --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_app.pb.go @@ -0,0 +1,828 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.36.11 +// protoc v3.21.12 +// source: service_httpdns_app.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" + unsafe "unsafe" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type CreateHTTPDNSAppRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + AppId string `protobuf:"bytes,2,opt,name=appId,proto3" json:"appId,omitempty"` + IsOn bool `protobuf:"varint,5,opt,name=isOn,proto3" json:"isOn,omitempty"` + SignEnabled bool `protobuf:"varint,6,opt,name=signEnabled,proto3" json:"signEnabled,omitempty"` + UserId int64 `protobuf:"varint,7,opt,name=userId,proto3" json:"userId,omitempty"` + ClusterIdsJSON []byte `protobuf:"bytes,8,opt,name=clusterIdsJSON,proto3" json:"clusterIdsJSON,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CreateHTTPDNSAppRequest) Reset() { + *x = CreateHTTPDNSAppRequest{} + mi := &file_service_httpdns_app_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSAppRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSAppRequest) ProtoMessage() {} + +func (x *CreateHTTPDNSAppRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSAppRequest.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSAppRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{0} +} + +func (x *CreateHTTPDNSAppRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *CreateHTTPDNSAppRequest) GetAppId() string { + if x != nil { + return x.AppId + } + return "" +} + +func (x *CreateHTTPDNSAppRequest) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +func (x *CreateHTTPDNSAppRequest) GetSignEnabled() bool { + if x != nil { + return x.SignEnabled + } + return false +} + +func (x *CreateHTTPDNSAppRequest) GetUserId() int64 { + if x != nil { + return x.UserId + } + return 0 +} + +func (x *CreateHTTPDNSAppRequest) GetClusterIdsJSON() []byte { + if x != nil { + return x.ClusterIdsJSON + } + return nil +} + +type CreateHTTPDNSAppResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + AppDbId int64 `protobuf:"varint,1,opt,name=appDbId,proto3" json:"appDbId,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CreateHTTPDNSAppResponse) Reset() { + *x = CreateHTTPDNSAppResponse{} + mi := &file_service_httpdns_app_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSAppResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSAppResponse) ProtoMessage() {} + +func (x *CreateHTTPDNSAppResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSAppResponse.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSAppResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{1} +} + +func (x *CreateHTTPDNSAppResponse) GetAppDbId() int64 { + if x != nil { + return x.AppDbId + } + return 0 +} + +type UpdateHTTPDNSAppRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + AppDbId int64 `protobuf:"varint,1,opt,name=appDbId,proto3" json:"appDbId,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + IsOn bool `protobuf:"varint,5,opt,name=isOn,proto3" json:"isOn,omitempty"` + UserId int64 `protobuf:"varint,6,opt,name=userId,proto3" json:"userId,omitempty"` + ClusterIdsJSON []byte `protobuf:"bytes,7,opt,name=clusterIdsJSON,proto3" json:"clusterIdsJSON,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UpdateHTTPDNSAppRequest) Reset() { + *x = UpdateHTTPDNSAppRequest{} + mi := &file_service_httpdns_app_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateHTTPDNSAppRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateHTTPDNSAppRequest) ProtoMessage() {} + +func (x *UpdateHTTPDNSAppRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateHTTPDNSAppRequest.ProtoReflect.Descriptor instead. +func (*UpdateHTTPDNSAppRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{2} +} + +func (x *UpdateHTTPDNSAppRequest) GetAppDbId() int64 { + if x != nil { + return x.AppDbId + } + return 0 +} + +func (x *UpdateHTTPDNSAppRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *UpdateHTTPDNSAppRequest) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +func (x *UpdateHTTPDNSAppRequest) GetUserId() int64 { + if x != nil { + return x.UserId + } + return 0 +} + +func (x *UpdateHTTPDNSAppRequest) GetClusterIdsJSON() []byte { + if x != nil { + return x.ClusterIdsJSON + } + return nil +} + +type DeleteHTTPDNSAppRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + AppDbId int64 `protobuf:"varint,1,opt,name=appDbId,proto3" json:"appDbId,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *DeleteHTTPDNSAppRequest) Reset() { + *x = DeleteHTTPDNSAppRequest{} + mi := &file_service_httpdns_app_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DeleteHTTPDNSAppRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteHTTPDNSAppRequest) ProtoMessage() {} + +func (x *DeleteHTTPDNSAppRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteHTTPDNSAppRequest.ProtoReflect.Descriptor instead. +func (*DeleteHTTPDNSAppRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{3} +} + +func (x *DeleteHTTPDNSAppRequest) GetAppDbId() int64 { + if x != nil { + return x.AppDbId + } + return 0 +} + +type FindHTTPDNSAppRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + AppDbId int64 `protobuf:"varint,1,opt,name=appDbId,proto3" json:"appDbId,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *FindHTTPDNSAppRequest) Reset() { + *x = FindHTTPDNSAppRequest{} + mi := &file_service_httpdns_app_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FindHTTPDNSAppRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindHTTPDNSAppRequest) ProtoMessage() {} + +func (x *FindHTTPDNSAppRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindHTTPDNSAppRequest.ProtoReflect.Descriptor instead. +func (*FindHTTPDNSAppRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{4} +} + +func (x *FindHTTPDNSAppRequest) GetAppDbId() int64 { + if x != nil { + return x.AppDbId + } + return 0 +} + +type FindHTTPDNSAppResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + App *HTTPDNSApp `protobuf:"bytes,1,opt,name=app,proto3" json:"app,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *FindHTTPDNSAppResponse) Reset() { + *x = FindHTTPDNSAppResponse{} + mi := &file_service_httpdns_app_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FindHTTPDNSAppResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindHTTPDNSAppResponse) ProtoMessage() {} + +func (x *FindHTTPDNSAppResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[5] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindHTTPDNSAppResponse.ProtoReflect.Descriptor instead. +func (*FindHTTPDNSAppResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{5} +} + +func (x *FindHTTPDNSAppResponse) GetApp() *HTTPDNSApp { + if x != nil { + return x.App + } + return nil +} + +type ListHTTPDNSAppsRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Offset int64 `protobuf:"varint,1,opt,name=offset,proto3" json:"offset,omitempty"` + Size int64 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"` + Keyword string `protobuf:"bytes,3,opt,name=keyword,proto3" json:"keyword,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ListHTTPDNSAppsRequest) Reset() { + *x = ListHTTPDNSAppsRequest{} + mi := &file_service_httpdns_app_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSAppsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSAppsRequest) ProtoMessage() {} + +func (x *ListHTTPDNSAppsRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[6] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSAppsRequest.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSAppsRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{6} +} + +func (x *ListHTTPDNSAppsRequest) GetOffset() int64 { + if x != nil { + return x.Offset + } + return 0 +} + +func (x *ListHTTPDNSAppsRequest) GetSize() int64 { + if x != nil { + return x.Size + } + return 0 +} + +func (x *ListHTTPDNSAppsRequest) GetKeyword() string { + if x != nil { + return x.Keyword + } + return "" +} + +type ListHTTPDNSAppsResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Apps []*HTTPDNSApp `protobuf:"bytes,1,rep,name=apps,proto3" json:"apps,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ListHTTPDNSAppsResponse) Reset() { + *x = ListHTTPDNSAppsResponse{} + mi := &file_service_httpdns_app_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSAppsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSAppsResponse) ProtoMessage() {} + +func (x *ListHTTPDNSAppsResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[7] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSAppsResponse.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSAppsResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{7} +} + +func (x *ListHTTPDNSAppsResponse) GetApps() []*HTTPDNSApp { + if x != nil { + return x.Apps + } + return nil +} + +type FindAllHTTPDNSAppsRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *FindAllHTTPDNSAppsRequest) Reset() { + *x = FindAllHTTPDNSAppsRequest{} + mi := &file_service_httpdns_app_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FindAllHTTPDNSAppsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindAllHTTPDNSAppsRequest) ProtoMessage() {} + +func (x *FindAllHTTPDNSAppsRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[8] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindAllHTTPDNSAppsRequest.ProtoReflect.Descriptor instead. +func (*FindAllHTTPDNSAppsRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{8} +} + +type FindAllHTTPDNSAppsResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Apps []*HTTPDNSApp `protobuf:"bytes,1,rep,name=apps,proto3" json:"apps,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *FindAllHTTPDNSAppsResponse) Reset() { + *x = FindAllHTTPDNSAppsResponse{} + mi := &file_service_httpdns_app_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FindAllHTTPDNSAppsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindAllHTTPDNSAppsResponse) ProtoMessage() {} + +func (x *FindAllHTTPDNSAppsResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[9] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindAllHTTPDNSAppsResponse.ProtoReflect.Descriptor instead. +func (*FindAllHTTPDNSAppsResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{9} +} + +func (x *FindAllHTTPDNSAppsResponse) GetApps() []*HTTPDNSApp { + if x != nil { + return x.Apps + } + return nil +} + +type UpdateHTTPDNSAppSignEnabledRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + AppDbId int64 `protobuf:"varint,1,opt,name=appDbId,proto3" json:"appDbId,omitempty"` + SignEnabled bool `protobuf:"varint,2,opt,name=signEnabled,proto3" json:"signEnabled,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UpdateHTTPDNSAppSignEnabledRequest) Reset() { + *x = UpdateHTTPDNSAppSignEnabledRequest{} + mi := &file_service_httpdns_app_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateHTTPDNSAppSignEnabledRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateHTTPDNSAppSignEnabledRequest) ProtoMessage() {} + +func (x *UpdateHTTPDNSAppSignEnabledRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[10] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateHTTPDNSAppSignEnabledRequest.ProtoReflect.Descriptor instead. +func (*UpdateHTTPDNSAppSignEnabledRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{10} +} + +func (x *UpdateHTTPDNSAppSignEnabledRequest) GetAppDbId() int64 { + if x != nil { + return x.AppDbId + } + return 0 +} + +func (x *UpdateHTTPDNSAppSignEnabledRequest) GetSignEnabled() bool { + if x != nil { + return x.SignEnabled + } + return false +} + +type ResetHTTPDNSAppSignSecretRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + AppDbId int64 `protobuf:"varint,1,opt,name=appDbId,proto3" json:"appDbId,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ResetHTTPDNSAppSignSecretRequest) Reset() { + *x = ResetHTTPDNSAppSignSecretRequest{} + mi := &file_service_httpdns_app_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ResetHTTPDNSAppSignSecretRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ResetHTTPDNSAppSignSecretRequest) ProtoMessage() {} + +func (x *ResetHTTPDNSAppSignSecretRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[11] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ResetHTTPDNSAppSignSecretRequest.ProtoReflect.Descriptor instead. +func (*ResetHTTPDNSAppSignSecretRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{11} +} + +func (x *ResetHTTPDNSAppSignSecretRequest) GetAppDbId() int64 { + if x != nil { + return x.AppDbId + } + return 0 +} + +type ResetHTTPDNSAppSignSecretResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + SignSecret string `protobuf:"bytes,1,opt,name=signSecret,proto3" json:"signSecret,omitempty"` + UpdatedAt int64 `protobuf:"varint,2,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ResetHTTPDNSAppSignSecretResponse) Reset() { + *x = ResetHTTPDNSAppSignSecretResponse{} + mi := &file_service_httpdns_app_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ResetHTTPDNSAppSignSecretResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ResetHTTPDNSAppSignSecretResponse) ProtoMessage() {} + +func (x *ResetHTTPDNSAppSignSecretResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_app_proto_msgTypes[12] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ResetHTTPDNSAppSignSecretResponse.ProtoReflect.Descriptor instead. +func (*ResetHTTPDNSAppSignSecretResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_app_proto_rawDescGZIP(), []int{12} +} + +func (x *ResetHTTPDNSAppSignSecretResponse) GetSignSecret() string { + if x != nil { + return x.SignSecret + } + return "" +} + +func (x *ResetHTTPDNSAppSignSecretResponse) GetUpdatedAt() int64 { + if x != nil { + return x.UpdatedAt + } + return 0 +} + +var File_service_httpdns_app_proto protoreflect.FileDescriptor + +const file_service_httpdns_app_proto_rawDesc = "" + + "\n" + + "\x19service_httpdns_app.proto\x12\x02pb\x1a\x1emodels/model_httpdns_app.proto\x1a\x19models/rpc_messages.proto\"\xc5\x01\n" + + "\x17CreateHTTPDNSAppRequest\x12\x12\n" + + "\x04name\x18\x01 \x01(\tR\x04name\x12\x14\n" + + "\x05appId\x18\x02 \x01(\tR\x05appId\x12\x12\n" + + "\x04isOn\x18\x05 \x01(\bR\x04isOn\x12 \n" + + "\vsignEnabled\x18\x06 \x01(\bR\vsignEnabled\x12\x16\n" + + "\x06userId\x18\a \x01(\x03R\x06userId\x12&\n" + + "\x0eclusterIdsJSON\x18\b \x01(\fR\x0eclusterIdsJSONJ\x04\b\x03\x10\x04J\x04\b\x04\x10\x05\"4\n" + + "\x18CreateHTTPDNSAppResponse\x12\x18\n" + + "\aappDbId\x18\x01 \x01(\x03R\aappDbId\"\xa7\x01\n" + + "\x17UpdateHTTPDNSAppRequest\x12\x18\n" + + "\aappDbId\x18\x01 \x01(\x03R\aappDbId\x12\x12\n" + + "\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n" + + "\x04isOn\x18\x05 \x01(\bR\x04isOn\x12\x16\n" + + "\x06userId\x18\x06 \x01(\x03R\x06userId\x12&\n" + + "\x0eclusterIdsJSON\x18\a \x01(\fR\x0eclusterIdsJSONJ\x04\b\x03\x10\x04J\x04\b\x04\x10\x05\"3\n" + + "\x17DeleteHTTPDNSAppRequest\x12\x18\n" + + "\aappDbId\x18\x01 \x01(\x03R\aappDbId\"1\n" + + "\x15FindHTTPDNSAppRequest\x12\x18\n" + + "\aappDbId\x18\x01 \x01(\x03R\aappDbId\":\n" + + "\x16FindHTTPDNSAppResponse\x12 \n" + + "\x03app\x18\x01 \x01(\v2\x0e.pb.HTTPDNSAppR\x03app\"^\n" + + "\x16ListHTTPDNSAppsRequest\x12\x16\n" + + "\x06offset\x18\x01 \x01(\x03R\x06offset\x12\x12\n" + + "\x04size\x18\x02 \x01(\x03R\x04size\x12\x18\n" + + "\akeyword\x18\x03 \x01(\tR\akeyword\"=\n" + + "\x17ListHTTPDNSAppsResponse\x12\"\n" + + "\x04apps\x18\x01 \x03(\v2\x0e.pb.HTTPDNSAppR\x04apps\"\x1b\n" + + "\x19FindAllHTTPDNSAppsRequest\"@\n" + + "\x1aFindAllHTTPDNSAppsResponse\x12\"\n" + + "\x04apps\x18\x01 \x03(\v2\x0e.pb.HTTPDNSAppR\x04apps\"`\n" + + "\"UpdateHTTPDNSAppSignEnabledRequest\x12\x18\n" + + "\aappDbId\x18\x01 \x01(\x03R\aappDbId\x12 \n" + + "\vsignEnabled\x18\x02 \x01(\bR\vsignEnabled\"<\n" + + " ResetHTTPDNSAppSignSecretRequest\x12\x18\n" + + "\aappDbId\x18\x01 \x01(\x03R\aappDbId\"a\n" + + "!ResetHTTPDNSAppSignSecretResponse\x12\x1e\n" + + "\n" + + "signSecret\x18\x01 \x01(\tR\n" + + "signSecret\x12\x1c\n" + + "\tupdatedAt\x18\x02 \x01(\x03R\tupdatedAt2\x8f\x05\n" + + "\x11HTTPDNSAppService\x12M\n" + + "\x10createHTTPDNSApp\x12\x1b.pb.CreateHTTPDNSAppRequest\x1a\x1c.pb.CreateHTTPDNSAppResponse\x12?\n" + + "\x10updateHTTPDNSApp\x12\x1b.pb.UpdateHTTPDNSAppRequest\x1a\x0e.pb.RPCSuccess\x12?\n" + + "\x10deleteHTTPDNSApp\x12\x1b.pb.DeleteHTTPDNSAppRequest\x1a\x0e.pb.RPCSuccess\x12G\n" + + "\x0efindHTTPDNSApp\x12\x19.pb.FindHTTPDNSAppRequest\x1a\x1a.pb.FindHTTPDNSAppResponse\x12J\n" + + "\x0flistHTTPDNSApps\x12\x1a.pb.ListHTTPDNSAppsRequest\x1a\x1b.pb.ListHTTPDNSAppsResponse\x12S\n" + + "\x12findAllHTTPDNSApps\x12\x1d.pb.FindAllHTTPDNSAppsRequest\x1a\x1e.pb.FindAllHTTPDNSAppsResponse\x12U\n" + + "\x1bupdateHTTPDNSAppSignEnabled\x12&.pb.UpdateHTTPDNSAppSignEnabledRequest\x1a\x0e.pb.RPCSuccess\x12h\n" + + "\x19resetHTTPDNSAppSignSecret\x12$.pb.ResetHTTPDNSAppSignSecretRequest\x1a%.pb.ResetHTTPDNSAppSignSecretResponseB\x06Z\x04./pbb\x06proto3" + +var ( + file_service_httpdns_app_proto_rawDescOnce sync.Once + file_service_httpdns_app_proto_rawDescData []byte +) + +func file_service_httpdns_app_proto_rawDescGZIP() []byte { + file_service_httpdns_app_proto_rawDescOnce.Do(func() { + file_service_httpdns_app_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_service_httpdns_app_proto_rawDesc), len(file_service_httpdns_app_proto_rawDesc))) + }) + return file_service_httpdns_app_proto_rawDescData +} + +var file_service_httpdns_app_proto_msgTypes = make([]protoimpl.MessageInfo, 13) +var file_service_httpdns_app_proto_goTypes = []any{ + (*CreateHTTPDNSAppRequest)(nil), // 0: pb.CreateHTTPDNSAppRequest + (*CreateHTTPDNSAppResponse)(nil), // 1: pb.CreateHTTPDNSAppResponse + (*UpdateHTTPDNSAppRequest)(nil), // 2: pb.UpdateHTTPDNSAppRequest + (*DeleteHTTPDNSAppRequest)(nil), // 3: pb.DeleteHTTPDNSAppRequest + (*FindHTTPDNSAppRequest)(nil), // 4: pb.FindHTTPDNSAppRequest + (*FindHTTPDNSAppResponse)(nil), // 5: pb.FindHTTPDNSAppResponse + (*ListHTTPDNSAppsRequest)(nil), // 6: pb.ListHTTPDNSAppsRequest + (*ListHTTPDNSAppsResponse)(nil), // 7: pb.ListHTTPDNSAppsResponse + (*FindAllHTTPDNSAppsRequest)(nil), // 8: pb.FindAllHTTPDNSAppsRequest + (*FindAllHTTPDNSAppsResponse)(nil), // 9: pb.FindAllHTTPDNSAppsResponse + (*UpdateHTTPDNSAppSignEnabledRequest)(nil), // 10: pb.UpdateHTTPDNSAppSignEnabledRequest + (*ResetHTTPDNSAppSignSecretRequest)(nil), // 11: pb.ResetHTTPDNSAppSignSecretRequest + (*ResetHTTPDNSAppSignSecretResponse)(nil), // 12: pb.ResetHTTPDNSAppSignSecretResponse + (*HTTPDNSApp)(nil), // 13: pb.HTTPDNSApp + (*RPCSuccess)(nil), // 14: pb.RPCSuccess +} +var file_service_httpdns_app_proto_depIdxs = []int32{ + 13, // 0: pb.FindHTTPDNSAppResponse.app:type_name -> pb.HTTPDNSApp + 13, // 1: pb.ListHTTPDNSAppsResponse.apps:type_name -> pb.HTTPDNSApp + 13, // 2: pb.FindAllHTTPDNSAppsResponse.apps:type_name -> pb.HTTPDNSApp + 0, // 3: pb.HTTPDNSAppService.createHTTPDNSApp:input_type -> pb.CreateHTTPDNSAppRequest + 2, // 4: pb.HTTPDNSAppService.updateHTTPDNSApp:input_type -> pb.UpdateHTTPDNSAppRequest + 3, // 5: pb.HTTPDNSAppService.deleteHTTPDNSApp:input_type -> pb.DeleteHTTPDNSAppRequest + 4, // 6: pb.HTTPDNSAppService.findHTTPDNSApp:input_type -> pb.FindHTTPDNSAppRequest + 6, // 7: pb.HTTPDNSAppService.listHTTPDNSApps:input_type -> pb.ListHTTPDNSAppsRequest + 8, // 8: pb.HTTPDNSAppService.findAllHTTPDNSApps:input_type -> pb.FindAllHTTPDNSAppsRequest + 10, // 9: pb.HTTPDNSAppService.updateHTTPDNSAppSignEnabled:input_type -> pb.UpdateHTTPDNSAppSignEnabledRequest + 11, // 10: pb.HTTPDNSAppService.resetHTTPDNSAppSignSecret:input_type -> pb.ResetHTTPDNSAppSignSecretRequest + 1, // 11: pb.HTTPDNSAppService.createHTTPDNSApp:output_type -> pb.CreateHTTPDNSAppResponse + 14, // 12: pb.HTTPDNSAppService.updateHTTPDNSApp:output_type -> pb.RPCSuccess + 14, // 13: pb.HTTPDNSAppService.deleteHTTPDNSApp:output_type -> pb.RPCSuccess + 5, // 14: pb.HTTPDNSAppService.findHTTPDNSApp:output_type -> pb.FindHTTPDNSAppResponse + 7, // 15: pb.HTTPDNSAppService.listHTTPDNSApps:output_type -> pb.ListHTTPDNSAppsResponse + 9, // 16: pb.HTTPDNSAppService.findAllHTTPDNSApps:output_type -> pb.FindAllHTTPDNSAppsResponse + 14, // 17: pb.HTTPDNSAppService.updateHTTPDNSAppSignEnabled:output_type -> pb.RPCSuccess + 12, // 18: pb.HTTPDNSAppService.resetHTTPDNSAppSignSecret:output_type -> pb.ResetHTTPDNSAppSignSecretResponse + 11, // [11:19] is the sub-list for method output_type + 3, // [3:11] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name +} + +func init() { file_service_httpdns_app_proto_init() } +func file_service_httpdns_app_proto_init() { + if File_service_httpdns_app_proto != nil { + return + } + file_models_model_httpdns_app_proto_init() + file_models_rpc_messages_proto_init() + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_service_httpdns_app_proto_rawDesc), len(file_service_httpdns_app_proto_rawDesc)), + NumEnums: 0, + NumMessages: 13, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_service_httpdns_app_proto_goTypes, + DependencyIndexes: file_service_httpdns_app_proto_depIdxs, + MessageInfos: file_service_httpdns_app_proto_msgTypes, + }.Build() + File_service_httpdns_app_proto = out.File + file_service_httpdns_app_proto_goTypes = nil + file_service_httpdns_app_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_app_grpc.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_app_grpc.pb.go new file mode 100644 index 0000000..6f5242c --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_app_grpc.pb.go @@ -0,0 +1,387 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.6.1 +// - protoc v3.21.12 +// source: service_httpdns_app.proto + +package pb + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + HTTPDNSAppService_CreateHTTPDNSApp_FullMethodName = "/pb.HTTPDNSAppService/createHTTPDNSApp" + HTTPDNSAppService_UpdateHTTPDNSApp_FullMethodName = "/pb.HTTPDNSAppService/updateHTTPDNSApp" + HTTPDNSAppService_DeleteHTTPDNSApp_FullMethodName = "/pb.HTTPDNSAppService/deleteHTTPDNSApp" + HTTPDNSAppService_FindHTTPDNSApp_FullMethodName = "/pb.HTTPDNSAppService/findHTTPDNSApp" + HTTPDNSAppService_ListHTTPDNSApps_FullMethodName = "/pb.HTTPDNSAppService/listHTTPDNSApps" + HTTPDNSAppService_FindAllHTTPDNSApps_FullMethodName = "/pb.HTTPDNSAppService/findAllHTTPDNSApps" + HTTPDNSAppService_UpdateHTTPDNSAppSignEnabled_FullMethodName = "/pb.HTTPDNSAppService/updateHTTPDNSAppSignEnabled" + HTTPDNSAppService_ResetHTTPDNSAppSignSecret_FullMethodName = "/pb.HTTPDNSAppService/resetHTTPDNSAppSignSecret" +) + +// HTTPDNSAppServiceClient is the client API for HTTPDNSAppService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type HTTPDNSAppServiceClient interface { + CreateHTTPDNSApp(ctx context.Context, in *CreateHTTPDNSAppRequest, opts ...grpc.CallOption) (*CreateHTTPDNSAppResponse, error) + UpdateHTTPDNSApp(ctx context.Context, in *UpdateHTTPDNSAppRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + DeleteHTTPDNSApp(ctx context.Context, in *DeleteHTTPDNSAppRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + FindHTTPDNSApp(ctx context.Context, in *FindHTTPDNSAppRequest, opts ...grpc.CallOption) (*FindHTTPDNSAppResponse, error) + ListHTTPDNSApps(ctx context.Context, in *ListHTTPDNSAppsRequest, opts ...grpc.CallOption) (*ListHTTPDNSAppsResponse, error) + FindAllHTTPDNSApps(ctx context.Context, in *FindAllHTTPDNSAppsRequest, opts ...grpc.CallOption) (*FindAllHTTPDNSAppsResponse, error) + UpdateHTTPDNSAppSignEnabled(ctx context.Context, in *UpdateHTTPDNSAppSignEnabledRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + ResetHTTPDNSAppSignSecret(ctx context.Context, in *ResetHTTPDNSAppSignSecretRequest, opts ...grpc.CallOption) (*ResetHTTPDNSAppSignSecretResponse, error) +} + +type hTTPDNSAppServiceClient struct { + cc grpc.ClientConnInterface +} + +func NewHTTPDNSAppServiceClient(cc grpc.ClientConnInterface) HTTPDNSAppServiceClient { + return &hTTPDNSAppServiceClient{cc} +} + +func (c *hTTPDNSAppServiceClient) CreateHTTPDNSApp(ctx context.Context, in *CreateHTTPDNSAppRequest, opts ...grpc.CallOption) (*CreateHTTPDNSAppResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(CreateHTTPDNSAppResponse) + err := c.cc.Invoke(ctx, HTTPDNSAppService_CreateHTTPDNSApp_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSAppServiceClient) UpdateHTTPDNSApp(ctx context.Context, in *UpdateHTTPDNSAppRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSAppService_UpdateHTTPDNSApp_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSAppServiceClient) DeleteHTTPDNSApp(ctx context.Context, in *DeleteHTTPDNSAppRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSAppService_DeleteHTTPDNSApp_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSAppServiceClient) FindHTTPDNSApp(ctx context.Context, in *FindHTTPDNSAppRequest, opts ...grpc.CallOption) (*FindHTTPDNSAppResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(FindHTTPDNSAppResponse) + err := c.cc.Invoke(ctx, HTTPDNSAppService_FindHTTPDNSApp_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSAppServiceClient) ListHTTPDNSApps(ctx context.Context, in *ListHTTPDNSAppsRequest, opts ...grpc.CallOption) (*ListHTTPDNSAppsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ListHTTPDNSAppsResponse) + err := c.cc.Invoke(ctx, HTTPDNSAppService_ListHTTPDNSApps_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSAppServiceClient) FindAllHTTPDNSApps(ctx context.Context, in *FindAllHTTPDNSAppsRequest, opts ...grpc.CallOption) (*FindAllHTTPDNSAppsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(FindAllHTTPDNSAppsResponse) + err := c.cc.Invoke(ctx, HTTPDNSAppService_FindAllHTTPDNSApps_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSAppServiceClient) UpdateHTTPDNSAppSignEnabled(ctx context.Context, in *UpdateHTTPDNSAppSignEnabledRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSAppService_UpdateHTTPDNSAppSignEnabled_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSAppServiceClient) ResetHTTPDNSAppSignSecret(ctx context.Context, in *ResetHTTPDNSAppSignSecretRequest, opts ...grpc.CallOption) (*ResetHTTPDNSAppSignSecretResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ResetHTTPDNSAppSignSecretResponse) + err := c.cc.Invoke(ctx, HTTPDNSAppService_ResetHTTPDNSAppSignSecret_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +// HTTPDNSAppServiceServer is the server API for HTTPDNSAppService service. +// All implementations must embed UnimplementedHTTPDNSAppServiceServer +// for forward compatibility. +type HTTPDNSAppServiceServer interface { + CreateHTTPDNSApp(context.Context, *CreateHTTPDNSAppRequest) (*CreateHTTPDNSAppResponse, error) + UpdateHTTPDNSApp(context.Context, *UpdateHTTPDNSAppRequest) (*RPCSuccess, error) + DeleteHTTPDNSApp(context.Context, *DeleteHTTPDNSAppRequest) (*RPCSuccess, error) + FindHTTPDNSApp(context.Context, *FindHTTPDNSAppRequest) (*FindHTTPDNSAppResponse, error) + ListHTTPDNSApps(context.Context, *ListHTTPDNSAppsRequest) (*ListHTTPDNSAppsResponse, error) + FindAllHTTPDNSApps(context.Context, *FindAllHTTPDNSAppsRequest) (*FindAllHTTPDNSAppsResponse, error) + UpdateHTTPDNSAppSignEnabled(context.Context, *UpdateHTTPDNSAppSignEnabledRequest) (*RPCSuccess, error) + ResetHTTPDNSAppSignSecret(context.Context, *ResetHTTPDNSAppSignSecretRequest) (*ResetHTTPDNSAppSignSecretResponse, error) + mustEmbedUnimplementedHTTPDNSAppServiceServer() +} + +// UnimplementedHTTPDNSAppServiceServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedHTTPDNSAppServiceServer struct{} + +func (UnimplementedHTTPDNSAppServiceServer) CreateHTTPDNSApp(context.Context, *CreateHTTPDNSAppRequest) (*CreateHTTPDNSAppResponse, error) { + return nil, status.Error(codes.Unimplemented, "method CreateHTTPDNSApp not implemented") +} +func (UnimplementedHTTPDNSAppServiceServer) UpdateHTTPDNSApp(context.Context, *UpdateHTTPDNSAppRequest) (*RPCSuccess, error) { + return nil, status.Error(codes.Unimplemented, "method UpdateHTTPDNSApp not implemented") +} +func (UnimplementedHTTPDNSAppServiceServer) DeleteHTTPDNSApp(context.Context, *DeleteHTTPDNSAppRequest) (*RPCSuccess, error) { + return nil, status.Error(codes.Unimplemented, "method DeleteHTTPDNSApp not implemented") +} +func (UnimplementedHTTPDNSAppServiceServer) FindHTTPDNSApp(context.Context, *FindHTTPDNSAppRequest) (*FindHTTPDNSAppResponse, error) { + return nil, status.Error(codes.Unimplemented, "method FindHTTPDNSApp not implemented") +} +func (UnimplementedHTTPDNSAppServiceServer) ListHTTPDNSApps(context.Context, *ListHTTPDNSAppsRequest) (*ListHTTPDNSAppsResponse, error) { + return nil, status.Error(codes.Unimplemented, "method ListHTTPDNSApps not implemented") +} +func (UnimplementedHTTPDNSAppServiceServer) FindAllHTTPDNSApps(context.Context, *FindAllHTTPDNSAppsRequest) (*FindAllHTTPDNSAppsResponse, error) { + return nil, status.Error(codes.Unimplemented, "method FindAllHTTPDNSApps not implemented") +} +func (UnimplementedHTTPDNSAppServiceServer) UpdateHTTPDNSAppSignEnabled(context.Context, *UpdateHTTPDNSAppSignEnabledRequest) (*RPCSuccess, error) { + return nil, status.Error(codes.Unimplemented, "method UpdateHTTPDNSAppSignEnabled not implemented") +} +func (UnimplementedHTTPDNSAppServiceServer) ResetHTTPDNSAppSignSecret(context.Context, *ResetHTTPDNSAppSignSecretRequest) (*ResetHTTPDNSAppSignSecretResponse, error) { + return nil, status.Error(codes.Unimplemented, "method ResetHTTPDNSAppSignSecret not implemented") +} +func (UnimplementedHTTPDNSAppServiceServer) mustEmbedUnimplementedHTTPDNSAppServiceServer() {} +func (UnimplementedHTTPDNSAppServiceServer) testEmbeddedByValue() {} + +// UnsafeHTTPDNSAppServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to HTTPDNSAppServiceServer will +// result in compilation errors. +type UnsafeHTTPDNSAppServiceServer interface { + mustEmbedUnimplementedHTTPDNSAppServiceServer() +} + +func RegisterHTTPDNSAppServiceServer(s grpc.ServiceRegistrar, srv HTTPDNSAppServiceServer) { + // If the following call panics, it indicates UnimplementedHTTPDNSAppServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&HTTPDNSAppService_ServiceDesc, srv) +} + +func _HTTPDNSAppService_CreateHTTPDNSApp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateHTTPDNSAppRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSAppServiceServer).CreateHTTPDNSApp(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSAppService_CreateHTTPDNSApp_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSAppServiceServer).CreateHTTPDNSApp(ctx, req.(*CreateHTTPDNSAppRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSAppService_UpdateHTTPDNSApp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateHTTPDNSAppRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSAppServiceServer).UpdateHTTPDNSApp(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSAppService_UpdateHTTPDNSApp_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSAppServiceServer).UpdateHTTPDNSApp(ctx, req.(*UpdateHTTPDNSAppRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSAppService_DeleteHTTPDNSApp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteHTTPDNSAppRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSAppServiceServer).DeleteHTTPDNSApp(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSAppService_DeleteHTTPDNSApp_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSAppServiceServer).DeleteHTTPDNSApp(ctx, req.(*DeleteHTTPDNSAppRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSAppService_FindHTTPDNSApp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindHTTPDNSAppRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSAppServiceServer).FindHTTPDNSApp(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSAppService_FindHTTPDNSApp_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSAppServiceServer).FindHTTPDNSApp(ctx, req.(*FindHTTPDNSAppRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSAppService_ListHTTPDNSApps_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListHTTPDNSAppsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSAppServiceServer).ListHTTPDNSApps(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSAppService_ListHTTPDNSApps_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSAppServiceServer).ListHTTPDNSApps(ctx, req.(*ListHTTPDNSAppsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSAppService_FindAllHTTPDNSApps_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindAllHTTPDNSAppsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSAppServiceServer).FindAllHTTPDNSApps(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSAppService_FindAllHTTPDNSApps_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSAppServiceServer).FindAllHTTPDNSApps(ctx, req.(*FindAllHTTPDNSAppsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSAppService_UpdateHTTPDNSAppSignEnabled_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateHTTPDNSAppSignEnabledRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSAppServiceServer).UpdateHTTPDNSAppSignEnabled(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSAppService_UpdateHTTPDNSAppSignEnabled_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSAppServiceServer).UpdateHTTPDNSAppSignEnabled(ctx, req.(*UpdateHTTPDNSAppSignEnabledRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSAppService_ResetHTTPDNSAppSignSecret_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ResetHTTPDNSAppSignSecretRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSAppServiceServer).ResetHTTPDNSAppSignSecret(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSAppService_ResetHTTPDNSAppSignSecret_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSAppServiceServer).ResetHTTPDNSAppSignSecret(ctx, req.(*ResetHTTPDNSAppSignSecretRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// HTTPDNSAppService_ServiceDesc is the grpc.ServiceDesc for HTTPDNSAppService service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var HTTPDNSAppService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "pb.HTTPDNSAppService", + HandlerType: (*HTTPDNSAppServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "createHTTPDNSApp", + Handler: _HTTPDNSAppService_CreateHTTPDNSApp_Handler, + }, + { + MethodName: "updateHTTPDNSApp", + Handler: _HTTPDNSAppService_UpdateHTTPDNSApp_Handler, + }, + { + MethodName: "deleteHTTPDNSApp", + Handler: _HTTPDNSAppService_DeleteHTTPDNSApp_Handler, + }, + { + MethodName: "findHTTPDNSApp", + Handler: _HTTPDNSAppService_FindHTTPDNSApp_Handler, + }, + { + MethodName: "listHTTPDNSApps", + Handler: _HTTPDNSAppService_ListHTTPDNSApps_Handler, + }, + { + MethodName: "findAllHTTPDNSApps", + Handler: _HTTPDNSAppService_FindAllHTTPDNSApps_Handler, + }, + { + MethodName: "updateHTTPDNSAppSignEnabled", + Handler: _HTTPDNSAppService_UpdateHTTPDNSAppSignEnabled_Handler, + }, + { + MethodName: "resetHTTPDNSAppSignSecret", + Handler: _HTTPDNSAppService_ResetHTTPDNSAppSignSecret_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "service_httpdns_app.proto", +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_cluster.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_cluster.pb.go new file mode 100644 index 0000000..8120273 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_cluster.pb.go @@ -0,0 +1,1015 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc v3.21.12 +// source: service_httpdns_cluster.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type CreateHTTPDNSClusterRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + ServiceDomain string `protobuf:"bytes,2,opt,name=serviceDomain,proto3" json:"serviceDomain,omitempty"` + DefaultTTL int32 `protobuf:"varint,3,opt,name=defaultTTL,proto3" json:"defaultTTL,omitempty"` + FallbackTimeoutMs int32 `protobuf:"varint,4,opt,name=fallbackTimeoutMs,proto3" json:"fallbackTimeoutMs,omitempty"` + InstallDir string `protobuf:"bytes,5,opt,name=installDir,proto3" json:"installDir,omitempty"` + TlsPolicyJSON []byte `protobuf:"bytes,6,opt,name=tlsPolicyJSON,proto3" json:"tlsPolicyJSON,omitempty"` + IsOn bool `protobuf:"varint,7,opt,name=isOn,proto3" json:"isOn,omitempty"` + IsDefault bool `protobuf:"varint,8,opt,name=isDefault,proto3" json:"isDefault,omitempty"` + AutoRemoteStart bool `protobuf:"varint,9,opt,name=autoRemoteStart,proto3" json:"autoRemoteStart,omitempty"` + AccessLogIsOn bool `protobuf:"varint,10,opt,name=accessLogIsOn,proto3" json:"accessLogIsOn,omitempty"` + TimeZone string `protobuf:"bytes,11,opt,name=timeZone,proto3" json:"timeZone,omitempty"` +} + +func (x *CreateHTTPDNSClusterRequest) Reset() { + *x = CreateHTTPDNSClusterRequest{} + mi := &file_service_httpdns_cluster_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSClusterRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSClusterRequest) ProtoMessage() {} + +func (x *CreateHTTPDNSClusterRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSClusterRequest.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSClusterRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{0} +} + +func (x *CreateHTTPDNSClusterRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *CreateHTTPDNSClusterRequest) GetServiceDomain() string { + if x != nil { + return x.ServiceDomain + } + return "" +} + +func (x *CreateHTTPDNSClusterRequest) GetDefaultTTL() int32 { + if x != nil { + return x.DefaultTTL + } + return 0 +} + +func (x *CreateHTTPDNSClusterRequest) GetFallbackTimeoutMs() int32 { + if x != nil { + return x.FallbackTimeoutMs + } + return 0 +} + +func (x *CreateHTTPDNSClusterRequest) GetInstallDir() string { + if x != nil { + return x.InstallDir + } + return "" +} + +func (x *CreateHTTPDNSClusterRequest) GetTlsPolicyJSON() []byte { + if x != nil { + return x.TlsPolicyJSON + } + return nil +} + +func (x *CreateHTTPDNSClusterRequest) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +func (x *CreateHTTPDNSClusterRequest) GetIsDefault() bool { + if x != nil { + return x.IsDefault + } + return false +} + +func (x *CreateHTTPDNSClusterRequest) GetAutoRemoteStart() bool { + if x != nil { + return x.AutoRemoteStart + } + return false +} + +func (x *CreateHTTPDNSClusterRequest) GetAccessLogIsOn() bool { + if x != nil { + return x.AccessLogIsOn + } + return false +} + +func (x *CreateHTTPDNSClusterRequest) GetTimeZone() string { + if x != nil { + return x.TimeZone + } + return "" +} + +type CreateHTTPDNSClusterResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ClusterId int64 `protobuf:"varint,1,opt,name=clusterId,proto3" json:"clusterId,omitempty"` +} + +func (x *CreateHTTPDNSClusterResponse) Reset() { + *x = CreateHTTPDNSClusterResponse{} + mi := &file_service_httpdns_cluster_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSClusterResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSClusterResponse) ProtoMessage() {} + +func (x *CreateHTTPDNSClusterResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSClusterResponse.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSClusterResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{1} +} + +func (x *CreateHTTPDNSClusterResponse) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +type UpdateHTTPDNSClusterRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ClusterId int64 `protobuf:"varint,1,opt,name=clusterId,proto3" json:"clusterId,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + ServiceDomain string `protobuf:"bytes,3,opt,name=serviceDomain,proto3" json:"serviceDomain,omitempty"` + DefaultTTL int32 `protobuf:"varint,4,opt,name=defaultTTL,proto3" json:"defaultTTL,omitempty"` + FallbackTimeoutMs int32 `protobuf:"varint,5,opt,name=fallbackTimeoutMs,proto3" json:"fallbackTimeoutMs,omitempty"` + InstallDir string `protobuf:"bytes,6,opt,name=installDir,proto3" json:"installDir,omitempty"` + TlsPolicyJSON []byte `protobuf:"bytes,7,opt,name=tlsPolicyJSON,proto3" json:"tlsPolicyJSON,omitempty"` + IsOn bool `protobuf:"varint,8,opt,name=isOn,proto3" json:"isOn,omitempty"` + IsDefault bool `protobuf:"varint,9,opt,name=isDefault,proto3" json:"isDefault,omitempty"` + AutoRemoteStart bool `protobuf:"varint,10,opt,name=autoRemoteStart,proto3" json:"autoRemoteStart,omitempty"` + AccessLogIsOn bool `protobuf:"varint,11,opt,name=accessLogIsOn,proto3" json:"accessLogIsOn,omitempty"` + TimeZone string `protobuf:"bytes,12,opt,name=timeZone,proto3" json:"timeZone,omitempty"` +} + +func (x *UpdateHTTPDNSClusterRequest) Reset() { + *x = UpdateHTTPDNSClusterRequest{} + mi := &file_service_httpdns_cluster_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateHTTPDNSClusterRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateHTTPDNSClusterRequest) ProtoMessage() {} + +func (x *UpdateHTTPDNSClusterRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateHTTPDNSClusterRequest.ProtoReflect.Descriptor instead. +func (*UpdateHTTPDNSClusterRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{2} +} + +func (x *UpdateHTTPDNSClusterRequest) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +func (x *UpdateHTTPDNSClusterRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *UpdateHTTPDNSClusterRequest) GetServiceDomain() string { + if x != nil { + return x.ServiceDomain + } + return "" +} + +func (x *UpdateHTTPDNSClusterRequest) GetDefaultTTL() int32 { + if x != nil { + return x.DefaultTTL + } + return 0 +} + +func (x *UpdateHTTPDNSClusterRequest) GetFallbackTimeoutMs() int32 { + if x != nil { + return x.FallbackTimeoutMs + } + return 0 +} + +func (x *UpdateHTTPDNSClusterRequest) GetInstallDir() string { + if x != nil { + return x.InstallDir + } + return "" +} + +func (x *UpdateHTTPDNSClusterRequest) GetTlsPolicyJSON() []byte { + if x != nil { + return x.TlsPolicyJSON + } + return nil +} + +func (x *UpdateHTTPDNSClusterRequest) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +func (x *UpdateHTTPDNSClusterRequest) GetIsDefault() bool { + if x != nil { + return x.IsDefault + } + return false +} + +func (x *UpdateHTTPDNSClusterRequest) GetAutoRemoteStart() bool { + if x != nil { + return x.AutoRemoteStart + } + return false +} + +func (x *UpdateHTTPDNSClusterRequest) GetAccessLogIsOn() bool { + if x != nil { + return x.AccessLogIsOn + } + return false +} + +func (x *UpdateHTTPDNSClusterRequest) GetTimeZone() string { + if x != nil { + return x.TimeZone + } + return "" +} + +type DeleteHTTPDNSClusterRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ClusterId int64 `protobuf:"varint,1,opt,name=clusterId,proto3" json:"clusterId,omitempty"` +} + +func (x *DeleteHTTPDNSClusterRequest) Reset() { + *x = DeleteHTTPDNSClusterRequest{} + mi := &file_service_httpdns_cluster_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DeleteHTTPDNSClusterRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteHTTPDNSClusterRequest) ProtoMessage() {} + +func (x *DeleteHTTPDNSClusterRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteHTTPDNSClusterRequest.ProtoReflect.Descriptor instead. +func (*DeleteHTTPDNSClusterRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{3} +} + +func (x *DeleteHTTPDNSClusterRequest) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +type FindHTTPDNSClusterRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ClusterId int64 `protobuf:"varint,1,opt,name=clusterId,proto3" json:"clusterId,omitempty"` +} + +func (x *FindHTTPDNSClusterRequest) Reset() { + *x = FindHTTPDNSClusterRequest{} + mi := &file_service_httpdns_cluster_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FindHTTPDNSClusterRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindHTTPDNSClusterRequest) ProtoMessage() {} + +func (x *FindHTTPDNSClusterRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindHTTPDNSClusterRequest.ProtoReflect.Descriptor instead. +func (*FindHTTPDNSClusterRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{4} +} + +func (x *FindHTTPDNSClusterRequest) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +type FindHTTPDNSClusterResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Cluster *HTTPDNSCluster `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"` +} + +func (x *FindHTTPDNSClusterResponse) Reset() { + *x = FindHTTPDNSClusterResponse{} + mi := &file_service_httpdns_cluster_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FindHTTPDNSClusterResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindHTTPDNSClusterResponse) ProtoMessage() {} + +func (x *FindHTTPDNSClusterResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[5] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindHTTPDNSClusterResponse.ProtoReflect.Descriptor instead. +func (*FindHTTPDNSClusterResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{5} +} + +func (x *FindHTTPDNSClusterResponse) GetCluster() *HTTPDNSCluster { + if x != nil { + return x.Cluster + } + return nil +} + +type ListHTTPDNSClustersRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Offset int64 `protobuf:"varint,1,opt,name=offset,proto3" json:"offset,omitempty"` + Size int64 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"` + Keyword string `protobuf:"bytes,3,opt,name=keyword,proto3" json:"keyword,omitempty"` +} + +func (x *ListHTTPDNSClustersRequest) Reset() { + *x = ListHTTPDNSClustersRequest{} + mi := &file_service_httpdns_cluster_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSClustersRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSClustersRequest) ProtoMessage() {} + +func (x *ListHTTPDNSClustersRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[6] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSClustersRequest.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSClustersRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{6} +} + +func (x *ListHTTPDNSClustersRequest) GetOffset() int64 { + if x != nil { + return x.Offset + } + return 0 +} + +func (x *ListHTTPDNSClustersRequest) GetSize() int64 { + if x != nil { + return x.Size + } + return 0 +} + +func (x *ListHTTPDNSClustersRequest) GetKeyword() string { + if x != nil { + return x.Keyword + } + return "" +} + +type ListHTTPDNSClustersResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Clusters []*HTTPDNSCluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"` +} + +func (x *ListHTTPDNSClustersResponse) Reset() { + *x = ListHTTPDNSClustersResponse{} + mi := &file_service_httpdns_cluster_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSClustersResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSClustersResponse) ProtoMessage() {} + +func (x *ListHTTPDNSClustersResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[7] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSClustersResponse.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSClustersResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{7} +} + +func (x *ListHTTPDNSClustersResponse) GetClusters() []*HTTPDNSCluster { + if x != nil { + return x.Clusters + } + return nil +} + +type FindAllHTTPDNSClustersRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *FindAllHTTPDNSClustersRequest) Reset() { + *x = FindAllHTTPDNSClustersRequest{} + mi := &file_service_httpdns_cluster_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FindAllHTTPDNSClustersRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindAllHTTPDNSClustersRequest) ProtoMessage() {} + +func (x *FindAllHTTPDNSClustersRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[8] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindAllHTTPDNSClustersRequest.ProtoReflect.Descriptor instead. +func (*FindAllHTTPDNSClustersRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{8} +} + +type FindAllHTTPDNSClustersResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Clusters []*HTTPDNSCluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"` +} + +func (x *FindAllHTTPDNSClustersResponse) Reset() { + *x = FindAllHTTPDNSClustersResponse{} + mi := &file_service_httpdns_cluster_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FindAllHTTPDNSClustersResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindAllHTTPDNSClustersResponse) ProtoMessage() {} + +func (x *FindAllHTTPDNSClustersResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[9] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindAllHTTPDNSClustersResponse.ProtoReflect.Descriptor instead. +func (*FindAllHTTPDNSClustersResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{9} +} + +func (x *FindAllHTTPDNSClustersResponse) GetClusters() []*HTTPDNSCluster { + if x != nil { + return x.Clusters + } + return nil +} + +type UpdateHTTPDNSClusterDefaultRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ClusterId int64 `protobuf:"varint,1,opt,name=clusterId,proto3" json:"clusterId,omitempty"` +} + +func (x *UpdateHTTPDNSClusterDefaultRequest) Reset() { + *x = UpdateHTTPDNSClusterDefaultRequest{} + mi := &file_service_httpdns_cluster_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateHTTPDNSClusterDefaultRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateHTTPDNSClusterDefaultRequest) ProtoMessage() {} + +func (x *UpdateHTTPDNSClusterDefaultRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[10] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateHTTPDNSClusterDefaultRequest.ProtoReflect.Descriptor instead. +func (*UpdateHTTPDNSClusterDefaultRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{10} +} + +func (x *UpdateHTTPDNSClusterDefaultRequest) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +type ListHTTPDNSNodesWithClusterIdRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ClusterId int64 `protobuf:"varint,1,opt,name=clusterId,proto3" json:"clusterId,omitempty"` +} + +func (x *ListHTTPDNSNodesWithClusterIdRequest) Reset() { + *x = ListHTTPDNSNodesWithClusterIdRequest{} + mi := &file_service_httpdns_cluster_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSNodesWithClusterIdRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSNodesWithClusterIdRequest) ProtoMessage() {} + +func (x *ListHTTPDNSNodesWithClusterIdRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[11] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSNodesWithClusterIdRequest.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSNodesWithClusterIdRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{11} +} + +func (x *ListHTTPDNSNodesWithClusterIdRequest) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +type ListHTTPDNSNodesWithClusterIdResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Nodes []*HTTPDNSNode `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"` +} + +func (x *ListHTTPDNSNodesWithClusterIdResponse) Reset() { + *x = ListHTTPDNSNodesWithClusterIdResponse{} + mi := &file_service_httpdns_cluster_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSNodesWithClusterIdResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSNodesWithClusterIdResponse) ProtoMessage() {} + +func (x *ListHTTPDNSNodesWithClusterIdResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_cluster_proto_msgTypes[12] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSNodesWithClusterIdResponse.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSNodesWithClusterIdResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_cluster_proto_rawDescGZIP(), []int{12} +} + +func (x *ListHTTPDNSNodesWithClusterIdResponse) GetNodes() []*HTTPDNSNode { + if x != nil { + return x.Nodes + } + return nil +} + +var File_service_httpdns_cluster_proto protoreflect.FileDescriptor + +var file_service_httpdns_cluster_proto_rawDesc = []byte{ + 0x0a, 0x1d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x64, 0x6e, + 0x73, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, + 0x02, 0x70, 0x62, 0x1a, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x64, 0x6e, 0x73, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x64, 0x6e, 0x73, 0x5f, 0x6e, 0x6f, + 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2f, 0x72, 0x70, 0x63, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x22, 0x9d, 0x02, 0x0a, 0x1b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, + 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1e, 0x0a, + 0x0a, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x54, 0x54, 0x4c, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0a, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x54, 0x54, 0x4c, 0x12, 0x2c, 0x0a, + 0x11, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, + 0x4d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, + 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x44, 0x69, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x44, 0x69, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x74, + 0x6c, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x0c, 0x52, 0x0d, 0x74, 0x6c, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x53, 0x4f, + 0x4e, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x44, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x44, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3c, 0x0a, 0x1c, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, + 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, + 0x64, 0x22, 0xbb, 0x02, 0x0a, 0x1b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, + 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, + 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x54, 0x54, 0x4c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x54, 0x54, 0x4c, 0x12, 0x2c, 0x0a, 0x11, 0x66, 0x61, 0x6c, + 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x54, 0x69, + 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x61, + 0x6c, 0x6c, 0x44, 0x69, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6c, 0x6c, 0x44, 0x69, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x74, 0x6c, 0x73, 0x50, 0x6f, + 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, + 0x74, 0x6c, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x12, 0x0a, + 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, + 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3b, 0x0a, 0x1b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, + 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, + 0x0a, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x39, 0x0a, 0x19, + 0x46, 0x69, 0x6e, 0x64, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, + 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x75, + 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, + 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x4a, 0x0a, 0x1a, 0x46, 0x69, 0x6e, 0x64, 0x48, + 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x54, 0x54, 0x50, + 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, + 0x74, 0x65, 0x72, 0x22, 0x62, 0x0a, 0x1a, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, + 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x18, 0x0a, + 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x22, 0x4d, 0x0a, 0x1b, 0x4c, 0x69, 0x73, 0x74, 0x48, + 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x54, + 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x08, 0x63, 0x6c, + 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x22, 0x1f, 0x0a, 0x1d, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, + 0x6c, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x50, 0x0a, 0x1e, 0x46, 0x69, 0x6e, 0x64, 0x41, + 0x6c, 0x6c, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x08, 0x63, 0x6c, 0x75, + 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, + 0x2e, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, + 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x22, 0x42, 0x0a, 0x22, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x44, 0x0a, + 0x24, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x4e, 0x6f, 0x64, 0x65, + 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x25, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, + 0x4e, 0x53, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6c, 0x75, 0x73, 0x74, + 0x65, 0x72, 0x49, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, + 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, + 0x2e, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x05, 0x6e, 0x6f, + 0x64, 0x65, 0x73, 0x32, 0xdf, 0x05, 0x0a, 0x15, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, + 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x59, 0x0a, + 0x14, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, + 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, 0x0a, 0x14, 0x75, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x12, 0x1f, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, + 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, + 0x73, 0x12, 0x47, 0x0a, 0x14, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, + 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x2e, 0x70, 0x62, 0x2e, 0x44, + 0x65, 0x6c, 0x65, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, + 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, + 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x53, 0x0a, 0x12, 0x66, 0x69, + 0x6e, 0x64, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x12, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, + 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x1e, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, + 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x56, 0x0a, 0x13, 0x6c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, + 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x1e, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, + 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, + 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5f, 0x0a, 0x16, 0x66, 0x69, 0x6e, 0x64, 0x41, + 0x6c, 0x6c, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x73, 0x12, 0x21, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x48, 0x54, + 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, + 0x6c, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x55, 0x0a, 0x1b, 0x75, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x26, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, + 0x74, 0x0a, 0x1d, 0x6c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x4e, 0x6f, + 0x64, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, + 0x12, 0x28, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, + 0x53, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x70, 0x62, 0x2e, + 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x4e, 0x6f, 0x64, 0x65, 0x73, + 0x57, 0x69, 0x74, 0x68, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_service_httpdns_cluster_proto_rawDescOnce sync.Once + file_service_httpdns_cluster_proto_rawDescData = file_service_httpdns_cluster_proto_rawDesc +) + +func file_service_httpdns_cluster_proto_rawDescGZIP() []byte { + file_service_httpdns_cluster_proto_rawDescOnce.Do(func() { + file_service_httpdns_cluster_proto_rawDescData = protoimpl.X.CompressGZIP(file_service_httpdns_cluster_proto_rawDescData) + }) + return file_service_httpdns_cluster_proto_rawDescData +} + +var file_service_httpdns_cluster_proto_msgTypes = make([]protoimpl.MessageInfo, 13) +var file_service_httpdns_cluster_proto_goTypes = []any{ + (*CreateHTTPDNSClusterRequest)(nil), // 0: pb.CreateHTTPDNSClusterRequest + (*CreateHTTPDNSClusterResponse)(nil), // 1: pb.CreateHTTPDNSClusterResponse + (*UpdateHTTPDNSClusterRequest)(nil), // 2: pb.UpdateHTTPDNSClusterRequest + (*DeleteHTTPDNSClusterRequest)(nil), // 3: pb.DeleteHTTPDNSClusterRequest + (*FindHTTPDNSClusterRequest)(nil), // 4: pb.FindHTTPDNSClusterRequest + (*FindHTTPDNSClusterResponse)(nil), // 5: pb.FindHTTPDNSClusterResponse + (*ListHTTPDNSClustersRequest)(nil), // 6: pb.ListHTTPDNSClustersRequest + (*ListHTTPDNSClustersResponse)(nil), // 7: pb.ListHTTPDNSClustersResponse + (*FindAllHTTPDNSClustersRequest)(nil), // 8: pb.FindAllHTTPDNSClustersRequest + (*FindAllHTTPDNSClustersResponse)(nil), // 9: pb.FindAllHTTPDNSClustersResponse + (*UpdateHTTPDNSClusterDefaultRequest)(nil), // 10: pb.UpdateHTTPDNSClusterDefaultRequest + (*ListHTTPDNSNodesWithClusterIdRequest)(nil), // 11: pb.ListHTTPDNSNodesWithClusterIdRequest + (*ListHTTPDNSNodesWithClusterIdResponse)(nil), // 12: pb.ListHTTPDNSNodesWithClusterIdResponse + (*HTTPDNSCluster)(nil), // 13: pb.HTTPDNSCluster + (*HTTPDNSNode)(nil), // 14: pb.HTTPDNSNode + (*RPCSuccess)(nil), // 15: pb.RPCSuccess +} +var file_service_httpdns_cluster_proto_depIdxs = []int32{ + 13, // 0: pb.FindHTTPDNSClusterResponse.cluster:type_name -> pb.HTTPDNSCluster + 13, // 1: pb.ListHTTPDNSClustersResponse.clusters:type_name -> pb.HTTPDNSCluster + 13, // 2: pb.FindAllHTTPDNSClustersResponse.clusters:type_name -> pb.HTTPDNSCluster + 14, // 3: pb.ListHTTPDNSNodesWithClusterIdResponse.nodes:type_name -> pb.HTTPDNSNode + 0, // 4: pb.HTTPDNSClusterService.createHTTPDNSCluster:input_type -> pb.CreateHTTPDNSClusterRequest + 2, // 5: pb.HTTPDNSClusterService.updateHTTPDNSCluster:input_type -> pb.UpdateHTTPDNSClusterRequest + 3, // 6: pb.HTTPDNSClusterService.deleteHTTPDNSCluster:input_type -> pb.DeleteHTTPDNSClusterRequest + 4, // 7: pb.HTTPDNSClusterService.findHTTPDNSCluster:input_type -> pb.FindHTTPDNSClusterRequest + 6, // 8: pb.HTTPDNSClusterService.listHTTPDNSClusters:input_type -> pb.ListHTTPDNSClustersRequest + 8, // 9: pb.HTTPDNSClusterService.findAllHTTPDNSClusters:input_type -> pb.FindAllHTTPDNSClustersRequest + 10, // 10: pb.HTTPDNSClusterService.updateHTTPDNSClusterDefault:input_type -> pb.UpdateHTTPDNSClusterDefaultRequest + 11, // 11: pb.HTTPDNSClusterService.listHTTPDNSNodesWithClusterId:input_type -> pb.ListHTTPDNSNodesWithClusterIdRequest + 1, // 12: pb.HTTPDNSClusterService.createHTTPDNSCluster:output_type -> pb.CreateHTTPDNSClusterResponse + 15, // 13: pb.HTTPDNSClusterService.updateHTTPDNSCluster:output_type -> pb.RPCSuccess + 15, // 14: pb.HTTPDNSClusterService.deleteHTTPDNSCluster:output_type -> pb.RPCSuccess + 5, // 15: pb.HTTPDNSClusterService.findHTTPDNSCluster:output_type -> pb.FindHTTPDNSClusterResponse + 7, // 16: pb.HTTPDNSClusterService.listHTTPDNSClusters:output_type -> pb.ListHTTPDNSClustersResponse + 9, // 17: pb.HTTPDNSClusterService.findAllHTTPDNSClusters:output_type -> pb.FindAllHTTPDNSClustersResponse + 15, // 18: pb.HTTPDNSClusterService.updateHTTPDNSClusterDefault:output_type -> pb.RPCSuccess + 12, // 19: pb.HTTPDNSClusterService.listHTTPDNSNodesWithClusterId:output_type -> pb.ListHTTPDNSNodesWithClusterIdResponse + 12, // [12:20] is the sub-list for method output_type + 4, // [4:12] is the sub-list for method input_type + 4, // [4:4] is the sub-list for extension type_name + 4, // [4:4] is the sub-list for extension extendee + 0, // [0:4] is the sub-list for field type_name +} + +func init() { file_service_httpdns_cluster_proto_init() } +func file_service_httpdns_cluster_proto_init() { + if File_service_httpdns_cluster_proto != nil { + return + } + file_models_model_httpdns_cluster_proto_init() + file_models_model_httpdns_node_proto_init() + file_models_rpc_messages_proto_init() + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_service_httpdns_cluster_proto_rawDesc, + NumEnums: 0, + NumMessages: 13, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_service_httpdns_cluster_proto_goTypes, + DependencyIndexes: file_service_httpdns_cluster_proto_depIdxs, + MessageInfos: file_service_httpdns_cluster_proto_msgTypes, + }.Build() + File_service_httpdns_cluster_proto = out.File + file_service_httpdns_cluster_proto_rawDesc = nil + file_service_httpdns_cluster_proto_goTypes = nil + file_service_httpdns_cluster_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_cluster_grpc.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_cluster_grpc.pb.go new file mode 100644 index 0000000..825f8b6 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_cluster_grpc.pb.go @@ -0,0 +1,385 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.5.1 +// - protoc v3.21.12 +// source: service_httpdns_cluster.proto + +package pb + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + HTTPDNSClusterService_CreateHTTPDNSCluster_FullMethodName = "/pb.HTTPDNSClusterService/createHTTPDNSCluster" + HTTPDNSClusterService_UpdateHTTPDNSCluster_FullMethodName = "/pb.HTTPDNSClusterService/updateHTTPDNSCluster" + HTTPDNSClusterService_DeleteHTTPDNSCluster_FullMethodName = "/pb.HTTPDNSClusterService/deleteHTTPDNSCluster" + HTTPDNSClusterService_FindHTTPDNSCluster_FullMethodName = "/pb.HTTPDNSClusterService/findHTTPDNSCluster" + HTTPDNSClusterService_ListHTTPDNSClusters_FullMethodName = "/pb.HTTPDNSClusterService/listHTTPDNSClusters" + HTTPDNSClusterService_FindAllHTTPDNSClusters_FullMethodName = "/pb.HTTPDNSClusterService/findAllHTTPDNSClusters" + HTTPDNSClusterService_UpdateHTTPDNSClusterDefault_FullMethodName = "/pb.HTTPDNSClusterService/updateHTTPDNSClusterDefault" + HTTPDNSClusterService_ListHTTPDNSNodesWithClusterId_FullMethodName = "/pb.HTTPDNSClusterService/listHTTPDNSNodesWithClusterId" +) + +// HTTPDNSClusterServiceClient is the client API for HTTPDNSClusterService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type HTTPDNSClusterServiceClient interface { + CreateHTTPDNSCluster(ctx context.Context, in *CreateHTTPDNSClusterRequest, opts ...grpc.CallOption) (*CreateHTTPDNSClusterResponse, error) + UpdateHTTPDNSCluster(ctx context.Context, in *UpdateHTTPDNSClusterRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + DeleteHTTPDNSCluster(ctx context.Context, in *DeleteHTTPDNSClusterRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + FindHTTPDNSCluster(ctx context.Context, in *FindHTTPDNSClusterRequest, opts ...grpc.CallOption) (*FindHTTPDNSClusterResponse, error) + ListHTTPDNSClusters(ctx context.Context, in *ListHTTPDNSClustersRequest, opts ...grpc.CallOption) (*ListHTTPDNSClustersResponse, error) + FindAllHTTPDNSClusters(ctx context.Context, in *FindAllHTTPDNSClustersRequest, opts ...grpc.CallOption) (*FindAllHTTPDNSClustersResponse, error) + UpdateHTTPDNSClusterDefault(ctx context.Context, in *UpdateHTTPDNSClusterDefaultRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + ListHTTPDNSNodesWithClusterId(ctx context.Context, in *ListHTTPDNSNodesWithClusterIdRequest, opts ...grpc.CallOption) (*ListHTTPDNSNodesWithClusterIdResponse, error) +} + +type hTTPDNSClusterServiceClient struct { + cc grpc.ClientConnInterface +} + +func NewHTTPDNSClusterServiceClient(cc grpc.ClientConnInterface) HTTPDNSClusterServiceClient { + return &hTTPDNSClusterServiceClient{cc} +} + +func (c *hTTPDNSClusterServiceClient) CreateHTTPDNSCluster(ctx context.Context, in *CreateHTTPDNSClusterRequest, opts ...grpc.CallOption) (*CreateHTTPDNSClusterResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(CreateHTTPDNSClusterResponse) + err := c.cc.Invoke(ctx, HTTPDNSClusterService_CreateHTTPDNSCluster_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSClusterServiceClient) UpdateHTTPDNSCluster(ctx context.Context, in *UpdateHTTPDNSClusterRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSClusterService_UpdateHTTPDNSCluster_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSClusterServiceClient) DeleteHTTPDNSCluster(ctx context.Context, in *DeleteHTTPDNSClusterRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSClusterService_DeleteHTTPDNSCluster_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSClusterServiceClient) FindHTTPDNSCluster(ctx context.Context, in *FindHTTPDNSClusterRequest, opts ...grpc.CallOption) (*FindHTTPDNSClusterResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(FindHTTPDNSClusterResponse) + err := c.cc.Invoke(ctx, HTTPDNSClusterService_FindHTTPDNSCluster_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSClusterServiceClient) ListHTTPDNSClusters(ctx context.Context, in *ListHTTPDNSClustersRequest, opts ...grpc.CallOption) (*ListHTTPDNSClustersResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ListHTTPDNSClustersResponse) + err := c.cc.Invoke(ctx, HTTPDNSClusterService_ListHTTPDNSClusters_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSClusterServiceClient) FindAllHTTPDNSClusters(ctx context.Context, in *FindAllHTTPDNSClustersRequest, opts ...grpc.CallOption) (*FindAllHTTPDNSClustersResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(FindAllHTTPDNSClustersResponse) + err := c.cc.Invoke(ctx, HTTPDNSClusterService_FindAllHTTPDNSClusters_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSClusterServiceClient) UpdateHTTPDNSClusterDefault(ctx context.Context, in *UpdateHTTPDNSClusterDefaultRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSClusterService_UpdateHTTPDNSClusterDefault_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSClusterServiceClient) ListHTTPDNSNodesWithClusterId(ctx context.Context, in *ListHTTPDNSNodesWithClusterIdRequest, opts ...grpc.CallOption) (*ListHTTPDNSNodesWithClusterIdResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ListHTTPDNSNodesWithClusterIdResponse) + err := c.cc.Invoke(ctx, HTTPDNSClusterService_ListHTTPDNSNodesWithClusterId_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +// HTTPDNSClusterServiceServer is the server API for HTTPDNSClusterService service. +// All implementations should embed UnimplementedHTTPDNSClusterServiceServer +// for forward compatibility. +type HTTPDNSClusterServiceServer interface { + CreateHTTPDNSCluster(context.Context, *CreateHTTPDNSClusterRequest) (*CreateHTTPDNSClusterResponse, error) + UpdateHTTPDNSCluster(context.Context, *UpdateHTTPDNSClusterRequest) (*RPCSuccess, error) + DeleteHTTPDNSCluster(context.Context, *DeleteHTTPDNSClusterRequest) (*RPCSuccess, error) + FindHTTPDNSCluster(context.Context, *FindHTTPDNSClusterRequest) (*FindHTTPDNSClusterResponse, error) + ListHTTPDNSClusters(context.Context, *ListHTTPDNSClustersRequest) (*ListHTTPDNSClustersResponse, error) + FindAllHTTPDNSClusters(context.Context, *FindAllHTTPDNSClustersRequest) (*FindAllHTTPDNSClustersResponse, error) + UpdateHTTPDNSClusterDefault(context.Context, *UpdateHTTPDNSClusterDefaultRequest) (*RPCSuccess, error) + ListHTTPDNSNodesWithClusterId(context.Context, *ListHTTPDNSNodesWithClusterIdRequest) (*ListHTTPDNSNodesWithClusterIdResponse, error) +} + +// UnimplementedHTTPDNSClusterServiceServer should be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedHTTPDNSClusterServiceServer struct{} + +func (UnimplementedHTTPDNSClusterServiceServer) CreateHTTPDNSCluster(context.Context, *CreateHTTPDNSClusterRequest) (*CreateHTTPDNSClusterResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateHTTPDNSCluster not implemented") +} +func (UnimplementedHTTPDNSClusterServiceServer) UpdateHTTPDNSCluster(context.Context, *UpdateHTTPDNSClusterRequest) (*RPCSuccess, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateHTTPDNSCluster not implemented") +} +func (UnimplementedHTTPDNSClusterServiceServer) DeleteHTTPDNSCluster(context.Context, *DeleteHTTPDNSClusterRequest) (*RPCSuccess, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteHTTPDNSCluster not implemented") +} +func (UnimplementedHTTPDNSClusterServiceServer) FindHTTPDNSCluster(context.Context, *FindHTTPDNSClusterRequest) (*FindHTTPDNSClusterResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method FindHTTPDNSCluster not implemented") +} +func (UnimplementedHTTPDNSClusterServiceServer) ListHTTPDNSClusters(context.Context, *ListHTTPDNSClustersRequest) (*ListHTTPDNSClustersResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListHTTPDNSClusters not implemented") +} +func (UnimplementedHTTPDNSClusterServiceServer) FindAllHTTPDNSClusters(context.Context, *FindAllHTTPDNSClustersRequest) (*FindAllHTTPDNSClustersResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method FindAllHTTPDNSClusters not implemented") +} +func (UnimplementedHTTPDNSClusterServiceServer) UpdateHTTPDNSClusterDefault(context.Context, *UpdateHTTPDNSClusterDefaultRequest) (*RPCSuccess, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateHTTPDNSClusterDefault not implemented") +} +func (UnimplementedHTTPDNSClusterServiceServer) ListHTTPDNSNodesWithClusterId(context.Context, *ListHTTPDNSNodesWithClusterIdRequest) (*ListHTTPDNSNodesWithClusterIdResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListHTTPDNSNodesWithClusterId not implemented") +} +func (UnimplementedHTTPDNSClusterServiceServer) testEmbeddedByValue() {} + +// UnsafeHTTPDNSClusterServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to HTTPDNSClusterServiceServer will +// result in compilation errors. +type UnsafeHTTPDNSClusterServiceServer interface { + mustEmbedUnimplementedHTTPDNSClusterServiceServer() +} + +func RegisterHTTPDNSClusterServiceServer(s grpc.ServiceRegistrar, srv HTTPDNSClusterServiceServer) { + // If the following call pancis, it indicates UnimplementedHTTPDNSClusterServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&HTTPDNSClusterService_ServiceDesc, srv) +} + +func _HTTPDNSClusterService_CreateHTTPDNSCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateHTTPDNSClusterRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSClusterServiceServer).CreateHTTPDNSCluster(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSClusterService_CreateHTTPDNSCluster_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSClusterServiceServer).CreateHTTPDNSCluster(ctx, req.(*CreateHTTPDNSClusterRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSClusterService_UpdateHTTPDNSCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateHTTPDNSClusterRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSClusterServiceServer).UpdateHTTPDNSCluster(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSClusterService_UpdateHTTPDNSCluster_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSClusterServiceServer).UpdateHTTPDNSCluster(ctx, req.(*UpdateHTTPDNSClusterRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSClusterService_DeleteHTTPDNSCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteHTTPDNSClusterRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSClusterServiceServer).DeleteHTTPDNSCluster(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSClusterService_DeleteHTTPDNSCluster_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSClusterServiceServer).DeleteHTTPDNSCluster(ctx, req.(*DeleteHTTPDNSClusterRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSClusterService_FindHTTPDNSCluster_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindHTTPDNSClusterRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSClusterServiceServer).FindHTTPDNSCluster(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSClusterService_FindHTTPDNSCluster_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSClusterServiceServer).FindHTTPDNSCluster(ctx, req.(*FindHTTPDNSClusterRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSClusterService_ListHTTPDNSClusters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListHTTPDNSClustersRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSClusterServiceServer).ListHTTPDNSClusters(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSClusterService_ListHTTPDNSClusters_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSClusterServiceServer).ListHTTPDNSClusters(ctx, req.(*ListHTTPDNSClustersRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSClusterService_FindAllHTTPDNSClusters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindAllHTTPDNSClustersRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSClusterServiceServer).FindAllHTTPDNSClusters(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSClusterService_FindAllHTTPDNSClusters_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSClusterServiceServer).FindAllHTTPDNSClusters(ctx, req.(*FindAllHTTPDNSClustersRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSClusterService_UpdateHTTPDNSClusterDefault_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateHTTPDNSClusterDefaultRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSClusterServiceServer).UpdateHTTPDNSClusterDefault(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSClusterService_UpdateHTTPDNSClusterDefault_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSClusterServiceServer).UpdateHTTPDNSClusterDefault(ctx, req.(*UpdateHTTPDNSClusterDefaultRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSClusterService_ListHTTPDNSNodesWithClusterId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListHTTPDNSNodesWithClusterIdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSClusterServiceServer).ListHTTPDNSNodesWithClusterId(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSClusterService_ListHTTPDNSNodesWithClusterId_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSClusterServiceServer).ListHTTPDNSNodesWithClusterId(ctx, req.(*ListHTTPDNSNodesWithClusterIdRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// HTTPDNSClusterService_ServiceDesc is the grpc.ServiceDesc for HTTPDNSClusterService service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var HTTPDNSClusterService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "pb.HTTPDNSClusterService", + HandlerType: (*HTTPDNSClusterServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "createHTTPDNSCluster", + Handler: _HTTPDNSClusterService_CreateHTTPDNSCluster_Handler, + }, + { + MethodName: "updateHTTPDNSCluster", + Handler: _HTTPDNSClusterService_UpdateHTTPDNSCluster_Handler, + }, + { + MethodName: "deleteHTTPDNSCluster", + Handler: _HTTPDNSClusterService_DeleteHTTPDNSCluster_Handler, + }, + { + MethodName: "findHTTPDNSCluster", + Handler: _HTTPDNSClusterService_FindHTTPDNSCluster_Handler, + }, + { + MethodName: "listHTTPDNSClusters", + Handler: _HTTPDNSClusterService_ListHTTPDNSClusters_Handler, + }, + { + MethodName: "findAllHTTPDNSClusters", + Handler: _HTTPDNSClusterService_FindAllHTTPDNSClusters_Handler, + }, + { + MethodName: "updateHTTPDNSClusterDefault", + Handler: _HTTPDNSClusterService_UpdateHTTPDNSClusterDefault_Handler, + }, + { + MethodName: "listHTTPDNSNodesWithClusterId", + Handler: _HTTPDNSClusterService_ListHTTPDNSNodesWithClusterId_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "service_httpdns_cluster.proto", +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_domain.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_domain.pb.go new file mode 100644 index 0000000..3adb6ae --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_domain.pb.go @@ -0,0 +1,456 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc v3.21.12 +// source: service_httpdns_domain.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type CreateHTTPDNSDomainRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + AppDbId int64 `protobuf:"varint,1,opt,name=appDbId,proto3" json:"appDbId,omitempty"` + Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"` + IsOn bool `protobuf:"varint,3,opt,name=isOn,proto3" json:"isOn,omitempty"` +} + +func (x *CreateHTTPDNSDomainRequest) Reset() { + *x = CreateHTTPDNSDomainRequest{} + mi := &file_service_httpdns_domain_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSDomainRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSDomainRequest) ProtoMessage() {} + +func (x *CreateHTTPDNSDomainRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_domain_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSDomainRequest.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSDomainRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_domain_proto_rawDescGZIP(), []int{0} +} + +func (x *CreateHTTPDNSDomainRequest) GetAppDbId() int64 { + if x != nil { + return x.AppDbId + } + return 0 +} + +func (x *CreateHTTPDNSDomainRequest) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *CreateHTTPDNSDomainRequest) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +type CreateHTTPDNSDomainResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DomainId int64 `protobuf:"varint,1,opt,name=domainId,proto3" json:"domainId,omitempty"` +} + +func (x *CreateHTTPDNSDomainResponse) Reset() { + *x = CreateHTTPDNSDomainResponse{} + mi := &file_service_httpdns_domain_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSDomainResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSDomainResponse) ProtoMessage() {} + +func (x *CreateHTTPDNSDomainResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_domain_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSDomainResponse.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSDomainResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_domain_proto_rawDescGZIP(), []int{1} +} + +func (x *CreateHTTPDNSDomainResponse) GetDomainId() int64 { + if x != nil { + return x.DomainId + } + return 0 +} + +type DeleteHTTPDNSDomainRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DomainId int64 `protobuf:"varint,1,opt,name=domainId,proto3" json:"domainId,omitempty"` +} + +func (x *DeleteHTTPDNSDomainRequest) Reset() { + *x = DeleteHTTPDNSDomainRequest{} + mi := &file_service_httpdns_domain_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DeleteHTTPDNSDomainRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteHTTPDNSDomainRequest) ProtoMessage() {} + +func (x *DeleteHTTPDNSDomainRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_domain_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteHTTPDNSDomainRequest.ProtoReflect.Descriptor instead. +func (*DeleteHTTPDNSDomainRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_domain_proto_rawDescGZIP(), []int{2} +} + +func (x *DeleteHTTPDNSDomainRequest) GetDomainId() int64 { + if x != nil { + return x.DomainId + } + return 0 +} + +type UpdateHTTPDNSDomainStatusRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DomainId int64 `protobuf:"varint,1,opt,name=domainId,proto3" json:"domainId,omitempty"` + IsOn bool `protobuf:"varint,2,opt,name=isOn,proto3" json:"isOn,omitempty"` +} + +func (x *UpdateHTTPDNSDomainStatusRequest) Reset() { + *x = UpdateHTTPDNSDomainStatusRequest{} + mi := &file_service_httpdns_domain_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateHTTPDNSDomainStatusRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateHTTPDNSDomainStatusRequest) ProtoMessage() {} + +func (x *UpdateHTTPDNSDomainStatusRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_domain_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateHTTPDNSDomainStatusRequest.ProtoReflect.Descriptor instead. +func (*UpdateHTTPDNSDomainStatusRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_domain_proto_rawDescGZIP(), []int{3} +} + +func (x *UpdateHTTPDNSDomainStatusRequest) GetDomainId() int64 { + if x != nil { + return x.DomainId + } + return 0 +} + +func (x *UpdateHTTPDNSDomainStatusRequest) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +type ListHTTPDNSDomainsWithAppIdRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + AppDbId int64 `protobuf:"varint,1,opt,name=appDbId,proto3" json:"appDbId,omitempty"` + Keyword string `protobuf:"bytes,2,opt,name=keyword,proto3" json:"keyword,omitempty"` +} + +func (x *ListHTTPDNSDomainsWithAppIdRequest) Reset() { + *x = ListHTTPDNSDomainsWithAppIdRequest{} + mi := &file_service_httpdns_domain_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSDomainsWithAppIdRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSDomainsWithAppIdRequest) ProtoMessage() {} + +func (x *ListHTTPDNSDomainsWithAppIdRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_domain_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSDomainsWithAppIdRequest.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSDomainsWithAppIdRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_domain_proto_rawDescGZIP(), []int{4} +} + +func (x *ListHTTPDNSDomainsWithAppIdRequest) GetAppDbId() int64 { + if x != nil { + return x.AppDbId + } + return 0 +} + +func (x *ListHTTPDNSDomainsWithAppIdRequest) GetKeyword() string { + if x != nil { + return x.Keyword + } + return "" +} + +type ListHTTPDNSDomainsWithAppIdResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Domains []*HTTPDNSDomain `protobuf:"bytes,1,rep,name=domains,proto3" json:"domains,omitempty"` +} + +func (x *ListHTTPDNSDomainsWithAppIdResponse) Reset() { + *x = ListHTTPDNSDomainsWithAppIdResponse{} + mi := &file_service_httpdns_domain_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSDomainsWithAppIdResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSDomainsWithAppIdResponse) ProtoMessage() {} + +func (x *ListHTTPDNSDomainsWithAppIdResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_domain_proto_msgTypes[5] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSDomainsWithAppIdResponse.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSDomainsWithAppIdResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_domain_proto_rawDescGZIP(), []int{5} +} + +func (x *ListHTTPDNSDomainsWithAppIdResponse) GetDomains() []*HTTPDNSDomain { + if x != nil { + return x.Domains + } + return nil +} + +var File_service_httpdns_domain_proto protoreflect.FileDescriptor + +var file_service_httpdns_domain_proto_rawDesc = []byte{ + 0x0a, 0x1c, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x64, 0x6e, + 0x73, 0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, + 0x70, 0x62, 0x1a, 0x21, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x5f, 0x68, 0x74, 0x74, 0x70, 0x64, 0x6e, 0x73, 0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x72, 0x70, + 0x63, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0x62, 0x0a, 0x1a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, + 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, + 0x0a, 0x07, 0x61, 0x70, 0x70, 0x44, 0x62, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x07, 0x61, 0x70, 0x70, 0x44, 0x62, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, + 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, + 0x69, 0x73, 0x4f, 0x6e, 0x22, 0x39, 0x0a, 0x1b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, + 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x22, + 0x38, 0x0a, 0x1a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, + 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, + 0x08, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x08, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x22, 0x52, 0x0a, 0x20, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, + 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, + 0x08, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x08, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, + 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x22, 0x58, 0x0a, + 0x22, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x73, 0x57, 0x69, 0x74, 0x68, 0x41, 0x70, 0x70, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x70, 0x70, 0x44, 0x62, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x61, 0x70, 0x70, 0x44, 0x62, 0x49, 0x64, 0x12, 0x18, 0x0a, + 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x22, 0x52, 0x0a, 0x23, 0x4c, 0x69, 0x73, 0x74, 0x48, + 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x57, 0x69, 0x74, + 0x68, 0x41, 0x70, 0x70, 0x49, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2b, + 0x0a, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x11, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x52, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x32, 0xf8, 0x02, 0x0a, 0x14, + 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x12, 0x56, 0x0a, 0x13, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, + 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1e, 0x2e, 0x70, 0x62, + 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x62, + 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x45, 0x0a, 0x13, + 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, + 0x61, 0x69, 0x6e, 0x12, 0x1e, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x48, + 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x12, 0x51, 0x0a, 0x19, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, + 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x12, 0x24, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, + 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, + 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x6e, 0x0a, 0x1b, 0x6c, 0x69, 0x73, 0x74, 0x48, 0x54, + 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x57, 0x69, 0x74, 0x68, + 0x41, 0x70, 0x70, 0x49, 0x64, 0x12, 0x26, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x48, + 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x57, 0x69, 0x74, + 0x68, 0x41, 0x70, 0x70, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, + 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x44, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x57, 0x69, 0x74, 0x68, 0x41, 0x70, 0x70, 0x49, 0x64, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_service_httpdns_domain_proto_rawDescOnce sync.Once + file_service_httpdns_domain_proto_rawDescData = file_service_httpdns_domain_proto_rawDesc +) + +func file_service_httpdns_domain_proto_rawDescGZIP() []byte { + file_service_httpdns_domain_proto_rawDescOnce.Do(func() { + file_service_httpdns_domain_proto_rawDescData = protoimpl.X.CompressGZIP(file_service_httpdns_domain_proto_rawDescData) + }) + return file_service_httpdns_domain_proto_rawDescData +} + +var file_service_httpdns_domain_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_service_httpdns_domain_proto_goTypes = []any{ + (*CreateHTTPDNSDomainRequest)(nil), // 0: pb.CreateHTTPDNSDomainRequest + (*CreateHTTPDNSDomainResponse)(nil), // 1: pb.CreateHTTPDNSDomainResponse + (*DeleteHTTPDNSDomainRequest)(nil), // 2: pb.DeleteHTTPDNSDomainRequest + (*UpdateHTTPDNSDomainStatusRequest)(nil), // 3: pb.UpdateHTTPDNSDomainStatusRequest + (*ListHTTPDNSDomainsWithAppIdRequest)(nil), // 4: pb.ListHTTPDNSDomainsWithAppIdRequest + (*ListHTTPDNSDomainsWithAppIdResponse)(nil), // 5: pb.ListHTTPDNSDomainsWithAppIdResponse + (*HTTPDNSDomain)(nil), // 6: pb.HTTPDNSDomain + (*RPCSuccess)(nil), // 7: pb.RPCSuccess +} +var file_service_httpdns_domain_proto_depIdxs = []int32{ + 6, // 0: pb.ListHTTPDNSDomainsWithAppIdResponse.domains:type_name -> pb.HTTPDNSDomain + 0, // 1: pb.HTTPDNSDomainService.createHTTPDNSDomain:input_type -> pb.CreateHTTPDNSDomainRequest + 2, // 2: pb.HTTPDNSDomainService.deleteHTTPDNSDomain:input_type -> pb.DeleteHTTPDNSDomainRequest + 3, // 3: pb.HTTPDNSDomainService.updateHTTPDNSDomainStatus:input_type -> pb.UpdateHTTPDNSDomainStatusRequest + 4, // 4: pb.HTTPDNSDomainService.listHTTPDNSDomainsWithAppId:input_type -> pb.ListHTTPDNSDomainsWithAppIdRequest + 1, // 5: pb.HTTPDNSDomainService.createHTTPDNSDomain:output_type -> pb.CreateHTTPDNSDomainResponse + 7, // 6: pb.HTTPDNSDomainService.deleteHTTPDNSDomain:output_type -> pb.RPCSuccess + 7, // 7: pb.HTTPDNSDomainService.updateHTTPDNSDomainStatus:output_type -> pb.RPCSuccess + 5, // 8: pb.HTTPDNSDomainService.listHTTPDNSDomainsWithAppId:output_type -> pb.ListHTTPDNSDomainsWithAppIdResponse + 5, // [5:9] is the sub-list for method output_type + 1, // [1:5] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_service_httpdns_domain_proto_init() } +func file_service_httpdns_domain_proto_init() { + if File_service_httpdns_domain_proto != nil { + return + } + file_models_model_httpdns_domain_proto_init() + file_models_rpc_messages_proto_init() + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_service_httpdns_domain_proto_rawDesc, + NumEnums: 0, + NumMessages: 6, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_service_httpdns_domain_proto_goTypes, + DependencyIndexes: file_service_httpdns_domain_proto_depIdxs, + MessageInfos: file_service_httpdns_domain_proto_msgTypes, + }.Build() + File_service_httpdns_domain_proto = out.File + file_service_httpdns_domain_proto_rawDesc = nil + file_service_httpdns_domain_proto_goTypes = nil + file_service_httpdns_domain_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_domain_grpc.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_domain_grpc.pb.go new file mode 100644 index 0000000..d04f113 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_domain_grpc.pb.go @@ -0,0 +1,233 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.5.1 +// - protoc v3.21.12 +// source: service_httpdns_domain.proto + +package pb + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + HTTPDNSDomainService_CreateHTTPDNSDomain_FullMethodName = "/pb.HTTPDNSDomainService/createHTTPDNSDomain" + HTTPDNSDomainService_DeleteHTTPDNSDomain_FullMethodName = "/pb.HTTPDNSDomainService/deleteHTTPDNSDomain" + HTTPDNSDomainService_UpdateHTTPDNSDomainStatus_FullMethodName = "/pb.HTTPDNSDomainService/updateHTTPDNSDomainStatus" + HTTPDNSDomainService_ListHTTPDNSDomainsWithAppId_FullMethodName = "/pb.HTTPDNSDomainService/listHTTPDNSDomainsWithAppId" +) + +// HTTPDNSDomainServiceClient is the client API for HTTPDNSDomainService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type HTTPDNSDomainServiceClient interface { + CreateHTTPDNSDomain(ctx context.Context, in *CreateHTTPDNSDomainRequest, opts ...grpc.CallOption) (*CreateHTTPDNSDomainResponse, error) + DeleteHTTPDNSDomain(ctx context.Context, in *DeleteHTTPDNSDomainRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + UpdateHTTPDNSDomainStatus(ctx context.Context, in *UpdateHTTPDNSDomainStatusRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + ListHTTPDNSDomainsWithAppId(ctx context.Context, in *ListHTTPDNSDomainsWithAppIdRequest, opts ...grpc.CallOption) (*ListHTTPDNSDomainsWithAppIdResponse, error) +} + +type hTTPDNSDomainServiceClient struct { + cc grpc.ClientConnInterface +} + +func NewHTTPDNSDomainServiceClient(cc grpc.ClientConnInterface) HTTPDNSDomainServiceClient { + return &hTTPDNSDomainServiceClient{cc} +} + +func (c *hTTPDNSDomainServiceClient) CreateHTTPDNSDomain(ctx context.Context, in *CreateHTTPDNSDomainRequest, opts ...grpc.CallOption) (*CreateHTTPDNSDomainResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(CreateHTTPDNSDomainResponse) + err := c.cc.Invoke(ctx, HTTPDNSDomainService_CreateHTTPDNSDomain_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSDomainServiceClient) DeleteHTTPDNSDomain(ctx context.Context, in *DeleteHTTPDNSDomainRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSDomainService_DeleteHTTPDNSDomain_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSDomainServiceClient) UpdateHTTPDNSDomainStatus(ctx context.Context, in *UpdateHTTPDNSDomainStatusRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSDomainService_UpdateHTTPDNSDomainStatus_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSDomainServiceClient) ListHTTPDNSDomainsWithAppId(ctx context.Context, in *ListHTTPDNSDomainsWithAppIdRequest, opts ...grpc.CallOption) (*ListHTTPDNSDomainsWithAppIdResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ListHTTPDNSDomainsWithAppIdResponse) + err := c.cc.Invoke(ctx, HTTPDNSDomainService_ListHTTPDNSDomainsWithAppId_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +// HTTPDNSDomainServiceServer is the server API for HTTPDNSDomainService service. +// All implementations should embed UnimplementedHTTPDNSDomainServiceServer +// for forward compatibility. +type HTTPDNSDomainServiceServer interface { + CreateHTTPDNSDomain(context.Context, *CreateHTTPDNSDomainRequest) (*CreateHTTPDNSDomainResponse, error) + DeleteHTTPDNSDomain(context.Context, *DeleteHTTPDNSDomainRequest) (*RPCSuccess, error) + UpdateHTTPDNSDomainStatus(context.Context, *UpdateHTTPDNSDomainStatusRequest) (*RPCSuccess, error) + ListHTTPDNSDomainsWithAppId(context.Context, *ListHTTPDNSDomainsWithAppIdRequest) (*ListHTTPDNSDomainsWithAppIdResponse, error) +} + +// UnimplementedHTTPDNSDomainServiceServer should be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedHTTPDNSDomainServiceServer struct{} + +func (UnimplementedHTTPDNSDomainServiceServer) CreateHTTPDNSDomain(context.Context, *CreateHTTPDNSDomainRequest) (*CreateHTTPDNSDomainResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateHTTPDNSDomain not implemented") +} +func (UnimplementedHTTPDNSDomainServiceServer) DeleteHTTPDNSDomain(context.Context, *DeleteHTTPDNSDomainRequest) (*RPCSuccess, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteHTTPDNSDomain not implemented") +} +func (UnimplementedHTTPDNSDomainServiceServer) UpdateHTTPDNSDomainStatus(context.Context, *UpdateHTTPDNSDomainStatusRequest) (*RPCSuccess, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateHTTPDNSDomainStatus not implemented") +} +func (UnimplementedHTTPDNSDomainServiceServer) ListHTTPDNSDomainsWithAppId(context.Context, *ListHTTPDNSDomainsWithAppIdRequest) (*ListHTTPDNSDomainsWithAppIdResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListHTTPDNSDomainsWithAppId not implemented") +} +func (UnimplementedHTTPDNSDomainServiceServer) testEmbeddedByValue() {} + +// UnsafeHTTPDNSDomainServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to HTTPDNSDomainServiceServer will +// result in compilation errors. +type UnsafeHTTPDNSDomainServiceServer interface { + mustEmbedUnimplementedHTTPDNSDomainServiceServer() +} + +func RegisterHTTPDNSDomainServiceServer(s grpc.ServiceRegistrar, srv HTTPDNSDomainServiceServer) { + // If the following call pancis, it indicates UnimplementedHTTPDNSDomainServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&HTTPDNSDomainService_ServiceDesc, srv) +} + +func _HTTPDNSDomainService_CreateHTTPDNSDomain_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateHTTPDNSDomainRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSDomainServiceServer).CreateHTTPDNSDomain(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSDomainService_CreateHTTPDNSDomain_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSDomainServiceServer).CreateHTTPDNSDomain(ctx, req.(*CreateHTTPDNSDomainRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSDomainService_DeleteHTTPDNSDomain_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteHTTPDNSDomainRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSDomainServiceServer).DeleteHTTPDNSDomain(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSDomainService_DeleteHTTPDNSDomain_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSDomainServiceServer).DeleteHTTPDNSDomain(ctx, req.(*DeleteHTTPDNSDomainRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSDomainService_UpdateHTTPDNSDomainStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateHTTPDNSDomainStatusRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSDomainServiceServer).UpdateHTTPDNSDomainStatus(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSDomainService_UpdateHTTPDNSDomainStatus_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSDomainServiceServer).UpdateHTTPDNSDomainStatus(ctx, req.(*UpdateHTTPDNSDomainStatusRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSDomainService_ListHTTPDNSDomainsWithAppId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListHTTPDNSDomainsWithAppIdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSDomainServiceServer).ListHTTPDNSDomainsWithAppId(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSDomainService_ListHTTPDNSDomainsWithAppId_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSDomainServiceServer).ListHTTPDNSDomainsWithAppId(ctx, req.(*ListHTTPDNSDomainsWithAppIdRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// HTTPDNSDomainService_ServiceDesc is the grpc.ServiceDesc for HTTPDNSDomainService service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var HTTPDNSDomainService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "pb.HTTPDNSDomainService", + HandlerType: (*HTTPDNSDomainServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "createHTTPDNSDomain", + Handler: _HTTPDNSDomainService_CreateHTTPDNSDomain_Handler, + }, + { + MethodName: "deleteHTTPDNSDomain", + Handler: _HTTPDNSDomainService_DeleteHTTPDNSDomain_Handler, + }, + { + MethodName: "updateHTTPDNSDomainStatus", + Handler: _HTTPDNSDomainService_UpdateHTTPDNSDomainStatus_Handler, + }, + { + MethodName: "listHTTPDNSDomainsWithAppId", + Handler: _HTTPDNSDomainService_ListHTTPDNSDomainsWithAppId_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "service_httpdns_domain.proto", +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_node.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_node.pb.go new file mode 100644 index 0000000..9e684be --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_node.pb.go @@ -0,0 +1,970 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.36.11 +// protoc v3.21.12 +// source: service_httpdns_node.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" + unsafe "unsafe" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type CreateHTTPDNSNodeRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + ClusterId int64 `protobuf:"varint,1,opt,name=clusterId,proto3" json:"clusterId,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + InstallDir string `protobuf:"bytes,3,opt,name=installDir,proto3" json:"installDir,omitempty"` + IsOn bool `protobuf:"varint,4,opt,name=isOn,proto3" json:"isOn,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CreateHTTPDNSNodeRequest) Reset() { + *x = CreateHTTPDNSNodeRequest{} + mi := &file_service_httpdns_node_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSNodeRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSNodeRequest) ProtoMessage() {} + +func (x *CreateHTTPDNSNodeRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSNodeRequest.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSNodeRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{0} +} + +func (x *CreateHTTPDNSNodeRequest) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +func (x *CreateHTTPDNSNodeRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *CreateHTTPDNSNodeRequest) GetInstallDir() string { + if x != nil { + return x.InstallDir + } + return "" +} + +func (x *CreateHTTPDNSNodeRequest) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +type CreateHTTPDNSNodeResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + NodeId int64 `protobuf:"varint,1,opt,name=nodeId,proto3" json:"nodeId,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CreateHTTPDNSNodeResponse) Reset() { + *x = CreateHTTPDNSNodeResponse{} + mi := &file_service_httpdns_node_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSNodeResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSNodeResponse) ProtoMessage() {} + +func (x *CreateHTTPDNSNodeResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSNodeResponse.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSNodeResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{1} +} + +func (x *CreateHTTPDNSNodeResponse) GetNodeId() int64 { + if x != nil { + return x.NodeId + } + return 0 +} + +type UpdateHTTPDNSNodeRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + NodeId int64 `protobuf:"varint,1,opt,name=nodeId,proto3" json:"nodeId,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + InstallDir string `protobuf:"bytes,3,opt,name=installDir,proto3" json:"installDir,omitempty"` + IsOn bool `protobuf:"varint,4,opt,name=isOn,proto3" json:"isOn,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UpdateHTTPDNSNodeRequest) Reset() { + *x = UpdateHTTPDNSNodeRequest{} + mi := &file_service_httpdns_node_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateHTTPDNSNodeRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateHTTPDNSNodeRequest) ProtoMessage() {} + +func (x *UpdateHTTPDNSNodeRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateHTTPDNSNodeRequest.ProtoReflect.Descriptor instead. +func (*UpdateHTTPDNSNodeRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{2} +} + +func (x *UpdateHTTPDNSNodeRequest) GetNodeId() int64 { + if x != nil { + return x.NodeId + } + return 0 +} + +func (x *UpdateHTTPDNSNodeRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *UpdateHTTPDNSNodeRequest) GetInstallDir() string { + if x != nil { + return x.InstallDir + } + return "" +} + +func (x *UpdateHTTPDNSNodeRequest) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +type DeleteHTTPDNSNodeRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + NodeId int64 `protobuf:"varint,1,opt,name=nodeId,proto3" json:"nodeId,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *DeleteHTTPDNSNodeRequest) Reset() { + *x = DeleteHTTPDNSNodeRequest{} + mi := &file_service_httpdns_node_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DeleteHTTPDNSNodeRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteHTTPDNSNodeRequest) ProtoMessage() {} + +func (x *DeleteHTTPDNSNodeRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteHTTPDNSNodeRequest.ProtoReflect.Descriptor instead. +func (*DeleteHTTPDNSNodeRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{3} +} + +func (x *DeleteHTTPDNSNodeRequest) GetNodeId() int64 { + if x != nil { + return x.NodeId + } + return 0 +} + +type FindHTTPDNSNodeRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + NodeId int64 `protobuf:"varint,1,opt,name=nodeId,proto3" json:"nodeId,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *FindHTTPDNSNodeRequest) Reset() { + *x = FindHTTPDNSNodeRequest{} + mi := &file_service_httpdns_node_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FindHTTPDNSNodeRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindHTTPDNSNodeRequest) ProtoMessage() {} + +func (x *FindHTTPDNSNodeRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindHTTPDNSNodeRequest.ProtoReflect.Descriptor instead. +func (*FindHTTPDNSNodeRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{4} +} + +func (x *FindHTTPDNSNodeRequest) GetNodeId() int64 { + if x != nil { + return x.NodeId + } + return 0 +} + +type FindHTTPDNSNodeResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Node *HTTPDNSNode `protobuf:"bytes,1,opt,name=node,proto3" json:"node,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *FindHTTPDNSNodeResponse) Reset() { + *x = FindHTTPDNSNodeResponse{} + mi := &file_service_httpdns_node_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *FindHTTPDNSNodeResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindHTTPDNSNodeResponse) ProtoMessage() {} + +func (x *FindHTTPDNSNodeResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[5] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindHTTPDNSNodeResponse.ProtoReflect.Descriptor instead. +func (*FindHTTPDNSNodeResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{5} +} + +func (x *FindHTTPDNSNodeResponse) GetNode() *HTTPDNSNode { + if x != nil { + return x.Node + } + return nil +} + +type ListHTTPDNSNodesRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + ClusterId int64 `protobuf:"varint,1,opt,name=clusterId,proto3" json:"clusterId,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ListHTTPDNSNodesRequest) Reset() { + *x = ListHTTPDNSNodesRequest{} + mi := &file_service_httpdns_node_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSNodesRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSNodesRequest) ProtoMessage() {} + +func (x *ListHTTPDNSNodesRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[6] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSNodesRequest.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSNodesRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{6} +} + +func (x *ListHTTPDNSNodesRequest) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +type ListHTTPDNSNodesResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Nodes []*HTTPDNSNode `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ListHTTPDNSNodesResponse) Reset() { + *x = ListHTTPDNSNodesResponse{} + mi := &file_service_httpdns_node_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSNodesResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSNodesResponse) ProtoMessage() {} + +func (x *ListHTTPDNSNodesResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[7] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSNodesResponse.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSNodesResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{7} +} + +func (x *ListHTTPDNSNodesResponse) GetNodes() []*HTTPDNSNode { + if x != nil { + return x.Nodes + } + return nil +} + +type UpdateHTTPDNSNodeStatusRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + NodeId int64 `protobuf:"varint,1,opt,name=nodeId,proto3" json:"nodeId,omitempty"` + IsUp bool `protobuf:"varint,2,opt,name=isUp,proto3" json:"isUp,omitempty"` + IsInstalled bool `protobuf:"varint,3,opt,name=isInstalled,proto3" json:"isInstalled,omitempty"` + IsActive bool `protobuf:"varint,4,opt,name=isActive,proto3" json:"isActive,omitempty"` + StatusJSON []byte `protobuf:"bytes,5,opt,name=statusJSON,proto3" json:"statusJSON,omitempty"` + InstallStatusJSON []byte `protobuf:"bytes,6,opt,name=installStatusJSON,proto3" json:"installStatusJSON,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UpdateHTTPDNSNodeStatusRequest) Reset() { + *x = UpdateHTTPDNSNodeStatusRequest{} + mi := &file_service_httpdns_node_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateHTTPDNSNodeStatusRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateHTTPDNSNodeStatusRequest) ProtoMessage() {} + +func (x *UpdateHTTPDNSNodeStatusRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[8] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateHTTPDNSNodeStatusRequest.ProtoReflect.Descriptor instead. +func (*UpdateHTTPDNSNodeStatusRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{8} +} + +func (x *UpdateHTTPDNSNodeStatusRequest) GetNodeId() int64 { + if x != nil { + return x.NodeId + } + return 0 +} + +func (x *UpdateHTTPDNSNodeStatusRequest) GetIsUp() bool { + if x != nil { + return x.IsUp + } + return false +} + +func (x *UpdateHTTPDNSNodeStatusRequest) GetIsInstalled() bool { + if x != nil { + return x.IsInstalled + } + return false +} + +func (x *UpdateHTTPDNSNodeStatusRequest) GetIsActive() bool { + if x != nil { + return x.IsActive + } + return false +} + +func (x *UpdateHTTPDNSNodeStatusRequest) GetStatusJSON() []byte { + if x != nil { + return x.StatusJSON + } + return nil +} + +func (x *UpdateHTTPDNSNodeStatusRequest) GetInstallStatusJSON() []byte { + if x != nil { + return x.InstallStatusJSON + } + return nil +} + +// 修改HTTPDNS节点登录信息 +type UpdateHTTPDNSNodeLoginRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + NodeId int64 `protobuf:"varint,1,opt,name=nodeId,proto3" json:"nodeId,omitempty"` + NodeLogin *NodeLogin `protobuf:"bytes,2,opt,name=nodeLogin,proto3" json:"nodeLogin,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UpdateHTTPDNSNodeLoginRequest) Reset() { + *x = UpdateHTTPDNSNodeLoginRequest{} + mi := &file_service_httpdns_node_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateHTTPDNSNodeLoginRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateHTTPDNSNodeLoginRequest) ProtoMessage() {} + +func (x *UpdateHTTPDNSNodeLoginRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[9] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateHTTPDNSNodeLoginRequest.ProtoReflect.Descriptor instead. +func (*UpdateHTTPDNSNodeLoginRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{9} +} + +func (x *UpdateHTTPDNSNodeLoginRequest) GetNodeId() int64 { + if x != nil { + return x.NodeId + } + return 0 +} + +func (x *UpdateHTTPDNSNodeLoginRequest) GetNodeLogin() *NodeLogin { + if x != nil { + return x.NodeLogin + } + return nil +} + +// 检查HTTPDNS节点新版本 +type CheckHTTPDNSNodeLatestVersionRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Os string `protobuf:"bytes,1,opt,name=os,proto3" json:"os,omitempty"` + Arch string `protobuf:"bytes,2,opt,name=arch,proto3" json:"arch,omitempty"` + CurrentVersion string `protobuf:"bytes,3,opt,name=currentVersion,proto3" json:"currentVersion,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CheckHTTPDNSNodeLatestVersionRequest) Reset() { + *x = CheckHTTPDNSNodeLatestVersionRequest{} + mi := &file_service_httpdns_node_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CheckHTTPDNSNodeLatestVersionRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CheckHTTPDNSNodeLatestVersionRequest) ProtoMessage() {} + +func (x *CheckHTTPDNSNodeLatestVersionRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[10] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CheckHTTPDNSNodeLatestVersionRequest.ProtoReflect.Descriptor instead. +func (*CheckHTTPDNSNodeLatestVersionRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{10} +} + +func (x *CheckHTTPDNSNodeLatestVersionRequest) GetOs() string { + if x != nil { + return x.Os + } + return "" +} + +func (x *CheckHTTPDNSNodeLatestVersionRequest) GetArch() string { + if x != nil { + return x.Arch + } + return "" +} + +func (x *CheckHTTPDNSNodeLatestVersionRequest) GetCurrentVersion() string { + if x != nil { + return x.CurrentVersion + } + return "" +} + +type CheckHTTPDNSNodeLatestVersionResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + HasNewVersion bool `protobuf:"varint,1,opt,name=hasNewVersion,proto3" json:"hasNewVersion,omitempty"` + NewVersion string `protobuf:"bytes,2,opt,name=newVersion,proto3" json:"newVersion,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CheckHTTPDNSNodeLatestVersionResponse) Reset() { + *x = CheckHTTPDNSNodeLatestVersionResponse{} + mi := &file_service_httpdns_node_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CheckHTTPDNSNodeLatestVersionResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CheckHTTPDNSNodeLatestVersionResponse) ProtoMessage() {} + +func (x *CheckHTTPDNSNodeLatestVersionResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[11] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CheckHTTPDNSNodeLatestVersionResponse.ProtoReflect.Descriptor instead. +func (*CheckHTTPDNSNodeLatestVersionResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{11} +} + +func (x *CheckHTTPDNSNodeLatestVersionResponse) GetHasNewVersion() bool { + if x != nil { + return x.HasNewVersion + } + return false +} + +func (x *CheckHTTPDNSNodeLatestVersionResponse) GetNewVersion() string { + if x != nil { + return x.NewVersion + } + return "" +} + +// 下载最新HTTPDNS节点安装文件 +type DownloadHTTPDNSNodeInstallationFileRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Os string `protobuf:"bytes,1,opt,name=os,proto3" json:"os,omitempty"` + Arch string `protobuf:"bytes,2,opt,name=arch,proto3" json:"arch,omitempty"` + ChunkOffset int64 `protobuf:"varint,3,opt,name=chunkOffset,proto3" json:"chunkOffset,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *DownloadHTTPDNSNodeInstallationFileRequest) Reset() { + *x = DownloadHTTPDNSNodeInstallationFileRequest{} + mi := &file_service_httpdns_node_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DownloadHTTPDNSNodeInstallationFileRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DownloadHTTPDNSNodeInstallationFileRequest) ProtoMessage() {} + +func (x *DownloadHTTPDNSNodeInstallationFileRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[12] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DownloadHTTPDNSNodeInstallationFileRequest.ProtoReflect.Descriptor instead. +func (*DownloadHTTPDNSNodeInstallationFileRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{12} +} + +func (x *DownloadHTTPDNSNodeInstallationFileRequest) GetOs() string { + if x != nil { + return x.Os + } + return "" +} + +func (x *DownloadHTTPDNSNodeInstallationFileRequest) GetArch() string { + if x != nil { + return x.Arch + } + return "" +} + +func (x *DownloadHTTPDNSNodeInstallationFileRequest) GetChunkOffset() int64 { + if x != nil { + return x.ChunkOffset + } + return 0 +} + +type DownloadHTTPDNSNodeInstallationFileResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + ChunkData []byte `protobuf:"bytes,1,opt,name=chunkData,proto3" json:"chunkData,omitempty"` + Sum string `protobuf:"bytes,2,opt,name=sum,proto3" json:"sum,omitempty"` + Offset int64 `protobuf:"varint,3,opt,name=offset,proto3" json:"offset,omitempty"` + Version string `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"` + Filename string `protobuf:"bytes,5,opt,name=filename,proto3" json:"filename,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *DownloadHTTPDNSNodeInstallationFileResponse) Reset() { + *x = DownloadHTTPDNSNodeInstallationFileResponse{} + mi := &file_service_httpdns_node_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DownloadHTTPDNSNodeInstallationFileResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DownloadHTTPDNSNodeInstallationFileResponse) ProtoMessage() {} + +func (x *DownloadHTTPDNSNodeInstallationFileResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_node_proto_msgTypes[13] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DownloadHTTPDNSNodeInstallationFileResponse.ProtoReflect.Descriptor instead. +func (*DownloadHTTPDNSNodeInstallationFileResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_node_proto_rawDescGZIP(), []int{13} +} + +func (x *DownloadHTTPDNSNodeInstallationFileResponse) GetChunkData() []byte { + if x != nil { + return x.ChunkData + } + return nil +} + +func (x *DownloadHTTPDNSNodeInstallationFileResponse) GetSum() string { + if x != nil { + return x.Sum + } + return "" +} + +func (x *DownloadHTTPDNSNodeInstallationFileResponse) GetOffset() int64 { + if x != nil { + return x.Offset + } + return 0 +} + +func (x *DownloadHTTPDNSNodeInstallationFileResponse) GetVersion() string { + if x != nil { + return x.Version + } + return "" +} + +func (x *DownloadHTTPDNSNodeInstallationFileResponse) GetFilename() string { + if x != nil { + return x.Filename + } + return "" +} + +var File_service_httpdns_node_proto protoreflect.FileDescriptor + +const file_service_httpdns_node_proto_rawDesc = "" + + "\n" + + "\x1aservice_httpdns_node.proto\x12\x02pb\x1a\x1fmodels/model_httpdns_node.proto\x1a\x1dmodels/model_node_login.proto\x1a\x19models/rpc_messages.proto\"\x80\x01\n" + + "\x18CreateHTTPDNSNodeRequest\x12\x1c\n" + + "\tclusterId\x18\x01 \x01(\x03R\tclusterId\x12\x12\n" + + "\x04name\x18\x02 \x01(\tR\x04name\x12\x1e\n" + + "\n" + + "installDir\x18\x03 \x01(\tR\n" + + "installDir\x12\x12\n" + + "\x04isOn\x18\x04 \x01(\bR\x04isOn\"3\n" + + "\x19CreateHTTPDNSNodeResponse\x12\x16\n" + + "\x06nodeId\x18\x01 \x01(\x03R\x06nodeId\"z\n" + + "\x18UpdateHTTPDNSNodeRequest\x12\x16\n" + + "\x06nodeId\x18\x01 \x01(\x03R\x06nodeId\x12\x12\n" + + "\x04name\x18\x02 \x01(\tR\x04name\x12\x1e\n" + + "\n" + + "installDir\x18\x03 \x01(\tR\n" + + "installDir\x12\x12\n" + + "\x04isOn\x18\x04 \x01(\bR\x04isOn\"2\n" + + "\x18DeleteHTTPDNSNodeRequest\x12\x16\n" + + "\x06nodeId\x18\x01 \x01(\x03R\x06nodeId\"0\n" + + "\x16FindHTTPDNSNodeRequest\x12\x16\n" + + "\x06nodeId\x18\x01 \x01(\x03R\x06nodeId\">\n" + + "\x17FindHTTPDNSNodeResponse\x12#\n" + + "\x04node\x18\x01 \x01(\v2\x0f.pb.HTTPDNSNodeR\x04node\"7\n" + + "\x17ListHTTPDNSNodesRequest\x12\x1c\n" + + "\tclusterId\x18\x01 \x01(\x03R\tclusterId\"A\n" + + "\x18ListHTTPDNSNodesResponse\x12%\n" + + "\x05nodes\x18\x01 \x03(\v2\x0f.pb.HTTPDNSNodeR\x05nodes\"\xd8\x01\n" + + "\x1eUpdateHTTPDNSNodeStatusRequest\x12\x16\n" + + "\x06nodeId\x18\x01 \x01(\x03R\x06nodeId\x12\x12\n" + + "\x04isUp\x18\x02 \x01(\bR\x04isUp\x12 \n" + + "\visInstalled\x18\x03 \x01(\bR\visInstalled\x12\x1a\n" + + "\bisActive\x18\x04 \x01(\bR\bisActive\x12\x1e\n" + + "\n" + + "statusJSON\x18\x05 \x01(\fR\n" + + "statusJSON\x12,\n" + + "\x11installStatusJSON\x18\x06 \x01(\fR\x11installStatusJSON\"d\n" + + "\x1dUpdateHTTPDNSNodeLoginRequest\x12\x16\n" + + "\x06nodeId\x18\x01 \x01(\x03R\x06nodeId\x12+\n" + + "\tnodeLogin\x18\x02 \x01(\v2\r.pb.NodeLoginR\tnodeLogin\"r\n" + + "$CheckHTTPDNSNodeLatestVersionRequest\x12\x0e\n" + + "\x02os\x18\x01 \x01(\tR\x02os\x12\x12\n" + + "\x04arch\x18\x02 \x01(\tR\x04arch\x12&\n" + + "\x0ecurrentVersion\x18\x03 \x01(\tR\x0ecurrentVersion\"m\n" + + "%CheckHTTPDNSNodeLatestVersionResponse\x12$\n" + + "\rhasNewVersion\x18\x01 \x01(\bR\rhasNewVersion\x12\x1e\n" + + "\n" + + "newVersion\x18\x02 \x01(\tR\n" + + "newVersion\"r\n" + + "*DownloadHTTPDNSNodeInstallationFileRequest\x12\x0e\n" + + "\x02os\x18\x01 \x01(\tR\x02os\x12\x12\n" + + "\x04arch\x18\x02 \x01(\tR\x04arch\x12 \n" + + "\vchunkOffset\x18\x03 \x01(\x03R\vchunkOffset\"\xab\x01\n" + + "+DownloadHTTPDNSNodeInstallationFileResponse\x12\x1c\n" + + "\tchunkData\x18\x01 \x01(\fR\tchunkData\x12\x10\n" + + "\x03sum\x18\x02 \x01(\tR\x03sum\x12\x16\n" + + "\x06offset\x18\x03 \x01(\x03R\x06offset\x12\x18\n" + + "\aversion\x18\x04 \x01(\tR\aversion\x12\x1a\n" + + "\bfilename\x18\x05 \x01(\tR\bfilename2\xa2\x06\n" + + "\x12HTTPDNSNodeService\x12P\n" + + "\x11createHTTPDNSNode\x12\x1c.pb.CreateHTTPDNSNodeRequest\x1a\x1d.pb.CreateHTTPDNSNodeResponse\x12A\n" + + "\x11updateHTTPDNSNode\x12\x1c.pb.UpdateHTTPDNSNodeRequest\x1a\x0e.pb.RPCSuccess\x12A\n" + + "\x11deleteHTTPDNSNode\x12\x1c.pb.DeleteHTTPDNSNodeRequest\x1a\x0e.pb.RPCSuccess\x12J\n" + + "\x0ffindHTTPDNSNode\x12\x1a.pb.FindHTTPDNSNodeRequest\x1a\x1b.pb.FindHTTPDNSNodeResponse\x12M\n" + + "\x10listHTTPDNSNodes\x12\x1b.pb.ListHTTPDNSNodesRequest\x1a\x1c.pb.ListHTTPDNSNodesResponse\x12M\n" + + "\x17updateHTTPDNSNodeStatus\x12\".pb.UpdateHTTPDNSNodeStatusRequest\x1a\x0e.pb.RPCSuccess\x12K\n" + + "\x16updateHTTPDNSNodeLogin\x12!.pb.UpdateHTTPDNSNodeLoginRequest\x1a\x0e.pb.RPCSuccess\x12t\n" + + "\x1dcheckHTTPDNSNodeLatestVersion\x12(.pb.CheckHTTPDNSNodeLatestVersionRequest\x1a).pb.CheckHTTPDNSNodeLatestVersionResponse\x12\x86\x01\n" + + "#downloadHTTPDNSNodeInstallationFile\x12..pb.DownloadHTTPDNSNodeInstallationFileRequest\x1a/.pb.DownloadHTTPDNSNodeInstallationFileResponseB\x06Z\x04./pbb\x06proto3" + +var ( + file_service_httpdns_node_proto_rawDescOnce sync.Once + file_service_httpdns_node_proto_rawDescData []byte +) + +func file_service_httpdns_node_proto_rawDescGZIP() []byte { + file_service_httpdns_node_proto_rawDescOnce.Do(func() { + file_service_httpdns_node_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_service_httpdns_node_proto_rawDesc), len(file_service_httpdns_node_proto_rawDesc))) + }) + return file_service_httpdns_node_proto_rawDescData +} + +var file_service_httpdns_node_proto_msgTypes = make([]protoimpl.MessageInfo, 14) +var file_service_httpdns_node_proto_goTypes = []any{ + (*CreateHTTPDNSNodeRequest)(nil), // 0: pb.CreateHTTPDNSNodeRequest + (*CreateHTTPDNSNodeResponse)(nil), // 1: pb.CreateHTTPDNSNodeResponse + (*UpdateHTTPDNSNodeRequest)(nil), // 2: pb.UpdateHTTPDNSNodeRequest + (*DeleteHTTPDNSNodeRequest)(nil), // 3: pb.DeleteHTTPDNSNodeRequest + (*FindHTTPDNSNodeRequest)(nil), // 4: pb.FindHTTPDNSNodeRequest + (*FindHTTPDNSNodeResponse)(nil), // 5: pb.FindHTTPDNSNodeResponse + (*ListHTTPDNSNodesRequest)(nil), // 6: pb.ListHTTPDNSNodesRequest + (*ListHTTPDNSNodesResponse)(nil), // 7: pb.ListHTTPDNSNodesResponse + (*UpdateHTTPDNSNodeStatusRequest)(nil), // 8: pb.UpdateHTTPDNSNodeStatusRequest + (*UpdateHTTPDNSNodeLoginRequest)(nil), // 9: pb.UpdateHTTPDNSNodeLoginRequest + (*CheckHTTPDNSNodeLatestVersionRequest)(nil), // 10: pb.CheckHTTPDNSNodeLatestVersionRequest + (*CheckHTTPDNSNodeLatestVersionResponse)(nil), // 11: pb.CheckHTTPDNSNodeLatestVersionResponse + (*DownloadHTTPDNSNodeInstallationFileRequest)(nil), // 12: pb.DownloadHTTPDNSNodeInstallationFileRequest + (*DownloadHTTPDNSNodeInstallationFileResponse)(nil), // 13: pb.DownloadHTTPDNSNodeInstallationFileResponse + (*HTTPDNSNode)(nil), // 14: pb.HTTPDNSNode + (*NodeLogin)(nil), // 15: pb.NodeLogin + (*RPCSuccess)(nil), // 16: pb.RPCSuccess +} +var file_service_httpdns_node_proto_depIdxs = []int32{ + 14, // 0: pb.FindHTTPDNSNodeResponse.node:type_name -> pb.HTTPDNSNode + 14, // 1: pb.ListHTTPDNSNodesResponse.nodes:type_name -> pb.HTTPDNSNode + 15, // 2: pb.UpdateHTTPDNSNodeLoginRequest.nodeLogin:type_name -> pb.NodeLogin + 0, // 3: pb.HTTPDNSNodeService.createHTTPDNSNode:input_type -> pb.CreateHTTPDNSNodeRequest + 2, // 4: pb.HTTPDNSNodeService.updateHTTPDNSNode:input_type -> pb.UpdateHTTPDNSNodeRequest + 3, // 5: pb.HTTPDNSNodeService.deleteHTTPDNSNode:input_type -> pb.DeleteHTTPDNSNodeRequest + 4, // 6: pb.HTTPDNSNodeService.findHTTPDNSNode:input_type -> pb.FindHTTPDNSNodeRequest + 6, // 7: pb.HTTPDNSNodeService.listHTTPDNSNodes:input_type -> pb.ListHTTPDNSNodesRequest + 8, // 8: pb.HTTPDNSNodeService.updateHTTPDNSNodeStatus:input_type -> pb.UpdateHTTPDNSNodeStatusRequest + 9, // 9: pb.HTTPDNSNodeService.updateHTTPDNSNodeLogin:input_type -> pb.UpdateHTTPDNSNodeLoginRequest + 10, // 10: pb.HTTPDNSNodeService.checkHTTPDNSNodeLatestVersion:input_type -> pb.CheckHTTPDNSNodeLatestVersionRequest + 12, // 11: pb.HTTPDNSNodeService.downloadHTTPDNSNodeInstallationFile:input_type -> pb.DownloadHTTPDNSNodeInstallationFileRequest + 1, // 12: pb.HTTPDNSNodeService.createHTTPDNSNode:output_type -> pb.CreateHTTPDNSNodeResponse + 16, // 13: pb.HTTPDNSNodeService.updateHTTPDNSNode:output_type -> pb.RPCSuccess + 16, // 14: pb.HTTPDNSNodeService.deleteHTTPDNSNode:output_type -> pb.RPCSuccess + 5, // 15: pb.HTTPDNSNodeService.findHTTPDNSNode:output_type -> pb.FindHTTPDNSNodeResponse + 7, // 16: pb.HTTPDNSNodeService.listHTTPDNSNodes:output_type -> pb.ListHTTPDNSNodesResponse + 16, // 17: pb.HTTPDNSNodeService.updateHTTPDNSNodeStatus:output_type -> pb.RPCSuccess + 16, // 18: pb.HTTPDNSNodeService.updateHTTPDNSNodeLogin:output_type -> pb.RPCSuccess + 11, // 19: pb.HTTPDNSNodeService.checkHTTPDNSNodeLatestVersion:output_type -> pb.CheckHTTPDNSNodeLatestVersionResponse + 13, // 20: pb.HTTPDNSNodeService.downloadHTTPDNSNodeInstallationFile:output_type -> pb.DownloadHTTPDNSNodeInstallationFileResponse + 12, // [12:21] is the sub-list for method output_type + 3, // [3:12] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name +} + +func init() { file_service_httpdns_node_proto_init() } +func file_service_httpdns_node_proto_init() { + if File_service_httpdns_node_proto != nil { + return + } + file_models_model_httpdns_node_proto_init() + file_models_model_node_login_proto_init() + file_models_rpc_messages_proto_init() + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_service_httpdns_node_proto_rawDesc), len(file_service_httpdns_node_proto_rawDesc)), + NumEnums: 0, + NumMessages: 14, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_service_httpdns_node_proto_goTypes, + DependencyIndexes: file_service_httpdns_node_proto_depIdxs, + MessageInfos: file_service_httpdns_node_proto_msgTypes, + }.Build() + File_service_httpdns_node_proto = out.File + file_service_httpdns_node_proto_goTypes = nil + file_service_httpdns_node_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_node_grpc.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_node_grpc.pb.go new file mode 100644 index 0000000..3f40be0 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_node_grpc.pb.go @@ -0,0 +1,551 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.6.1 +// - protoc v3.21.12 +// source: service_httpdns_node.proto + +package pb + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + HTTPDNSNodeService_CreateHTTPDNSNode_FullMethodName = "/pb.HTTPDNSNodeService/createHTTPDNSNode" + HTTPDNSNodeService_UpdateHTTPDNSNode_FullMethodName = "/pb.HTTPDNSNodeService/updateHTTPDNSNode" + HTTPDNSNodeService_DeleteHTTPDNSNode_FullMethodName = "/pb.HTTPDNSNodeService/deleteHTTPDNSNode" + HTTPDNSNodeService_FindHTTPDNSNode_FullMethodName = "/pb.HTTPDNSNodeService/findHTTPDNSNode" + HTTPDNSNodeService_ListHTTPDNSNodes_FullMethodName = "/pb.HTTPDNSNodeService/listHTTPDNSNodes" + HTTPDNSNodeService_UpdateHTTPDNSNodeStatus_FullMethodName = "/pb.HTTPDNSNodeService/updateHTTPDNSNodeStatus" + HTTPDNSNodeService_UpdateHTTPDNSNodeLogin_FullMethodName = "/pb.HTTPDNSNodeService/updateHTTPDNSNodeLogin" + HTTPDNSNodeService_CheckHTTPDNSNodeLatestVersion_FullMethodName = "/pb.HTTPDNSNodeService/checkHTTPDNSNodeLatestVersion" + HTTPDNSNodeService_DownloadHTTPDNSNodeInstallationFile_FullMethodName = "/pb.HTTPDNSNodeService/downloadHTTPDNSNodeInstallationFile" + HTTPDNSNodeService_CountAllUpgradeHTTPDNSNodesWithClusterId_FullMethodName = "/pb.HTTPDNSNodeService/countAllUpgradeHTTPDNSNodesWithClusterId" + HTTPDNSNodeService_FindAllUpgradeHTTPDNSNodesWithClusterId_FullMethodName = "/pb.HTTPDNSNodeService/findAllUpgradeHTTPDNSNodesWithClusterId" + HTTPDNSNodeService_UpgradeHTTPDNSNode_FullMethodName = "/pb.HTTPDNSNodeService/upgradeHTTPDNSNode" +) + +// HTTPDNSNodeServiceClient is the client API for HTTPDNSNodeService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type HTTPDNSNodeServiceClient interface { + CreateHTTPDNSNode(ctx context.Context, in *CreateHTTPDNSNodeRequest, opts ...grpc.CallOption) (*CreateHTTPDNSNodeResponse, error) + UpdateHTTPDNSNode(ctx context.Context, in *UpdateHTTPDNSNodeRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + DeleteHTTPDNSNode(ctx context.Context, in *DeleteHTTPDNSNodeRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + FindHTTPDNSNode(ctx context.Context, in *FindHTTPDNSNodeRequest, opts ...grpc.CallOption) (*FindHTTPDNSNodeResponse, error) + ListHTTPDNSNodes(ctx context.Context, in *ListHTTPDNSNodesRequest, opts ...grpc.CallOption) (*ListHTTPDNSNodesResponse, error) + UpdateHTTPDNSNodeStatus(ctx context.Context, in *UpdateHTTPDNSNodeStatusRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + // 修改HTTPDNS节点登录信息 + UpdateHTTPDNSNodeLogin(ctx context.Context, in *UpdateHTTPDNSNodeLoginRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + // 检查HTTPDNS节点新版本 + CheckHTTPDNSNodeLatestVersion(ctx context.Context, in *CheckHTTPDNSNodeLatestVersionRequest, opts ...grpc.CallOption) (*CheckHTTPDNSNodeLatestVersionResponse, error) + // 下载最新HTTPDNS节点安装文件 + DownloadHTTPDNSNodeInstallationFile(ctx context.Context, in *DownloadHTTPDNSNodeInstallationFileRequest, opts ...grpc.CallOption) (*DownloadHTTPDNSNodeInstallationFileResponse, error) + // 计算需要升级的HTTPDNS节点数量 + CountAllUpgradeHTTPDNSNodesWithClusterId(ctx context.Context, in *CountAllUpgradeHTTPDNSNodesWithClusterIdRequest, opts ...grpc.CallOption) (*RPCCountResponse, error) + // 列出所有需要升级的HTTPDNS节点 + FindAllUpgradeHTTPDNSNodesWithClusterId(ctx context.Context, in *FindAllUpgradeHTTPDNSNodesWithClusterIdRequest, opts ...grpc.CallOption) (*FindAllUpgradeHTTPDNSNodesWithClusterIdResponse, error) + // 升级单个HTTPDNS节点 + UpgradeHTTPDNSNode(ctx context.Context, in *UpgradeHTTPDNSNodeRequest, opts ...grpc.CallOption) (*RPCSuccess, error) +} + +type hTTPDNSNodeServiceClient struct { + cc grpc.ClientConnInterface +} + +func NewHTTPDNSNodeServiceClient(cc grpc.ClientConnInterface) HTTPDNSNodeServiceClient { + return &hTTPDNSNodeServiceClient{cc} +} + +func (c *hTTPDNSNodeServiceClient) CreateHTTPDNSNode(ctx context.Context, in *CreateHTTPDNSNodeRequest, opts ...grpc.CallOption) (*CreateHTTPDNSNodeResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(CreateHTTPDNSNodeResponse) + err := c.cc.Invoke(ctx, HTTPDNSNodeService_CreateHTTPDNSNode_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSNodeServiceClient) UpdateHTTPDNSNode(ctx context.Context, in *UpdateHTTPDNSNodeRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSNodeService_UpdateHTTPDNSNode_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSNodeServiceClient) DeleteHTTPDNSNode(ctx context.Context, in *DeleteHTTPDNSNodeRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSNodeService_DeleteHTTPDNSNode_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSNodeServiceClient) FindHTTPDNSNode(ctx context.Context, in *FindHTTPDNSNodeRequest, opts ...grpc.CallOption) (*FindHTTPDNSNodeResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(FindHTTPDNSNodeResponse) + err := c.cc.Invoke(ctx, HTTPDNSNodeService_FindHTTPDNSNode_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSNodeServiceClient) ListHTTPDNSNodes(ctx context.Context, in *ListHTTPDNSNodesRequest, opts ...grpc.CallOption) (*ListHTTPDNSNodesResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ListHTTPDNSNodesResponse) + err := c.cc.Invoke(ctx, HTTPDNSNodeService_ListHTTPDNSNodes_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSNodeServiceClient) UpdateHTTPDNSNodeStatus(ctx context.Context, in *UpdateHTTPDNSNodeStatusRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSNodeService_UpdateHTTPDNSNodeStatus_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSNodeServiceClient) UpdateHTTPDNSNodeLogin(ctx context.Context, in *UpdateHTTPDNSNodeLoginRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSNodeService_UpdateHTTPDNSNodeLogin_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSNodeServiceClient) CheckHTTPDNSNodeLatestVersion(ctx context.Context, in *CheckHTTPDNSNodeLatestVersionRequest, opts ...grpc.CallOption) (*CheckHTTPDNSNodeLatestVersionResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(CheckHTTPDNSNodeLatestVersionResponse) + err := c.cc.Invoke(ctx, HTTPDNSNodeService_CheckHTTPDNSNodeLatestVersion_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSNodeServiceClient) DownloadHTTPDNSNodeInstallationFile(ctx context.Context, in *DownloadHTTPDNSNodeInstallationFileRequest, opts ...grpc.CallOption) (*DownloadHTTPDNSNodeInstallationFileResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(DownloadHTTPDNSNodeInstallationFileResponse) + err := c.cc.Invoke(ctx, HTTPDNSNodeService_DownloadHTTPDNSNodeInstallationFile_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSNodeServiceClient) CountAllUpgradeHTTPDNSNodesWithClusterId(ctx context.Context, in *CountAllUpgradeHTTPDNSNodesWithClusterIdRequest, opts ...grpc.CallOption) (*RPCCountResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCCountResponse) + err := c.cc.Invoke(ctx, HTTPDNSNodeService_CountAllUpgradeHTTPDNSNodesWithClusterId_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSNodeServiceClient) FindAllUpgradeHTTPDNSNodesWithClusterId(ctx context.Context, in *FindAllUpgradeHTTPDNSNodesWithClusterIdRequest, opts ...grpc.CallOption) (*FindAllUpgradeHTTPDNSNodesWithClusterIdResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(FindAllUpgradeHTTPDNSNodesWithClusterIdResponse) + err := c.cc.Invoke(ctx, HTTPDNSNodeService_FindAllUpgradeHTTPDNSNodesWithClusterId_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSNodeServiceClient) UpgradeHTTPDNSNode(ctx context.Context, in *UpgradeHTTPDNSNodeRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSNodeService_UpgradeHTTPDNSNode_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +// HTTPDNSNodeServiceServer is the server API for HTTPDNSNodeService service. +// All implementations must embed UnimplementedHTTPDNSNodeServiceServer +// for forward compatibility. +type HTTPDNSNodeServiceServer interface { + CreateHTTPDNSNode(context.Context, *CreateHTTPDNSNodeRequest) (*CreateHTTPDNSNodeResponse, error) + UpdateHTTPDNSNode(context.Context, *UpdateHTTPDNSNodeRequest) (*RPCSuccess, error) + DeleteHTTPDNSNode(context.Context, *DeleteHTTPDNSNodeRequest) (*RPCSuccess, error) + FindHTTPDNSNode(context.Context, *FindHTTPDNSNodeRequest) (*FindHTTPDNSNodeResponse, error) + ListHTTPDNSNodes(context.Context, *ListHTTPDNSNodesRequest) (*ListHTTPDNSNodesResponse, error) + UpdateHTTPDNSNodeStatus(context.Context, *UpdateHTTPDNSNodeStatusRequest) (*RPCSuccess, error) + // 修改HTTPDNS节点登录信息 + UpdateHTTPDNSNodeLogin(context.Context, *UpdateHTTPDNSNodeLoginRequest) (*RPCSuccess, error) + // 检查HTTPDNS节点新版本 + CheckHTTPDNSNodeLatestVersion(context.Context, *CheckHTTPDNSNodeLatestVersionRequest) (*CheckHTTPDNSNodeLatestVersionResponse, error) + // 下载最新HTTPDNS节点安装文件 + DownloadHTTPDNSNodeInstallationFile(context.Context, *DownloadHTTPDNSNodeInstallationFileRequest) (*DownloadHTTPDNSNodeInstallationFileResponse, error) + // 计算需要升级的HTTPDNS节点数量 + CountAllUpgradeHTTPDNSNodesWithClusterId(context.Context, *CountAllUpgradeHTTPDNSNodesWithClusterIdRequest) (*RPCCountResponse, error) + // 列出所有需要升级的HTTPDNS节点 + FindAllUpgradeHTTPDNSNodesWithClusterId(context.Context, *FindAllUpgradeHTTPDNSNodesWithClusterIdRequest) (*FindAllUpgradeHTTPDNSNodesWithClusterIdResponse, error) + // 升级单个HTTPDNS节点 + UpgradeHTTPDNSNode(context.Context, *UpgradeHTTPDNSNodeRequest) (*RPCSuccess, error) + mustEmbedUnimplementedHTTPDNSNodeServiceServer() +} + +// UnimplementedHTTPDNSNodeServiceServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedHTTPDNSNodeServiceServer struct{} + +func (UnimplementedHTTPDNSNodeServiceServer) CreateHTTPDNSNode(context.Context, *CreateHTTPDNSNodeRequest) (*CreateHTTPDNSNodeResponse, error) { + return nil, status.Error(codes.Unimplemented, "method CreateHTTPDNSNode not implemented") +} +func (UnimplementedHTTPDNSNodeServiceServer) UpdateHTTPDNSNode(context.Context, *UpdateHTTPDNSNodeRequest) (*RPCSuccess, error) { + return nil, status.Error(codes.Unimplemented, "method UpdateHTTPDNSNode not implemented") +} +func (UnimplementedHTTPDNSNodeServiceServer) DeleteHTTPDNSNode(context.Context, *DeleteHTTPDNSNodeRequest) (*RPCSuccess, error) { + return nil, status.Error(codes.Unimplemented, "method DeleteHTTPDNSNode not implemented") +} +func (UnimplementedHTTPDNSNodeServiceServer) FindHTTPDNSNode(context.Context, *FindHTTPDNSNodeRequest) (*FindHTTPDNSNodeResponse, error) { + return nil, status.Error(codes.Unimplemented, "method FindHTTPDNSNode not implemented") +} +func (UnimplementedHTTPDNSNodeServiceServer) ListHTTPDNSNodes(context.Context, *ListHTTPDNSNodesRequest) (*ListHTTPDNSNodesResponse, error) { + return nil, status.Error(codes.Unimplemented, "method ListHTTPDNSNodes not implemented") +} +func (UnimplementedHTTPDNSNodeServiceServer) UpdateHTTPDNSNodeStatus(context.Context, *UpdateHTTPDNSNodeStatusRequest) (*RPCSuccess, error) { + return nil, status.Error(codes.Unimplemented, "method UpdateHTTPDNSNodeStatus not implemented") +} +func (UnimplementedHTTPDNSNodeServiceServer) UpdateHTTPDNSNodeLogin(context.Context, *UpdateHTTPDNSNodeLoginRequest) (*RPCSuccess, error) { + return nil, status.Error(codes.Unimplemented, "method UpdateHTTPDNSNodeLogin not implemented") +} +func (UnimplementedHTTPDNSNodeServiceServer) CheckHTTPDNSNodeLatestVersion(context.Context, *CheckHTTPDNSNodeLatestVersionRequest) (*CheckHTTPDNSNodeLatestVersionResponse, error) { + return nil, status.Error(codes.Unimplemented, "method CheckHTTPDNSNodeLatestVersion not implemented") +} +func (UnimplementedHTTPDNSNodeServiceServer) DownloadHTTPDNSNodeInstallationFile(context.Context, *DownloadHTTPDNSNodeInstallationFileRequest) (*DownloadHTTPDNSNodeInstallationFileResponse, error) { + return nil, status.Error(codes.Unimplemented, "method DownloadHTTPDNSNodeInstallationFile not implemented") +} +func (UnimplementedHTTPDNSNodeServiceServer) CountAllUpgradeHTTPDNSNodesWithClusterId(context.Context, *CountAllUpgradeHTTPDNSNodesWithClusterIdRequest) (*RPCCountResponse, error) { + return nil, status.Error(codes.Unimplemented, "method CountAllUpgradeHTTPDNSNodesWithClusterId not implemented") +} +func (UnimplementedHTTPDNSNodeServiceServer) FindAllUpgradeHTTPDNSNodesWithClusterId(context.Context, *FindAllUpgradeHTTPDNSNodesWithClusterIdRequest) (*FindAllUpgradeHTTPDNSNodesWithClusterIdResponse, error) { + return nil, status.Error(codes.Unimplemented, "method FindAllUpgradeHTTPDNSNodesWithClusterId not implemented") +} +func (UnimplementedHTTPDNSNodeServiceServer) UpgradeHTTPDNSNode(context.Context, *UpgradeHTTPDNSNodeRequest) (*RPCSuccess, error) { + return nil, status.Error(codes.Unimplemented, "method UpgradeHTTPDNSNode not implemented") +} +func (UnimplementedHTTPDNSNodeServiceServer) mustEmbedUnimplementedHTTPDNSNodeServiceServer() {} +func (UnimplementedHTTPDNSNodeServiceServer) testEmbeddedByValue() {} + +// UnsafeHTTPDNSNodeServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to HTTPDNSNodeServiceServer will +// result in compilation errors. +type UnsafeHTTPDNSNodeServiceServer interface { + mustEmbedUnimplementedHTTPDNSNodeServiceServer() +} + +func RegisterHTTPDNSNodeServiceServer(s grpc.ServiceRegistrar, srv HTTPDNSNodeServiceServer) { + // If the following call panics, it indicates UnimplementedHTTPDNSNodeServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&HTTPDNSNodeService_ServiceDesc, srv) +} + +func _HTTPDNSNodeService_CreateHTTPDNSNode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateHTTPDNSNodeRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSNodeServiceServer).CreateHTTPDNSNode(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSNodeService_CreateHTTPDNSNode_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSNodeServiceServer).CreateHTTPDNSNode(ctx, req.(*CreateHTTPDNSNodeRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSNodeService_UpdateHTTPDNSNode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateHTTPDNSNodeRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSNodeServiceServer).UpdateHTTPDNSNode(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSNodeService_UpdateHTTPDNSNode_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSNodeServiceServer).UpdateHTTPDNSNode(ctx, req.(*UpdateHTTPDNSNodeRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSNodeService_DeleteHTTPDNSNode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteHTTPDNSNodeRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSNodeServiceServer).DeleteHTTPDNSNode(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSNodeService_DeleteHTTPDNSNode_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSNodeServiceServer).DeleteHTTPDNSNode(ctx, req.(*DeleteHTTPDNSNodeRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSNodeService_FindHTTPDNSNode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindHTTPDNSNodeRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSNodeServiceServer).FindHTTPDNSNode(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSNodeService_FindHTTPDNSNode_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSNodeServiceServer).FindHTTPDNSNode(ctx, req.(*FindHTTPDNSNodeRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSNodeService_ListHTTPDNSNodes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListHTTPDNSNodesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSNodeServiceServer).ListHTTPDNSNodes(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSNodeService_ListHTTPDNSNodes_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSNodeServiceServer).ListHTTPDNSNodes(ctx, req.(*ListHTTPDNSNodesRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSNodeService_UpdateHTTPDNSNodeStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateHTTPDNSNodeStatusRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSNodeServiceServer).UpdateHTTPDNSNodeStatus(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSNodeService_UpdateHTTPDNSNodeStatus_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSNodeServiceServer).UpdateHTTPDNSNodeStatus(ctx, req.(*UpdateHTTPDNSNodeStatusRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSNodeService_UpdateHTTPDNSNodeLogin_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateHTTPDNSNodeLoginRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSNodeServiceServer).UpdateHTTPDNSNodeLogin(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSNodeService_UpdateHTTPDNSNodeLogin_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSNodeServiceServer).UpdateHTTPDNSNodeLogin(ctx, req.(*UpdateHTTPDNSNodeLoginRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSNodeService_CheckHTTPDNSNodeLatestVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CheckHTTPDNSNodeLatestVersionRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSNodeServiceServer).CheckHTTPDNSNodeLatestVersion(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSNodeService_CheckHTTPDNSNodeLatestVersion_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSNodeServiceServer).CheckHTTPDNSNodeLatestVersion(ctx, req.(*CheckHTTPDNSNodeLatestVersionRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSNodeService_DownloadHTTPDNSNodeInstallationFile_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DownloadHTTPDNSNodeInstallationFileRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSNodeServiceServer).DownloadHTTPDNSNodeInstallationFile(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSNodeService_DownloadHTTPDNSNodeInstallationFile_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSNodeServiceServer).DownloadHTTPDNSNodeInstallationFile(ctx, req.(*DownloadHTTPDNSNodeInstallationFileRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSNodeService_CountAllUpgradeHTTPDNSNodesWithClusterId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CountAllUpgradeHTTPDNSNodesWithClusterIdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSNodeServiceServer).CountAllUpgradeHTTPDNSNodesWithClusterId(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSNodeService_CountAllUpgradeHTTPDNSNodesWithClusterId_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSNodeServiceServer).CountAllUpgradeHTTPDNSNodesWithClusterId(ctx, req.(*CountAllUpgradeHTTPDNSNodesWithClusterIdRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSNodeService_FindAllUpgradeHTTPDNSNodesWithClusterId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindAllUpgradeHTTPDNSNodesWithClusterIdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSNodeServiceServer).FindAllUpgradeHTTPDNSNodesWithClusterId(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSNodeService_FindAllUpgradeHTTPDNSNodesWithClusterId_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSNodeServiceServer).FindAllUpgradeHTTPDNSNodesWithClusterId(ctx, req.(*FindAllUpgradeHTTPDNSNodesWithClusterIdRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSNodeService_UpgradeHTTPDNSNode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpgradeHTTPDNSNodeRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSNodeServiceServer).UpgradeHTTPDNSNode(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSNodeService_UpgradeHTTPDNSNode_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSNodeServiceServer).UpgradeHTTPDNSNode(ctx, req.(*UpgradeHTTPDNSNodeRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// HTTPDNSNodeService_ServiceDesc is the grpc.ServiceDesc for HTTPDNSNodeService service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var HTTPDNSNodeService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "pb.HTTPDNSNodeService", + HandlerType: (*HTTPDNSNodeServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "createHTTPDNSNode", + Handler: _HTTPDNSNodeService_CreateHTTPDNSNode_Handler, + }, + { + MethodName: "updateHTTPDNSNode", + Handler: _HTTPDNSNodeService_UpdateHTTPDNSNode_Handler, + }, + { + MethodName: "deleteHTTPDNSNode", + Handler: _HTTPDNSNodeService_DeleteHTTPDNSNode_Handler, + }, + { + MethodName: "findHTTPDNSNode", + Handler: _HTTPDNSNodeService_FindHTTPDNSNode_Handler, + }, + { + MethodName: "listHTTPDNSNodes", + Handler: _HTTPDNSNodeService_ListHTTPDNSNodes_Handler, + }, + { + MethodName: "updateHTTPDNSNodeStatus", + Handler: _HTTPDNSNodeService_UpdateHTTPDNSNodeStatus_Handler, + }, + { + MethodName: "updateHTTPDNSNodeLogin", + Handler: _HTTPDNSNodeService_UpdateHTTPDNSNodeLogin_Handler, + }, + { + MethodName: "checkHTTPDNSNodeLatestVersion", + Handler: _HTTPDNSNodeService_CheckHTTPDNSNodeLatestVersion_Handler, + }, + { + MethodName: "downloadHTTPDNSNodeInstallationFile", + Handler: _HTTPDNSNodeService_DownloadHTTPDNSNodeInstallationFile_Handler, + }, + { + MethodName: "countAllUpgradeHTTPDNSNodesWithClusterId", + Handler: _HTTPDNSNodeService_CountAllUpgradeHTTPDNSNodesWithClusterId_Handler, + }, + { + MethodName: "findAllUpgradeHTTPDNSNodesWithClusterId", + Handler: _HTTPDNSNodeService_FindAllUpgradeHTTPDNSNodesWithClusterId_Handler, + }, + { + MethodName: "upgradeHTTPDNSNode", + Handler: _HTTPDNSNodeService_UpgradeHTTPDNSNode_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "service_httpdns_node.proto", +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_node_upgrade.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_node_upgrade.go new file mode 100644 index 0000000..2736957 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_node_upgrade.go @@ -0,0 +1,345 @@ +package pb + +import ( + "fmt" + + "google.golang.org/protobuf/encoding/protowire" + "google.golang.org/protobuf/proto" +) + +// CountAllUpgradeHTTPDNSNodesWithClusterIdRequest 计算需要升级的HTTPDNS节点数量 +type CountAllUpgradeHTTPDNSNodesWithClusterIdRequest struct { + ClusterId int64 `protobuf:"varint,1,opt,name=clusterId,proto3" json:"clusterId,omitempty"` +} + +func (x *CountAllUpgradeHTTPDNSNodesWithClusterIdRequest) Reset() { *x = CountAllUpgradeHTTPDNSNodesWithClusterIdRequest{} } +func (x *CountAllUpgradeHTTPDNSNodesWithClusterIdRequest) String() string { return fmt.Sprintf("%+v", *x) } +func (x *CountAllUpgradeHTTPDNSNodesWithClusterIdRequest) ProtoMessage() {} + +func (x *CountAllUpgradeHTTPDNSNodesWithClusterIdRequest) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +func (x *CountAllUpgradeHTTPDNSNodesWithClusterIdRequest) Marshal() ([]byte, error) { + var b []byte + if x.ClusterId != 0 { + b = protowire.AppendTag(b, 1, protowire.VarintType) + b = protowire.AppendVarint(b, uint64(x.ClusterId)) + } + return b, nil +} + +func (x *CountAllUpgradeHTTPDNSNodesWithClusterIdRequest) Unmarshal(data []byte) error { + for len(data) > 0 { + num, typ, n := protowire.ConsumeTag(data) + if n < 0 { + return fmt.Errorf("invalid tag") + } + data = data[n:] + switch num { + case 1: + if typ == protowire.VarintType { + v, n := protowire.ConsumeVarint(data) + if n < 0 { + return fmt.Errorf("invalid varint") + } + x.ClusterId = int64(v) + data = data[n:] + } + default: + n := protowire.ConsumeFieldValue(num, typ, data) + if n < 0 { + return fmt.Errorf("invalid field value") + } + data = data[n:] + } + } + return nil +} + +// FindAllUpgradeHTTPDNSNodesWithClusterIdRequest 列出所有需要升级的HTTPDNS节点 +type FindAllUpgradeHTTPDNSNodesWithClusterIdRequest struct { + ClusterId int64 `protobuf:"varint,1,opt,name=clusterId,proto3" json:"clusterId,omitempty"` +} + +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdRequest) Reset() { *x = FindAllUpgradeHTTPDNSNodesWithClusterIdRequest{} } +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdRequest) String() string { return fmt.Sprintf("%+v", *x) } +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdRequest) ProtoMessage() {} + +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdRequest) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdRequest) Marshal() ([]byte, error) { + var b []byte + if x.ClusterId != 0 { + b = protowire.AppendTag(b, 1, protowire.VarintType) + b = protowire.AppendVarint(b, uint64(x.ClusterId)) + } + return b, nil +} + +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdRequest) Unmarshal(data []byte) error { + for len(data) > 0 { + num, typ, n := protowire.ConsumeTag(data) + if n < 0 { + return fmt.Errorf("invalid tag") + } + data = data[n:] + switch num { + case 1: + if typ == protowire.VarintType { + v, n := protowire.ConsumeVarint(data) + if n < 0 { + return fmt.Errorf("invalid varint") + } + x.ClusterId = int64(v) + data = data[n:] + } + default: + n := protowire.ConsumeFieldValue(num, typ, data) + if n < 0 { + return fmt.Errorf("invalid field value") + } + data = data[n:] + } + } + return nil +} + +// FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade 单个待升级节点信息 +type FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade struct { + Node *HTTPDNSNode `protobuf:"bytes,1,opt,name=node,proto3" json:"node,omitempty"` + Os string `protobuf:"bytes,2,opt,name=os,proto3" json:"os,omitempty"` + Arch string `protobuf:"bytes,3,opt,name=arch,proto3" json:"arch,omitempty"` + OldVersion string `protobuf:"bytes,4,opt,name=oldVersion,proto3" json:"oldVersion,omitempty"` + NewVersion string `protobuf:"bytes,5,opt,name=newVersion,proto3" json:"newVersion,omitempty"` +} + +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade) Reset() { + *x = FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade{} +} +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade) String() string { + return fmt.Sprintf("%+v", *x) +} +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade) ProtoMessage() {} + +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade) Marshal() ([]byte, error) { + var b []byte + if x.Node != nil { + nodeData, err := proto.Marshal(x.Node) + if err != nil { + return nil, err + } + b = protowire.AppendTag(b, 1, protowire.BytesType) + b = protowire.AppendBytes(b, nodeData) + } + if x.Os != "" { + b = protowire.AppendTag(b, 2, protowire.BytesType) + b = protowire.AppendString(b, x.Os) + } + if x.Arch != "" { + b = protowire.AppendTag(b, 3, protowire.BytesType) + b = protowire.AppendString(b, x.Arch) + } + if x.OldVersion != "" { + b = protowire.AppendTag(b, 4, protowire.BytesType) + b = protowire.AppendString(b, x.OldVersion) + } + if x.NewVersion != "" { + b = protowire.AppendTag(b, 5, protowire.BytesType) + b = protowire.AppendString(b, x.NewVersion) + } + return b, nil +} + +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade) Unmarshal(data []byte) error { + for len(data) > 0 { + num, typ, n := protowire.ConsumeTag(data) + if n < 0 { + return fmt.Errorf("invalid tag") + } + data = data[n:] + switch num { + case 1: + if typ == protowire.BytesType { + v, n := protowire.ConsumeBytes(data) + if n < 0 { + return fmt.Errorf("invalid bytes") + } + x.Node = &HTTPDNSNode{} + if err := proto.Unmarshal(v, x.Node); err != nil { + return err + } + data = data[n:] + } + case 2: + if typ == protowire.BytesType { + v, n := protowire.ConsumeString(data) + if n < 0 { + return fmt.Errorf("invalid string") + } + x.Os = v + data = data[n:] + } + case 3: + if typ == protowire.BytesType { + v, n := protowire.ConsumeString(data) + if n < 0 { + return fmt.Errorf("invalid string") + } + x.Arch = v + data = data[n:] + } + case 4: + if typ == protowire.BytesType { + v, n := protowire.ConsumeString(data) + if n < 0 { + return fmt.Errorf("invalid string") + } + x.OldVersion = v + data = data[n:] + } + case 5: + if typ == protowire.BytesType { + v, n := protowire.ConsumeString(data) + if n < 0 { + return fmt.Errorf("invalid string") + } + x.NewVersion = v + data = data[n:] + } + default: + n := protowire.ConsumeFieldValue(num, typ, data) + if n < 0 { + return fmt.Errorf("invalid field value") + } + data = data[n:] + } + } + return nil +} + +// FindAllUpgradeHTTPDNSNodesWithClusterIdResponse 列出所有需要升级的HTTPDNS节点 +type FindAllUpgradeHTTPDNSNodesWithClusterIdResponse struct { + Nodes []*FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"` +} + +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdResponse) Reset() { + *x = FindAllUpgradeHTTPDNSNodesWithClusterIdResponse{} +} +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdResponse) String() string { + return fmt.Sprintf("%+v", *x) +} +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdResponse) ProtoMessage() {} + +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdResponse) GetNodes() []*FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade { + if x != nil { + return x.Nodes + } + return nil +} + +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdResponse) Marshal() ([]byte, error) { + var b []byte + for _, node := range x.Nodes { + nodeData, err := node.Marshal() + if err != nil { + return nil, err + } + b = protowire.AppendTag(b, 1, protowire.BytesType) + b = protowire.AppendBytes(b, nodeData) + } + return b, nil +} + +func (x *FindAllUpgradeHTTPDNSNodesWithClusterIdResponse) Unmarshal(data []byte) error { + for len(data) > 0 { + num, typ, n := protowire.ConsumeTag(data) + if n < 0 { + return fmt.Errorf("invalid tag") + } + data = data[n:] + switch num { + case 1: + if typ == protowire.BytesType { + v, n := protowire.ConsumeBytes(data) + if n < 0 { + return fmt.Errorf("invalid bytes") + } + node := &FindAllUpgradeHTTPDNSNodesWithClusterIdResponse_HTTPDNSNodeUpgrade{} + if err := node.Unmarshal(v); err != nil { + return err + } + x.Nodes = append(x.Nodes, node) + data = data[n:] + } + default: + n := protowire.ConsumeFieldValue(num, typ, data) + if n < 0 { + return fmt.Errorf("invalid field value") + } + data = data[n:] + } + } + return nil +} + +// UpgradeHTTPDNSNodeRequest 升级单个HTTPDNS节点 +type UpgradeHTTPDNSNodeRequest struct { + NodeId int64 `protobuf:"varint,1,opt,name=nodeId,proto3" json:"nodeId,omitempty"` +} + +func (x *UpgradeHTTPDNSNodeRequest) Reset() { *x = UpgradeHTTPDNSNodeRequest{} } +func (x *UpgradeHTTPDNSNodeRequest) String() string { return fmt.Sprintf("%+v", *x) } +func (x *UpgradeHTTPDNSNodeRequest) ProtoMessage() {} + +func (x *UpgradeHTTPDNSNodeRequest) GetNodeId() int64 { + if x != nil { + return x.NodeId + } + return 0 +} + +func (x *UpgradeHTTPDNSNodeRequest) Marshal() ([]byte, error) { + var b []byte + if x.NodeId != 0 { + b = protowire.AppendTag(b, 1, protowire.VarintType) + b = protowire.AppendVarint(b, uint64(x.NodeId)) + } + return b, nil +} + +func (x *UpgradeHTTPDNSNodeRequest) Unmarshal(data []byte) error { + for len(data) > 0 { + num, typ, n := protowire.ConsumeTag(data) + if n < 0 { + return fmt.Errorf("invalid tag") + } + data = data[n:] + switch num { + case 1: + if typ == protowire.VarintType { + v, n := protowire.ConsumeVarint(data) + if n < 0 { + return fmt.Errorf("invalid varint") + } + x.NodeId = int64(v) + data = data[n:] + } + default: + n := protowire.ConsumeFieldValue(num, typ, data) + if n < 0 { + return fmt.Errorf("invalid field value") + } + data = data[n:] + } + } + return nil +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_rule.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_rule.pb.go new file mode 100644 index 0000000..1ac612c --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_rule.pb.go @@ -0,0 +1,492 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc v3.21.12 +// source: service_httpdns_rule.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type CreateHTTPDNSCustomRuleRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Rule *HTTPDNSCustomRule `protobuf:"bytes,1,opt,name=rule,proto3" json:"rule,omitempty"` +} + +func (x *CreateHTTPDNSCustomRuleRequest) Reset() { + *x = CreateHTTPDNSCustomRuleRequest{} + mi := &file_service_httpdns_rule_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSCustomRuleRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSCustomRuleRequest) ProtoMessage() {} + +func (x *CreateHTTPDNSCustomRuleRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_rule_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSCustomRuleRequest.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSCustomRuleRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_rule_proto_rawDescGZIP(), []int{0} +} + +func (x *CreateHTTPDNSCustomRuleRequest) GetRule() *HTTPDNSCustomRule { + if x != nil { + return x.Rule + } + return nil +} + +type CreateHTTPDNSCustomRuleResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RuleId int64 `protobuf:"varint,1,opt,name=ruleId,proto3" json:"ruleId,omitempty"` +} + +func (x *CreateHTTPDNSCustomRuleResponse) Reset() { + *x = CreateHTTPDNSCustomRuleResponse{} + mi := &file_service_httpdns_rule_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSCustomRuleResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSCustomRuleResponse) ProtoMessage() {} + +func (x *CreateHTTPDNSCustomRuleResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_rule_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSCustomRuleResponse.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSCustomRuleResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_rule_proto_rawDescGZIP(), []int{1} +} + +func (x *CreateHTTPDNSCustomRuleResponse) GetRuleId() int64 { + if x != nil { + return x.RuleId + } + return 0 +} + +type UpdateHTTPDNSCustomRuleRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Rule *HTTPDNSCustomRule `protobuf:"bytes,1,opt,name=rule,proto3" json:"rule,omitempty"` +} + +func (x *UpdateHTTPDNSCustomRuleRequest) Reset() { + *x = UpdateHTTPDNSCustomRuleRequest{} + mi := &file_service_httpdns_rule_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateHTTPDNSCustomRuleRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateHTTPDNSCustomRuleRequest) ProtoMessage() {} + +func (x *UpdateHTTPDNSCustomRuleRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_rule_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateHTTPDNSCustomRuleRequest.ProtoReflect.Descriptor instead. +func (*UpdateHTTPDNSCustomRuleRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_rule_proto_rawDescGZIP(), []int{2} +} + +func (x *UpdateHTTPDNSCustomRuleRequest) GetRule() *HTTPDNSCustomRule { + if x != nil { + return x.Rule + } + return nil +} + +type DeleteHTTPDNSCustomRuleRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RuleId int64 `protobuf:"varint,1,opt,name=ruleId,proto3" json:"ruleId,omitempty"` +} + +func (x *DeleteHTTPDNSCustomRuleRequest) Reset() { + *x = DeleteHTTPDNSCustomRuleRequest{} + mi := &file_service_httpdns_rule_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DeleteHTTPDNSCustomRuleRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteHTTPDNSCustomRuleRequest) ProtoMessage() {} + +func (x *DeleteHTTPDNSCustomRuleRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_rule_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteHTTPDNSCustomRuleRequest.ProtoReflect.Descriptor instead. +func (*DeleteHTTPDNSCustomRuleRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_rule_proto_rawDescGZIP(), []int{3} +} + +func (x *DeleteHTTPDNSCustomRuleRequest) GetRuleId() int64 { + if x != nil { + return x.RuleId + } + return 0 +} + +type UpdateHTTPDNSCustomRuleStatusRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RuleId int64 `protobuf:"varint,1,opt,name=ruleId,proto3" json:"ruleId,omitempty"` + IsOn bool `protobuf:"varint,2,opt,name=isOn,proto3" json:"isOn,omitempty"` +} + +func (x *UpdateHTTPDNSCustomRuleStatusRequest) Reset() { + *x = UpdateHTTPDNSCustomRuleStatusRequest{} + mi := &file_service_httpdns_rule_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateHTTPDNSCustomRuleStatusRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateHTTPDNSCustomRuleStatusRequest) ProtoMessage() {} + +func (x *UpdateHTTPDNSCustomRuleStatusRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_rule_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateHTTPDNSCustomRuleStatusRequest.ProtoReflect.Descriptor instead. +func (*UpdateHTTPDNSCustomRuleStatusRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_rule_proto_rawDescGZIP(), []int{4} +} + +func (x *UpdateHTTPDNSCustomRuleStatusRequest) GetRuleId() int64 { + if x != nil { + return x.RuleId + } + return 0 +} + +func (x *UpdateHTTPDNSCustomRuleStatusRequest) GetIsOn() bool { + if x != nil { + return x.IsOn + } + return false +} + +type ListHTTPDNSCustomRulesWithDomainIdRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DomainId int64 `protobuf:"varint,1,opt,name=domainId,proto3" json:"domainId,omitempty"` +} + +func (x *ListHTTPDNSCustomRulesWithDomainIdRequest) Reset() { + *x = ListHTTPDNSCustomRulesWithDomainIdRequest{} + mi := &file_service_httpdns_rule_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSCustomRulesWithDomainIdRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSCustomRulesWithDomainIdRequest) ProtoMessage() {} + +func (x *ListHTTPDNSCustomRulesWithDomainIdRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_rule_proto_msgTypes[5] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSCustomRulesWithDomainIdRequest.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSCustomRulesWithDomainIdRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_rule_proto_rawDescGZIP(), []int{5} +} + +func (x *ListHTTPDNSCustomRulesWithDomainIdRequest) GetDomainId() int64 { + if x != nil { + return x.DomainId + } + return 0 +} + +type ListHTTPDNSCustomRulesWithDomainIdResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Rules []*HTTPDNSCustomRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"` +} + +func (x *ListHTTPDNSCustomRulesWithDomainIdResponse) Reset() { + *x = ListHTTPDNSCustomRulesWithDomainIdResponse{} + mi := &file_service_httpdns_rule_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSCustomRulesWithDomainIdResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSCustomRulesWithDomainIdResponse) ProtoMessage() {} + +func (x *ListHTTPDNSCustomRulesWithDomainIdResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_rule_proto_msgTypes[6] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSCustomRulesWithDomainIdResponse.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSCustomRulesWithDomainIdResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_rule_proto_rawDescGZIP(), []int{6} +} + +func (x *ListHTTPDNSCustomRulesWithDomainIdResponse) GetRules() []*HTTPDNSCustomRule { + if x != nil { + return x.Rules + } + return nil +} + +var File_service_httpdns_rule_proto protoreflect.FileDescriptor + +var file_service_httpdns_rule_proto_rawDesc = []byte{ + 0x0a, 0x1a, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x64, 0x6e, + 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, + 0x1a, 0x1f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x68, + 0x74, 0x74, 0x70, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x1a, 0x19, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x72, 0x70, 0x63, 0x5f, 0x6d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4b, 0x0a, 0x1e, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, + 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x29, + 0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x70, + 0x62, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, + 0x75, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x22, 0x39, 0x0a, 0x1f, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, + 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, + 0x72, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x75, + 0x6c, 0x65, 0x49, 0x64, 0x22, 0x4b, 0x0a, 0x1e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x54, + 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x29, 0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, + 0x53, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x75, 0x6c, + 0x65, 0x22, 0x38, 0x0a, 0x1e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, + 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x22, 0x52, 0x0a, 0x24, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, + 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, + 0x73, 0x4f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x22, + 0x47, 0x0a, 0x29, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, + 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x44, 0x6f, 0x6d, + 0x61, 0x69, 0x6e, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, + 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, + 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x22, 0x59, 0x0a, 0x2a, 0x4c, 0x69, 0x73, 0x74, + 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, + 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x44, + 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x75, + 0x6c, 0x65, 0x73, 0x32, 0xf7, 0x03, 0x0a, 0x12, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, + 0x75, 0x6c, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x62, 0x0a, 0x17, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, 0x6f, + 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, + 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x70, 0x62, 0x2e, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, + 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4d, + 0x0a, 0x17, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, + 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x70, 0x62, 0x2e, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, + 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, + 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x4d, 0x0a, + 0x17, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, + 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, 0x6f, + 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, + 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x59, 0x0a, 0x1d, + 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, + 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x28, 0x2e, + 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, + 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, + 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x83, 0x01, 0x0a, 0x22, 0x6c, 0x69, 0x73, 0x74, + 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, + 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x2d, + 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, + 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x44, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, + 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x43, 0x75, + 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x44, 0x6f, 0x6d, + 0x61, 0x69, 0x6e, 0x49, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_service_httpdns_rule_proto_rawDescOnce sync.Once + file_service_httpdns_rule_proto_rawDescData = file_service_httpdns_rule_proto_rawDesc +) + +func file_service_httpdns_rule_proto_rawDescGZIP() []byte { + file_service_httpdns_rule_proto_rawDescOnce.Do(func() { + file_service_httpdns_rule_proto_rawDescData = protoimpl.X.CompressGZIP(file_service_httpdns_rule_proto_rawDescData) + }) + return file_service_httpdns_rule_proto_rawDescData +} + +var file_service_httpdns_rule_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_service_httpdns_rule_proto_goTypes = []any{ + (*CreateHTTPDNSCustomRuleRequest)(nil), // 0: pb.CreateHTTPDNSCustomRuleRequest + (*CreateHTTPDNSCustomRuleResponse)(nil), // 1: pb.CreateHTTPDNSCustomRuleResponse + (*UpdateHTTPDNSCustomRuleRequest)(nil), // 2: pb.UpdateHTTPDNSCustomRuleRequest + (*DeleteHTTPDNSCustomRuleRequest)(nil), // 3: pb.DeleteHTTPDNSCustomRuleRequest + (*UpdateHTTPDNSCustomRuleStatusRequest)(nil), // 4: pb.UpdateHTTPDNSCustomRuleStatusRequest + (*ListHTTPDNSCustomRulesWithDomainIdRequest)(nil), // 5: pb.ListHTTPDNSCustomRulesWithDomainIdRequest + (*ListHTTPDNSCustomRulesWithDomainIdResponse)(nil), // 6: pb.ListHTTPDNSCustomRulesWithDomainIdResponse + (*HTTPDNSCustomRule)(nil), // 7: pb.HTTPDNSCustomRule + (*RPCSuccess)(nil), // 8: pb.RPCSuccess +} +var file_service_httpdns_rule_proto_depIdxs = []int32{ + 7, // 0: pb.CreateHTTPDNSCustomRuleRequest.rule:type_name -> pb.HTTPDNSCustomRule + 7, // 1: pb.UpdateHTTPDNSCustomRuleRequest.rule:type_name -> pb.HTTPDNSCustomRule + 7, // 2: pb.ListHTTPDNSCustomRulesWithDomainIdResponse.rules:type_name -> pb.HTTPDNSCustomRule + 0, // 3: pb.HTTPDNSRuleService.createHTTPDNSCustomRule:input_type -> pb.CreateHTTPDNSCustomRuleRequest + 2, // 4: pb.HTTPDNSRuleService.updateHTTPDNSCustomRule:input_type -> pb.UpdateHTTPDNSCustomRuleRequest + 3, // 5: pb.HTTPDNSRuleService.deleteHTTPDNSCustomRule:input_type -> pb.DeleteHTTPDNSCustomRuleRequest + 4, // 6: pb.HTTPDNSRuleService.updateHTTPDNSCustomRuleStatus:input_type -> pb.UpdateHTTPDNSCustomRuleStatusRequest + 5, // 7: pb.HTTPDNSRuleService.listHTTPDNSCustomRulesWithDomainId:input_type -> pb.ListHTTPDNSCustomRulesWithDomainIdRequest + 1, // 8: pb.HTTPDNSRuleService.createHTTPDNSCustomRule:output_type -> pb.CreateHTTPDNSCustomRuleResponse + 8, // 9: pb.HTTPDNSRuleService.updateHTTPDNSCustomRule:output_type -> pb.RPCSuccess + 8, // 10: pb.HTTPDNSRuleService.deleteHTTPDNSCustomRule:output_type -> pb.RPCSuccess + 8, // 11: pb.HTTPDNSRuleService.updateHTTPDNSCustomRuleStatus:output_type -> pb.RPCSuccess + 6, // 12: pb.HTTPDNSRuleService.listHTTPDNSCustomRulesWithDomainId:output_type -> pb.ListHTTPDNSCustomRulesWithDomainIdResponse + 8, // [8:13] is the sub-list for method output_type + 3, // [3:8] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name +} + +func init() { file_service_httpdns_rule_proto_init() } +func file_service_httpdns_rule_proto_init() { + if File_service_httpdns_rule_proto != nil { + return + } + file_models_model_httpdns_rule_proto_init() + file_models_rpc_messages_proto_init() + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_service_httpdns_rule_proto_rawDesc, + NumEnums: 0, + NumMessages: 7, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_service_httpdns_rule_proto_goTypes, + DependencyIndexes: file_service_httpdns_rule_proto_depIdxs, + MessageInfos: file_service_httpdns_rule_proto_msgTypes, + }.Build() + File_service_httpdns_rule_proto = out.File + file_service_httpdns_rule_proto_rawDesc = nil + file_service_httpdns_rule_proto_goTypes = nil + file_service_httpdns_rule_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_rule_grpc.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_rule_grpc.pb.go new file mode 100644 index 0000000..3f8125f --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_rule_grpc.pb.go @@ -0,0 +1,271 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.5.1 +// - protoc v3.21.12 +// source: service_httpdns_rule.proto + +package pb + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + HTTPDNSRuleService_CreateHTTPDNSCustomRule_FullMethodName = "/pb.HTTPDNSRuleService/createHTTPDNSCustomRule" + HTTPDNSRuleService_UpdateHTTPDNSCustomRule_FullMethodName = "/pb.HTTPDNSRuleService/updateHTTPDNSCustomRule" + HTTPDNSRuleService_DeleteHTTPDNSCustomRule_FullMethodName = "/pb.HTTPDNSRuleService/deleteHTTPDNSCustomRule" + HTTPDNSRuleService_UpdateHTTPDNSCustomRuleStatus_FullMethodName = "/pb.HTTPDNSRuleService/updateHTTPDNSCustomRuleStatus" + HTTPDNSRuleService_ListHTTPDNSCustomRulesWithDomainId_FullMethodName = "/pb.HTTPDNSRuleService/listHTTPDNSCustomRulesWithDomainId" +) + +// HTTPDNSRuleServiceClient is the client API for HTTPDNSRuleService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type HTTPDNSRuleServiceClient interface { + CreateHTTPDNSCustomRule(ctx context.Context, in *CreateHTTPDNSCustomRuleRequest, opts ...grpc.CallOption) (*CreateHTTPDNSCustomRuleResponse, error) + UpdateHTTPDNSCustomRule(ctx context.Context, in *UpdateHTTPDNSCustomRuleRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + DeleteHTTPDNSCustomRule(ctx context.Context, in *DeleteHTTPDNSCustomRuleRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + UpdateHTTPDNSCustomRuleStatus(ctx context.Context, in *UpdateHTTPDNSCustomRuleStatusRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + ListHTTPDNSCustomRulesWithDomainId(ctx context.Context, in *ListHTTPDNSCustomRulesWithDomainIdRequest, opts ...grpc.CallOption) (*ListHTTPDNSCustomRulesWithDomainIdResponse, error) +} + +type hTTPDNSRuleServiceClient struct { + cc grpc.ClientConnInterface +} + +func NewHTTPDNSRuleServiceClient(cc grpc.ClientConnInterface) HTTPDNSRuleServiceClient { + return &hTTPDNSRuleServiceClient{cc} +} + +func (c *hTTPDNSRuleServiceClient) CreateHTTPDNSCustomRule(ctx context.Context, in *CreateHTTPDNSCustomRuleRequest, opts ...grpc.CallOption) (*CreateHTTPDNSCustomRuleResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(CreateHTTPDNSCustomRuleResponse) + err := c.cc.Invoke(ctx, HTTPDNSRuleService_CreateHTTPDNSCustomRule_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSRuleServiceClient) UpdateHTTPDNSCustomRule(ctx context.Context, in *UpdateHTTPDNSCustomRuleRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSRuleService_UpdateHTTPDNSCustomRule_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSRuleServiceClient) DeleteHTTPDNSCustomRule(ctx context.Context, in *DeleteHTTPDNSCustomRuleRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSRuleService_DeleteHTTPDNSCustomRule_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSRuleServiceClient) UpdateHTTPDNSCustomRuleStatus(ctx context.Context, in *UpdateHTTPDNSCustomRuleStatusRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, HTTPDNSRuleService_UpdateHTTPDNSCustomRuleStatus_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSRuleServiceClient) ListHTTPDNSCustomRulesWithDomainId(ctx context.Context, in *ListHTTPDNSCustomRulesWithDomainIdRequest, opts ...grpc.CallOption) (*ListHTTPDNSCustomRulesWithDomainIdResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ListHTTPDNSCustomRulesWithDomainIdResponse) + err := c.cc.Invoke(ctx, HTTPDNSRuleService_ListHTTPDNSCustomRulesWithDomainId_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +// HTTPDNSRuleServiceServer is the server API for HTTPDNSRuleService service. +// All implementations should embed UnimplementedHTTPDNSRuleServiceServer +// for forward compatibility. +type HTTPDNSRuleServiceServer interface { + CreateHTTPDNSCustomRule(context.Context, *CreateHTTPDNSCustomRuleRequest) (*CreateHTTPDNSCustomRuleResponse, error) + UpdateHTTPDNSCustomRule(context.Context, *UpdateHTTPDNSCustomRuleRequest) (*RPCSuccess, error) + DeleteHTTPDNSCustomRule(context.Context, *DeleteHTTPDNSCustomRuleRequest) (*RPCSuccess, error) + UpdateHTTPDNSCustomRuleStatus(context.Context, *UpdateHTTPDNSCustomRuleStatusRequest) (*RPCSuccess, error) + ListHTTPDNSCustomRulesWithDomainId(context.Context, *ListHTTPDNSCustomRulesWithDomainIdRequest) (*ListHTTPDNSCustomRulesWithDomainIdResponse, error) +} + +// UnimplementedHTTPDNSRuleServiceServer should be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedHTTPDNSRuleServiceServer struct{} + +func (UnimplementedHTTPDNSRuleServiceServer) CreateHTTPDNSCustomRule(context.Context, *CreateHTTPDNSCustomRuleRequest) (*CreateHTTPDNSCustomRuleResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateHTTPDNSCustomRule not implemented") +} +func (UnimplementedHTTPDNSRuleServiceServer) UpdateHTTPDNSCustomRule(context.Context, *UpdateHTTPDNSCustomRuleRequest) (*RPCSuccess, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateHTTPDNSCustomRule not implemented") +} +func (UnimplementedHTTPDNSRuleServiceServer) DeleteHTTPDNSCustomRule(context.Context, *DeleteHTTPDNSCustomRuleRequest) (*RPCSuccess, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteHTTPDNSCustomRule not implemented") +} +func (UnimplementedHTTPDNSRuleServiceServer) UpdateHTTPDNSCustomRuleStatus(context.Context, *UpdateHTTPDNSCustomRuleStatusRequest) (*RPCSuccess, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateHTTPDNSCustomRuleStatus not implemented") +} +func (UnimplementedHTTPDNSRuleServiceServer) ListHTTPDNSCustomRulesWithDomainId(context.Context, *ListHTTPDNSCustomRulesWithDomainIdRequest) (*ListHTTPDNSCustomRulesWithDomainIdResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListHTTPDNSCustomRulesWithDomainId not implemented") +} +func (UnimplementedHTTPDNSRuleServiceServer) testEmbeddedByValue() {} + +// UnsafeHTTPDNSRuleServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to HTTPDNSRuleServiceServer will +// result in compilation errors. +type UnsafeHTTPDNSRuleServiceServer interface { + mustEmbedUnimplementedHTTPDNSRuleServiceServer() +} + +func RegisterHTTPDNSRuleServiceServer(s grpc.ServiceRegistrar, srv HTTPDNSRuleServiceServer) { + // If the following call pancis, it indicates UnimplementedHTTPDNSRuleServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&HTTPDNSRuleService_ServiceDesc, srv) +} + +func _HTTPDNSRuleService_CreateHTTPDNSCustomRule_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateHTTPDNSCustomRuleRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSRuleServiceServer).CreateHTTPDNSCustomRule(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSRuleService_CreateHTTPDNSCustomRule_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSRuleServiceServer).CreateHTTPDNSCustomRule(ctx, req.(*CreateHTTPDNSCustomRuleRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSRuleService_UpdateHTTPDNSCustomRule_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateHTTPDNSCustomRuleRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSRuleServiceServer).UpdateHTTPDNSCustomRule(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSRuleService_UpdateHTTPDNSCustomRule_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSRuleServiceServer).UpdateHTTPDNSCustomRule(ctx, req.(*UpdateHTTPDNSCustomRuleRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSRuleService_DeleteHTTPDNSCustomRule_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteHTTPDNSCustomRuleRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSRuleServiceServer).DeleteHTTPDNSCustomRule(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSRuleService_DeleteHTTPDNSCustomRule_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSRuleServiceServer).DeleteHTTPDNSCustomRule(ctx, req.(*DeleteHTTPDNSCustomRuleRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSRuleService_UpdateHTTPDNSCustomRuleStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateHTTPDNSCustomRuleStatusRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSRuleServiceServer).UpdateHTTPDNSCustomRuleStatus(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSRuleService_UpdateHTTPDNSCustomRuleStatus_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSRuleServiceServer).UpdateHTTPDNSCustomRuleStatus(ctx, req.(*UpdateHTTPDNSCustomRuleStatusRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSRuleService_ListHTTPDNSCustomRulesWithDomainId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListHTTPDNSCustomRulesWithDomainIdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSRuleServiceServer).ListHTTPDNSCustomRulesWithDomainId(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSRuleService_ListHTTPDNSCustomRulesWithDomainId_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSRuleServiceServer).ListHTTPDNSCustomRulesWithDomainId(ctx, req.(*ListHTTPDNSCustomRulesWithDomainIdRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// HTTPDNSRuleService_ServiceDesc is the grpc.ServiceDesc for HTTPDNSRuleService service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var HTTPDNSRuleService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "pb.HTTPDNSRuleService", + HandlerType: (*HTTPDNSRuleServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "createHTTPDNSCustomRule", + Handler: _HTTPDNSRuleService_CreateHTTPDNSCustomRule_Handler, + }, + { + MethodName: "updateHTTPDNSCustomRule", + Handler: _HTTPDNSRuleService_UpdateHTTPDNSCustomRule_Handler, + }, + { + MethodName: "deleteHTTPDNSCustomRule", + Handler: _HTTPDNSRuleService_DeleteHTTPDNSCustomRule_Handler, + }, + { + MethodName: "updateHTTPDNSCustomRuleStatus", + Handler: _HTTPDNSRuleService_UpdateHTTPDNSCustomRuleStatus_Handler, + }, + { + MethodName: "listHTTPDNSCustomRulesWithDomainId", + Handler: _HTTPDNSRuleService_ListHTTPDNSCustomRulesWithDomainId_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "service_httpdns_rule.proto", +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_runtime_log.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_runtime_log.pb.go new file mode 100644 index 0000000..745b604 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_runtime_log.pb.go @@ -0,0 +1,359 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc v3.21.12 +// source: service_httpdns_runtime_log.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type CreateHTTPDNSRuntimeLogsRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Logs []*HTTPDNSRuntimeLog `protobuf:"bytes,1,rep,name=logs,proto3" json:"logs,omitempty"` +} + +func (x *CreateHTTPDNSRuntimeLogsRequest) Reset() { + *x = CreateHTTPDNSRuntimeLogsRequest{} + mi := &file_service_httpdns_runtime_log_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSRuntimeLogsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSRuntimeLogsRequest) ProtoMessage() {} + +func (x *CreateHTTPDNSRuntimeLogsRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_runtime_log_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSRuntimeLogsRequest.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSRuntimeLogsRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_runtime_log_proto_rawDescGZIP(), []int{0} +} + +func (x *CreateHTTPDNSRuntimeLogsRequest) GetLogs() []*HTTPDNSRuntimeLog { + if x != nil { + return x.Logs + } + return nil +} + +type CreateHTTPDNSRuntimeLogsResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *CreateHTTPDNSRuntimeLogsResponse) Reset() { + *x = CreateHTTPDNSRuntimeLogsResponse{} + mi := &file_service_httpdns_runtime_log_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateHTTPDNSRuntimeLogsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateHTTPDNSRuntimeLogsResponse) ProtoMessage() {} + +func (x *CreateHTTPDNSRuntimeLogsResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_runtime_log_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateHTTPDNSRuntimeLogsResponse.ProtoReflect.Descriptor instead. +func (*CreateHTTPDNSRuntimeLogsResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_runtime_log_proto_rawDescGZIP(), []int{1} +} + +type ListHTTPDNSRuntimeLogsRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Day string `protobuf:"bytes,1,opt,name=day,proto3" json:"day,omitempty"` + ClusterId int64 `protobuf:"varint,2,opt,name=clusterId,proto3" json:"clusterId,omitempty"` + NodeId int64 `protobuf:"varint,3,opt,name=nodeId,proto3" json:"nodeId,omitempty"` + Level string `protobuf:"bytes,4,opt,name=level,proto3" json:"level,omitempty"` + Keyword string `protobuf:"bytes,5,opt,name=keyword,proto3" json:"keyword,omitempty"` + Offset int64 `protobuf:"varint,6,opt,name=offset,proto3" json:"offset,omitempty"` + Size int64 `protobuf:"varint,7,opt,name=size,proto3" json:"size,omitempty"` +} + +func (x *ListHTTPDNSRuntimeLogsRequest) Reset() { + *x = ListHTTPDNSRuntimeLogsRequest{} + mi := &file_service_httpdns_runtime_log_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSRuntimeLogsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSRuntimeLogsRequest) ProtoMessage() {} + +func (x *ListHTTPDNSRuntimeLogsRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_runtime_log_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSRuntimeLogsRequest.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSRuntimeLogsRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_runtime_log_proto_rawDescGZIP(), []int{2} +} + +func (x *ListHTTPDNSRuntimeLogsRequest) GetDay() string { + if x != nil { + return x.Day + } + return "" +} + +func (x *ListHTTPDNSRuntimeLogsRequest) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +func (x *ListHTTPDNSRuntimeLogsRequest) GetNodeId() int64 { + if x != nil { + return x.NodeId + } + return 0 +} + +func (x *ListHTTPDNSRuntimeLogsRequest) GetLevel() string { + if x != nil { + return x.Level + } + return "" +} + +func (x *ListHTTPDNSRuntimeLogsRequest) GetKeyword() string { + if x != nil { + return x.Keyword + } + return "" +} + +func (x *ListHTTPDNSRuntimeLogsRequest) GetOffset() int64 { + if x != nil { + return x.Offset + } + return 0 +} + +func (x *ListHTTPDNSRuntimeLogsRequest) GetSize() int64 { + if x != nil { + return x.Size + } + return 0 +} + +type ListHTTPDNSRuntimeLogsResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Logs []*HTTPDNSRuntimeLog `protobuf:"bytes,1,rep,name=logs,proto3" json:"logs,omitempty"` + Total int64 `protobuf:"varint,2,opt,name=total,proto3" json:"total,omitempty"` +} + +func (x *ListHTTPDNSRuntimeLogsResponse) Reset() { + *x = ListHTTPDNSRuntimeLogsResponse{} + mi := &file_service_httpdns_runtime_log_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListHTTPDNSRuntimeLogsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListHTTPDNSRuntimeLogsResponse) ProtoMessage() {} + +func (x *ListHTTPDNSRuntimeLogsResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_runtime_log_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListHTTPDNSRuntimeLogsResponse.ProtoReflect.Descriptor instead. +func (*ListHTTPDNSRuntimeLogsResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_runtime_log_proto_rawDescGZIP(), []int{3} +} + +func (x *ListHTTPDNSRuntimeLogsResponse) GetLogs() []*HTTPDNSRuntimeLog { + if x != nil { + return x.Logs + } + return nil +} + +func (x *ListHTTPDNSRuntimeLogsResponse) GetTotal() int64 { + if x != nil { + return x.Total + } + return 0 +} + +var File_service_httpdns_runtime_log_proto protoreflect.FileDescriptor + +var file_service_httpdns_runtime_log_proto_rawDesc = []byte{ + 0x0a, 0x21, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x64, 0x6e, + 0x73, 0x5f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6c, 0x6f, 0x67, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x26, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x75, + 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6c, 0x6f, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, + 0x4c, 0x0a, 0x1f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, + 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x29, 0x0a, 0x04, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x75, 0x6e, + 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x52, 0x04, 0x6c, 0x6f, 0x67, 0x73, 0x22, 0x22, 0x0a, + 0x20, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x75, + 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0xc3, 0x01, 0x0a, 0x1d, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, + 0x53, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, + 0x65, 0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, + 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, + 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, + 0x73, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x61, 0x0a, 0x1e, 0x4c, 0x69, 0x73, 0x74, 0x48, + 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x67, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x29, 0x0a, 0x04, 0x6c, 0x6f, 0x67, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x54, 0x54, + 0x50, 0x44, 0x4e, 0x53, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x52, 0x04, + 0x6c, 0x6f, 0x67, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x32, 0xe2, 0x01, 0x0a, 0x18, 0x48, + 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x67, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x65, 0x0a, 0x18, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, + 0x6f, 0x67, 0x73, 0x12, 0x23, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, + 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x67, + 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x75, 0x6e, 0x74, 0x69, + 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5f, + 0x0a, 0x16, 0x6c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x75, 0x6e, + 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x21, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x69, + 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, + 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x70, 0x62, + 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x75, 0x6e, 0x74, + 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_service_httpdns_runtime_log_proto_rawDescOnce sync.Once + file_service_httpdns_runtime_log_proto_rawDescData = file_service_httpdns_runtime_log_proto_rawDesc +) + +func file_service_httpdns_runtime_log_proto_rawDescGZIP() []byte { + file_service_httpdns_runtime_log_proto_rawDescOnce.Do(func() { + file_service_httpdns_runtime_log_proto_rawDescData = protoimpl.X.CompressGZIP(file_service_httpdns_runtime_log_proto_rawDescData) + }) + return file_service_httpdns_runtime_log_proto_rawDescData +} + +var file_service_httpdns_runtime_log_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_service_httpdns_runtime_log_proto_goTypes = []any{ + (*CreateHTTPDNSRuntimeLogsRequest)(nil), // 0: pb.CreateHTTPDNSRuntimeLogsRequest + (*CreateHTTPDNSRuntimeLogsResponse)(nil), // 1: pb.CreateHTTPDNSRuntimeLogsResponse + (*ListHTTPDNSRuntimeLogsRequest)(nil), // 2: pb.ListHTTPDNSRuntimeLogsRequest + (*ListHTTPDNSRuntimeLogsResponse)(nil), // 3: pb.ListHTTPDNSRuntimeLogsResponse + (*HTTPDNSRuntimeLog)(nil), // 4: pb.HTTPDNSRuntimeLog +} +var file_service_httpdns_runtime_log_proto_depIdxs = []int32{ + 4, // 0: pb.CreateHTTPDNSRuntimeLogsRequest.logs:type_name -> pb.HTTPDNSRuntimeLog + 4, // 1: pb.ListHTTPDNSRuntimeLogsResponse.logs:type_name -> pb.HTTPDNSRuntimeLog + 0, // 2: pb.HTTPDNSRuntimeLogService.createHTTPDNSRuntimeLogs:input_type -> pb.CreateHTTPDNSRuntimeLogsRequest + 2, // 3: pb.HTTPDNSRuntimeLogService.listHTTPDNSRuntimeLogs:input_type -> pb.ListHTTPDNSRuntimeLogsRequest + 1, // 4: pb.HTTPDNSRuntimeLogService.createHTTPDNSRuntimeLogs:output_type -> pb.CreateHTTPDNSRuntimeLogsResponse + 3, // 5: pb.HTTPDNSRuntimeLogService.listHTTPDNSRuntimeLogs:output_type -> pb.ListHTTPDNSRuntimeLogsResponse + 4, // [4:6] is the sub-list for method output_type + 2, // [2:4] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name +} + +func init() { file_service_httpdns_runtime_log_proto_init() } +func file_service_httpdns_runtime_log_proto_init() { + if File_service_httpdns_runtime_log_proto != nil { + return + } + file_models_model_httpdns_runtime_log_proto_init() + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_service_httpdns_runtime_log_proto_rawDesc, + NumEnums: 0, + NumMessages: 4, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_service_httpdns_runtime_log_proto_goTypes, + DependencyIndexes: file_service_httpdns_runtime_log_proto_depIdxs, + MessageInfos: file_service_httpdns_runtime_log_proto_msgTypes, + }.Build() + File_service_httpdns_runtime_log_proto = out.File + file_service_httpdns_runtime_log_proto_rawDesc = nil + file_service_httpdns_runtime_log_proto_goTypes = nil + file_service_httpdns_runtime_log_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_runtime_log_grpc.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_runtime_log_grpc.pb.go new file mode 100644 index 0000000..ad2e296 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_runtime_log_grpc.pb.go @@ -0,0 +1,157 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.5.1 +// - protoc v3.21.12 +// source: service_httpdns_runtime_log.proto + +package pb + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + HTTPDNSRuntimeLogService_CreateHTTPDNSRuntimeLogs_FullMethodName = "/pb.HTTPDNSRuntimeLogService/createHTTPDNSRuntimeLogs" + HTTPDNSRuntimeLogService_ListHTTPDNSRuntimeLogs_FullMethodName = "/pb.HTTPDNSRuntimeLogService/listHTTPDNSRuntimeLogs" +) + +// HTTPDNSRuntimeLogServiceClient is the client API for HTTPDNSRuntimeLogService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type HTTPDNSRuntimeLogServiceClient interface { + CreateHTTPDNSRuntimeLogs(ctx context.Context, in *CreateHTTPDNSRuntimeLogsRequest, opts ...grpc.CallOption) (*CreateHTTPDNSRuntimeLogsResponse, error) + ListHTTPDNSRuntimeLogs(ctx context.Context, in *ListHTTPDNSRuntimeLogsRequest, opts ...grpc.CallOption) (*ListHTTPDNSRuntimeLogsResponse, error) +} + +type hTTPDNSRuntimeLogServiceClient struct { + cc grpc.ClientConnInterface +} + +func NewHTTPDNSRuntimeLogServiceClient(cc grpc.ClientConnInterface) HTTPDNSRuntimeLogServiceClient { + return &hTTPDNSRuntimeLogServiceClient{cc} +} + +func (c *hTTPDNSRuntimeLogServiceClient) CreateHTTPDNSRuntimeLogs(ctx context.Context, in *CreateHTTPDNSRuntimeLogsRequest, opts ...grpc.CallOption) (*CreateHTTPDNSRuntimeLogsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(CreateHTTPDNSRuntimeLogsResponse) + err := c.cc.Invoke(ctx, HTTPDNSRuntimeLogService_CreateHTTPDNSRuntimeLogs_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *hTTPDNSRuntimeLogServiceClient) ListHTTPDNSRuntimeLogs(ctx context.Context, in *ListHTTPDNSRuntimeLogsRequest, opts ...grpc.CallOption) (*ListHTTPDNSRuntimeLogsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ListHTTPDNSRuntimeLogsResponse) + err := c.cc.Invoke(ctx, HTTPDNSRuntimeLogService_ListHTTPDNSRuntimeLogs_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +// HTTPDNSRuntimeLogServiceServer is the server API for HTTPDNSRuntimeLogService service. +// All implementations should embed UnimplementedHTTPDNSRuntimeLogServiceServer +// for forward compatibility. +type HTTPDNSRuntimeLogServiceServer interface { + CreateHTTPDNSRuntimeLogs(context.Context, *CreateHTTPDNSRuntimeLogsRequest) (*CreateHTTPDNSRuntimeLogsResponse, error) + ListHTTPDNSRuntimeLogs(context.Context, *ListHTTPDNSRuntimeLogsRequest) (*ListHTTPDNSRuntimeLogsResponse, error) +} + +// UnimplementedHTTPDNSRuntimeLogServiceServer should be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedHTTPDNSRuntimeLogServiceServer struct{} + +func (UnimplementedHTTPDNSRuntimeLogServiceServer) CreateHTTPDNSRuntimeLogs(context.Context, *CreateHTTPDNSRuntimeLogsRequest) (*CreateHTTPDNSRuntimeLogsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateHTTPDNSRuntimeLogs not implemented") +} +func (UnimplementedHTTPDNSRuntimeLogServiceServer) ListHTTPDNSRuntimeLogs(context.Context, *ListHTTPDNSRuntimeLogsRequest) (*ListHTTPDNSRuntimeLogsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListHTTPDNSRuntimeLogs not implemented") +} +func (UnimplementedHTTPDNSRuntimeLogServiceServer) testEmbeddedByValue() {} + +// UnsafeHTTPDNSRuntimeLogServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to HTTPDNSRuntimeLogServiceServer will +// result in compilation errors. +type UnsafeHTTPDNSRuntimeLogServiceServer interface { + mustEmbedUnimplementedHTTPDNSRuntimeLogServiceServer() +} + +func RegisterHTTPDNSRuntimeLogServiceServer(s grpc.ServiceRegistrar, srv HTTPDNSRuntimeLogServiceServer) { + // If the following call pancis, it indicates UnimplementedHTTPDNSRuntimeLogServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&HTTPDNSRuntimeLogService_ServiceDesc, srv) +} + +func _HTTPDNSRuntimeLogService_CreateHTTPDNSRuntimeLogs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateHTTPDNSRuntimeLogsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSRuntimeLogServiceServer).CreateHTTPDNSRuntimeLogs(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSRuntimeLogService_CreateHTTPDNSRuntimeLogs_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSRuntimeLogServiceServer).CreateHTTPDNSRuntimeLogs(ctx, req.(*CreateHTTPDNSRuntimeLogsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _HTTPDNSRuntimeLogService_ListHTTPDNSRuntimeLogs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListHTTPDNSRuntimeLogsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSRuntimeLogServiceServer).ListHTTPDNSRuntimeLogs(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSRuntimeLogService_ListHTTPDNSRuntimeLogs_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSRuntimeLogServiceServer).ListHTTPDNSRuntimeLogs(ctx, req.(*ListHTTPDNSRuntimeLogsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// HTTPDNSRuntimeLogService_ServiceDesc is the grpc.ServiceDesc for HTTPDNSRuntimeLogService service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var HTTPDNSRuntimeLogService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "pb.HTTPDNSRuntimeLogService", + HandlerType: (*HTTPDNSRuntimeLogServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "createHTTPDNSRuntimeLogs", + Handler: _HTTPDNSRuntimeLogService_CreateHTTPDNSRuntimeLogs_Handler, + }, + { + MethodName: "listHTTPDNSRuntimeLogs", + Handler: _HTTPDNSRuntimeLogService_ListHTTPDNSRuntimeLogs_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "service_httpdns_runtime_log.proto", +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_sandbox.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_sandbox.pb.go new file mode 100644 index 0000000..6b4be37 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_sandbox.pb.go @@ -0,0 +1,460 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.35.1 +// protoc v3.21.12 +// source: service_httpdns_sandbox.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type TestHTTPDNSResolveRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ClusterId int64 `protobuf:"varint,1,opt,name=clusterId,proto3" json:"clusterId,omitempty"` + AppId string `protobuf:"bytes,2,opt,name=appId,proto3" json:"appId,omitempty"` + Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` + Qtype string `protobuf:"bytes,4,opt,name=qtype,proto3" json:"qtype,omitempty"` + ClientIP string `protobuf:"bytes,5,opt,name=clientIP,proto3" json:"clientIP,omitempty"` + Sid string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid,omitempty"` + SdkVersion string `protobuf:"bytes,7,opt,name=sdkVersion,proto3" json:"sdkVersion,omitempty"` + Os string `protobuf:"bytes,8,opt,name=os,proto3" json:"os,omitempty"` +} + +func (x *TestHTTPDNSResolveRequest) Reset() { + *x = TestHTTPDNSResolveRequest{} + mi := &file_service_httpdns_sandbox_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *TestHTTPDNSResolveRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TestHTTPDNSResolveRequest) ProtoMessage() {} + +func (x *TestHTTPDNSResolveRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_sandbox_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TestHTTPDNSResolveRequest.ProtoReflect.Descriptor instead. +func (*TestHTTPDNSResolveRequest) Descriptor() ([]byte, []int) { + return file_service_httpdns_sandbox_proto_rawDescGZIP(), []int{0} +} + +func (x *TestHTTPDNSResolveRequest) GetClusterId() int64 { + if x != nil { + return x.ClusterId + } + return 0 +} + +func (x *TestHTTPDNSResolveRequest) GetAppId() string { + if x != nil { + return x.AppId + } + return "" +} + +func (x *TestHTTPDNSResolveRequest) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *TestHTTPDNSResolveRequest) GetQtype() string { + if x != nil { + return x.Qtype + } + return "" +} + +func (x *TestHTTPDNSResolveRequest) GetClientIP() string { + if x != nil { + return x.ClientIP + } + return "" +} + +func (x *TestHTTPDNSResolveRequest) GetSid() string { + if x != nil { + return x.Sid + } + return "" +} + +func (x *TestHTTPDNSResolveRequest) GetSdkVersion() string { + if x != nil { + return x.SdkVersion + } + return "" +} + +func (x *TestHTTPDNSResolveRequest) GetOs() string { + if x != nil { + return x.Os + } + return "" +} + +type HTTPDNSResolveRecord struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` + Ip string `protobuf:"bytes,2,opt,name=ip,proto3" json:"ip,omitempty"` + Ttl int32 `protobuf:"varint,3,opt,name=ttl,proto3" json:"ttl,omitempty"` + Weight int32 `protobuf:"varint,4,opt,name=weight,proto3" json:"weight,omitempty"` + Line string `protobuf:"bytes,5,opt,name=line,proto3" json:"line,omitempty"` + Region string `protobuf:"bytes,6,opt,name=region,proto3" json:"region,omitempty"` +} + +func (x *HTTPDNSResolveRecord) Reset() { + *x = HTTPDNSResolveRecord{} + mi := &file_service_httpdns_sandbox_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *HTTPDNSResolveRecord) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HTTPDNSResolveRecord) ProtoMessage() {} + +func (x *HTTPDNSResolveRecord) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_sandbox_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use HTTPDNSResolveRecord.ProtoReflect.Descriptor instead. +func (*HTTPDNSResolveRecord) Descriptor() ([]byte, []int) { + return file_service_httpdns_sandbox_proto_rawDescGZIP(), []int{1} +} + +func (x *HTTPDNSResolveRecord) GetType() string { + if x != nil { + return x.Type + } + return "" +} + +func (x *HTTPDNSResolveRecord) GetIp() string { + if x != nil { + return x.Ip + } + return "" +} + +func (x *HTTPDNSResolveRecord) GetTtl() int32 { + if x != nil { + return x.Ttl + } + return 0 +} + +func (x *HTTPDNSResolveRecord) GetWeight() int32 { + if x != nil { + return x.Weight + } + return 0 +} + +func (x *HTTPDNSResolveRecord) GetLine() string { + if x != nil { + return x.Line + } + return "" +} + +func (x *HTTPDNSResolveRecord) GetRegion() string { + if x != nil { + return x.Region + } + return "" +} + +type TestHTTPDNSResolveResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Code string `protobuf:"bytes,1,opt,name=code,proto3" json:"code,omitempty"` + Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + RequestId string `protobuf:"bytes,3,opt,name=requestId,proto3" json:"requestId,omitempty"` + Domain string `protobuf:"bytes,4,opt,name=domain,proto3" json:"domain,omitempty"` + Qtype string `protobuf:"bytes,5,opt,name=qtype,proto3" json:"qtype,omitempty"` + Ttl int32 `protobuf:"varint,6,opt,name=ttl,proto3" json:"ttl,omitempty"` + Records []*HTTPDNSResolveRecord `protobuf:"bytes,7,rep,name=records,proto3" json:"records,omitempty"` + ClientIP string `protobuf:"bytes,8,opt,name=clientIP,proto3" json:"clientIP,omitempty"` + ClientRegion string `protobuf:"bytes,9,opt,name=clientRegion,proto3" json:"clientRegion,omitempty"` + ClientCarrier string `protobuf:"bytes,10,opt,name=clientCarrier,proto3" json:"clientCarrier,omitempty"` + ClientCountry string `protobuf:"bytes,11,opt,name=clientCountry,proto3" json:"clientCountry,omitempty"` + Summary string `protobuf:"bytes,12,opt,name=summary,proto3" json:"summary,omitempty"` +} + +func (x *TestHTTPDNSResolveResponse) Reset() { + *x = TestHTTPDNSResolveResponse{} + mi := &file_service_httpdns_sandbox_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *TestHTTPDNSResolveResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TestHTTPDNSResolveResponse) ProtoMessage() {} + +func (x *TestHTTPDNSResolveResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_httpdns_sandbox_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TestHTTPDNSResolveResponse.ProtoReflect.Descriptor instead. +func (*TestHTTPDNSResolveResponse) Descriptor() ([]byte, []int) { + return file_service_httpdns_sandbox_proto_rawDescGZIP(), []int{2} +} + +func (x *TestHTTPDNSResolveResponse) GetCode() string { + if x != nil { + return x.Code + } + return "" +} + +func (x *TestHTTPDNSResolveResponse) GetMessage() string { + if x != nil { + return x.Message + } + return "" +} + +func (x *TestHTTPDNSResolveResponse) GetRequestId() string { + if x != nil { + return x.RequestId + } + return "" +} + +func (x *TestHTTPDNSResolveResponse) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *TestHTTPDNSResolveResponse) GetQtype() string { + if x != nil { + return x.Qtype + } + return "" +} + +func (x *TestHTTPDNSResolveResponse) GetTtl() int32 { + if x != nil { + return x.Ttl + } + return 0 +} + +func (x *TestHTTPDNSResolveResponse) GetRecords() []*HTTPDNSResolveRecord { + if x != nil { + return x.Records + } + return nil +} + +func (x *TestHTTPDNSResolveResponse) GetClientIP() string { + if x != nil { + return x.ClientIP + } + return "" +} + +func (x *TestHTTPDNSResolveResponse) GetClientRegion() string { + if x != nil { + return x.ClientRegion + } + return "" +} + +func (x *TestHTTPDNSResolveResponse) GetClientCarrier() string { + if x != nil { + return x.ClientCarrier + } + return "" +} + +func (x *TestHTTPDNSResolveResponse) GetClientCountry() string { + if x != nil { + return x.ClientCountry + } + return "" +} + +func (x *TestHTTPDNSResolveResponse) GetSummary() string { + if x != nil { + return x.Summary + } + return "" +} + +var File_service_httpdns_sandbox_proto protoreflect.FileDescriptor + +var file_service_httpdns_sandbox_proto_rawDesc = []byte{ + 0x0a, 0x1d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x64, 0x6e, + 0x73, 0x5f, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, + 0x02, 0x70, 0x62, 0x1a, 0x19, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x72, 0x70, 0x63, 0x5f, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdb, + 0x01, 0x0a, 0x19, 0x54, 0x65, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x65, + 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, + 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, + 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x71, 0x74, 0x79, 0x70, + 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x71, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, + 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x50, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x50, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, + 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, + 0x73, 0x64, 0x6b, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0a, 0x73, 0x64, 0x6b, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, + 0x6f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x6f, 0x73, 0x22, 0x90, 0x01, 0x0a, + 0x14, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74, 0x6c, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x77, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x77, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, + 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x22, + 0x82, 0x03, 0x0a, 0x1a, 0x54, 0x65, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, + 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, + 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, + 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1c, 0x0a, 0x09, + 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x71, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x71, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74, 0x6c, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x32, 0x0a, 0x07, 0x72, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x62, + 0x2e, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x12, 0x1a, + 0x0a, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x50, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6c, + 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0c, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x24, + 0x0a, 0x0d, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x61, 0x72, 0x72, 0x69, 0x65, 0x72, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x61, 0x72, + 0x72, 0x69, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6c, 0x69, + 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, + 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x6d, + 0x6d, 0x61, 0x72, 0x79, 0x32, 0x6c, 0x0a, 0x15, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x53, + 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x53, 0x0a, + 0x12, 0x74, 0x65, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, 0x44, 0x4e, 0x53, 0x52, 0x65, 0x73, 0x6f, + 0x6c, 0x76, 0x65, 0x12, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x48, 0x54, 0x54, + 0x50, 0x44, 0x4e, 0x53, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x48, 0x54, 0x54, 0x50, + 0x44, 0x4e, 0x53, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, +} + +var ( + file_service_httpdns_sandbox_proto_rawDescOnce sync.Once + file_service_httpdns_sandbox_proto_rawDescData = file_service_httpdns_sandbox_proto_rawDesc +) + +func file_service_httpdns_sandbox_proto_rawDescGZIP() []byte { + file_service_httpdns_sandbox_proto_rawDescOnce.Do(func() { + file_service_httpdns_sandbox_proto_rawDescData = protoimpl.X.CompressGZIP(file_service_httpdns_sandbox_proto_rawDescData) + }) + return file_service_httpdns_sandbox_proto_rawDescData +} + +var file_service_httpdns_sandbox_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_service_httpdns_sandbox_proto_goTypes = []any{ + (*TestHTTPDNSResolveRequest)(nil), // 0: pb.TestHTTPDNSResolveRequest + (*HTTPDNSResolveRecord)(nil), // 1: pb.HTTPDNSResolveRecord + (*TestHTTPDNSResolveResponse)(nil), // 2: pb.TestHTTPDNSResolveResponse +} +var file_service_httpdns_sandbox_proto_depIdxs = []int32{ + 1, // 0: pb.TestHTTPDNSResolveResponse.records:type_name -> pb.HTTPDNSResolveRecord + 0, // 1: pb.HTTPDNSSandboxService.testHTTPDNSResolve:input_type -> pb.TestHTTPDNSResolveRequest + 2, // 2: pb.HTTPDNSSandboxService.testHTTPDNSResolve:output_type -> pb.TestHTTPDNSResolveResponse + 2, // [2:3] is the sub-list for method output_type + 1, // [1:2] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_service_httpdns_sandbox_proto_init() } +func file_service_httpdns_sandbox_proto_init() { + if File_service_httpdns_sandbox_proto != nil { + return + } + file_models_rpc_messages_proto_init() + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_service_httpdns_sandbox_proto_rawDesc, + NumEnums: 0, + NumMessages: 3, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_service_httpdns_sandbox_proto_goTypes, + DependencyIndexes: file_service_httpdns_sandbox_proto_depIdxs, + MessageInfos: file_service_httpdns_sandbox_proto_msgTypes, + }.Build() + File_service_httpdns_sandbox_proto = out.File + file_service_httpdns_sandbox_proto_rawDesc = nil + file_service_httpdns_sandbox_proto_goTypes = nil + file_service_httpdns_sandbox_proto_depIdxs = nil +} diff --git a/EdgeCommon/pkg/rpc/pb/service_httpdns_sandbox_grpc.pb.go b/EdgeCommon/pkg/rpc/pb/service_httpdns_sandbox_grpc.pb.go new file mode 100644 index 0000000..e7b9daa --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_httpdns_sandbox_grpc.pb.go @@ -0,0 +1,119 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.5.1 +// - protoc v3.21.12 +// source: service_httpdns_sandbox.proto + +package pb + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + HTTPDNSSandboxService_TestHTTPDNSResolve_FullMethodName = "/pb.HTTPDNSSandboxService/testHTTPDNSResolve" +) + +// HTTPDNSSandboxServiceClient is the client API for HTTPDNSSandboxService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type HTTPDNSSandboxServiceClient interface { + TestHTTPDNSResolve(ctx context.Context, in *TestHTTPDNSResolveRequest, opts ...grpc.CallOption) (*TestHTTPDNSResolveResponse, error) +} + +type hTTPDNSSandboxServiceClient struct { + cc grpc.ClientConnInterface +} + +func NewHTTPDNSSandboxServiceClient(cc grpc.ClientConnInterface) HTTPDNSSandboxServiceClient { + return &hTTPDNSSandboxServiceClient{cc} +} + +func (c *hTTPDNSSandboxServiceClient) TestHTTPDNSResolve(ctx context.Context, in *TestHTTPDNSResolveRequest, opts ...grpc.CallOption) (*TestHTTPDNSResolveResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(TestHTTPDNSResolveResponse) + err := c.cc.Invoke(ctx, HTTPDNSSandboxService_TestHTTPDNSResolve_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +// HTTPDNSSandboxServiceServer is the server API for HTTPDNSSandboxService service. +// All implementations should embed UnimplementedHTTPDNSSandboxServiceServer +// for forward compatibility. +type HTTPDNSSandboxServiceServer interface { + TestHTTPDNSResolve(context.Context, *TestHTTPDNSResolveRequest) (*TestHTTPDNSResolveResponse, error) +} + +// UnimplementedHTTPDNSSandboxServiceServer should be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedHTTPDNSSandboxServiceServer struct{} + +func (UnimplementedHTTPDNSSandboxServiceServer) TestHTTPDNSResolve(context.Context, *TestHTTPDNSResolveRequest) (*TestHTTPDNSResolveResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method TestHTTPDNSResolve not implemented") +} +func (UnimplementedHTTPDNSSandboxServiceServer) testEmbeddedByValue() {} + +// UnsafeHTTPDNSSandboxServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to HTTPDNSSandboxServiceServer will +// result in compilation errors. +type UnsafeHTTPDNSSandboxServiceServer interface { + mustEmbedUnimplementedHTTPDNSSandboxServiceServer() +} + +func RegisterHTTPDNSSandboxServiceServer(s grpc.ServiceRegistrar, srv HTTPDNSSandboxServiceServer) { + // If the following call pancis, it indicates UnimplementedHTTPDNSSandboxServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&HTTPDNSSandboxService_ServiceDesc, srv) +} + +func _HTTPDNSSandboxService_TestHTTPDNSResolve_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(TestHTTPDNSResolveRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(HTTPDNSSandboxServiceServer).TestHTTPDNSResolve(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: HTTPDNSSandboxService_TestHTTPDNSResolve_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(HTTPDNSSandboxServiceServer).TestHTTPDNSResolve(ctx, req.(*TestHTTPDNSResolveRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// HTTPDNSSandboxService_ServiceDesc is the grpc.ServiceDesc for HTTPDNSSandboxService service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var HTTPDNSSandboxService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "pb.HTTPDNSSandboxService", + HandlerType: (*HTTPDNSSandboxServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "testHTTPDNSResolve", + Handler: _HTTPDNSSandboxService_TestHTTPDNSResolve_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "service_httpdns_sandbox.proto", +} diff --git a/EdgeCommon/pkg/rpc/pb/service_ns_node_grpc.pb.go b/EdgeCommon/pkg/rpc/pb/service_ns_node_grpc.pb.go index 97acd0d..faf19a1 100644 --- a/EdgeCommon/pkg/rpc/pb/service_ns_node_grpc.pb.go +++ b/EdgeCommon/pkg/rpc/pb/service_ns_node_grpc.pb.go @@ -46,6 +46,8 @@ const ( NSNodeService_UpdateNSNodeDDoSProtection_FullMethodName = "/pb.NSNodeService/updateNSNodeDDoSProtection" NSNodeService_FindNSNodeAPIConfig_FullMethodName = "/pb.NSNodeService/findNSNodeAPIConfig" NSNodeService_UpdateNSNodeAPIConfig_FullMethodName = "/pb.NSNodeService/updateNSNodeAPIConfig" + NSNodeService_FindAllUpgradeNSNodesWithNSClusterId_FullMethodName = "/pb.NSNodeService/findAllUpgradeNSNodesWithNSClusterId" + NSNodeService_UpgradeNSNode_FullMethodName = "/pb.NSNodeService/upgradeNSNode" ) // NSNodeServiceClient is the client API for NSNodeService service. @@ -108,6 +110,10 @@ type NSNodeServiceClient interface { FindNSNodeAPIConfig(ctx context.Context, in *FindNSNodeAPIConfigRequest, opts ...grpc.CallOption) (*FindNSNodeAPIConfigResponse, error) // 修改某个节点的API相关配置 UpdateNSNodeAPIConfig(ctx context.Context, in *UpdateNSNodeAPIConfigRequest, opts ...grpc.CallOption) (*RPCSuccess, error) + // 列出所有需要升级的NS节点 + FindAllUpgradeNSNodesWithNSClusterId(ctx context.Context, in *FindAllUpgradeNSNodesWithNSClusterIdRequest, opts ...grpc.CallOption) (*FindAllUpgradeNSNodesWithNSClusterIdResponse, error) + // 升级单个NS节点 + UpgradeNSNode(ctx context.Context, in *UpgradeNSNodeRequest, opts ...grpc.CallOption) (*RPCSuccess, error) } type nSNodeServiceClient struct { @@ -391,6 +397,26 @@ func (c *nSNodeServiceClient) UpdateNSNodeAPIConfig(ctx context.Context, in *Upd return out, nil } +func (c *nSNodeServiceClient) FindAllUpgradeNSNodesWithNSClusterId(ctx context.Context, in *FindAllUpgradeNSNodesWithNSClusterIdRequest, opts ...grpc.CallOption) (*FindAllUpgradeNSNodesWithNSClusterIdResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(FindAllUpgradeNSNodesWithNSClusterIdResponse) + err := c.cc.Invoke(ctx, NSNodeService_FindAllUpgradeNSNodesWithNSClusterId_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *nSNodeServiceClient) UpgradeNSNode(ctx context.Context, in *UpgradeNSNodeRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RPCSuccess) + err := c.cc.Invoke(ctx, NSNodeService_UpgradeNSNode_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + // NSNodeServiceServer is the server API for NSNodeService service. // All implementations should embed UnimplementedNSNodeServiceServer // for forward compatibility. @@ -451,6 +477,10 @@ type NSNodeServiceServer interface { FindNSNodeAPIConfig(context.Context, *FindNSNodeAPIConfigRequest) (*FindNSNodeAPIConfigResponse, error) // 修改某个节点的API相关配置 UpdateNSNodeAPIConfig(context.Context, *UpdateNSNodeAPIConfigRequest) (*RPCSuccess, error) + // 列出所有需要升级的NS节点 + FindAllUpgradeNSNodesWithNSClusterId(context.Context, *FindAllUpgradeNSNodesWithNSClusterIdRequest) (*FindAllUpgradeNSNodesWithNSClusterIdResponse, error) + // 升级单个NS节点 + UpgradeNSNode(context.Context, *UpgradeNSNodeRequest) (*RPCSuccess, error) } // UnimplementedNSNodeServiceServer should be embedded to have @@ -541,6 +571,12 @@ func (UnimplementedNSNodeServiceServer) FindNSNodeAPIConfig(context.Context, *Fi func (UnimplementedNSNodeServiceServer) UpdateNSNodeAPIConfig(context.Context, *UpdateNSNodeAPIConfigRequest) (*RPCSuccess, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateNSNodeAPIConfig not implemented") } +func (UnimplementedNSNodeServiceServer) FindAllUpgradeNSNodesWithNSClusterId(context.Context, *FindAllUpgradeNSNodesWithNSClusterIdRequest) (*FindAllUpgradeNSNodesWithNSClusterIdResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method FindAllUpgradeNSNodesWithNSClusterId not implemented") +} +func (UnimplementedNSNodeServiceServer) UpgradeNSNode(context.Context, *UpgradeNSNodeRequest) (*RPCSuccess, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpgradeNSNode not implemented") +} func (UnimplementedNSNodeServiceServer) testEmbeddedByValue() {} // UnsafeNSNodeServiceServer may be embedded to opt out of forward compatibility for this service. @@ -1036,6 +1072,42 @@ func _NSNodeService_UpdateNSNodeAPIConfig_Handler(srv interface{}, ctx context.C return interceptor(ctx, in, info, handler) } +func _NSNodeService_FindAllUpgradeNSNodesWithNSClusterId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindAllUpgradeNSNodesWithNSClusterIdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(NSNodeServiceServer).FindAllUpgradeNSNodesWithNSClusterId(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: NSNodeService_FindAllUpgradeNSNodesWithNSClusterId_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(NSNodeServiceServer).FindAllUpgradeNSNodesWithNSClusterId(ctx, req.(*FindAllUpgradeNSNodesWithNSClusterIdRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _NSNodeService_UpgradeNSNode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpgradeNSNodeRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(NSNodeServiceServer).UpgradeNSNode(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: NSNodeService_UpgradeNSNode_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(NSNodeServiceServer).UpgradeNSNode(ctx, req.(*UpgradeNSNodeRequest)) + } + return interceptor(ctx, in, info, handler) +} + // NSNodeService_ServiceDesc is the grpc.ServiceDesc for NSNodeService service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -1147,6 +1219,14 @@ var NSNodeService_ServiceDesc = grpc.ServiceDesc{ MethodName: "updateNSNodeAPIConfig", Handler: _NSNodeService_UpdateNSNodeAPIConfig_Handler, }, + { + MethodName: "findAllUpgradeNSNodesWithNSClusterId", + Handler: _NSNodeService_FindAllUpgradeNSNodesWithNSClusterId_Handler, + }, + { + MethodName: "upgradeNSNode", + Handler: _NSNodeService_UpgradeNSNode_Handler, + }, }, Streams: []grpc.StreamDesc{ { diff --git a/EdgeCommon/pkg/rpc/pb/service_ns_node_upgrade.go b/EdgeCommon/pkg/rpc/pb/service_ns_node_upgrade.go new file mode 100644 index 0000000..baf3f88 --- /dev/null +++ b/EdgeCommon/pkg/rpc/pb/service_ns_node_upgrade.go @@ -0,0 +1,274 @@ +package pb + +import ( + "fmt" + + "google.golang.org/protobuf/encoding/protowire" + "google.golang.org/protobuf/proto" +) + +// FindAllUpgradeNSNodesWithNSClusterIdRequest 列出所有需要升级的NS节点 +type FindAllUpgradeNSNodesWithNSClusterIdRequest struct { + NsClusterId int64 `protobuf:"varint,1,opt,name=nsClusterId,proto3" json:"nsClusterId,omitempty"` +} + +func (x *FindAllUpgradeNSNodesWithNSClusterIdRequest) Reset() { *x = FindAllUpgradeNSNodesWithNSClusterIdRequest{} } +func (x *FindAllUpgradeNSNodesWithNSClusterIdRequest) String() string { return fmt.Sprintf("%+v", *x) } +func (x *FindAllUpgradeNSNodesWithNSClusterIdRequest) ProtoMessage() {} + +func (x *FindAllUpgradeNSNodesWithNSClusterIdRequest) GetNsClusterId() int64 { + if x != nil { + return x.NsClusterId + } + return 0 +} + +func (x *FindAllUpgradeNSNodesWithNSClusterIdRequest) Marshal() ([]byte, error) { + var b []byte + if x.NsClusterId != 0 { + b = protowire.AppendTag(b, 1, protowire.VarintType) + b = protowire.AppendVarint(b, uint64(x.NsClusterId)) + } + return b, nil +} + +func (x *FindAllUpgradeNSNodesWithNSClusterIdRequest) Unmarshal(data []byte) error { + for len(data) > 0 { + num, typ, n := protowire.ConsumeTag(data) + if n < 0 { + return fmt.Errorf("invalid tag") + } + data = data[n:] + switch num { + case 1: + if typ == protowire.VarintType { + v, n := protowire.ConsumeVarint(data) + if n < 0 { + return fmt.Errorf("invalid varint") + } + x.NsClusterId = int64(v) + data = data[n:] + } + default: + n := protowire.ConsumeFieldValue(num, typ, data) + if n < 0 { + return fmt.Errorf("invalid field value") + } + data = data[n:] + } + } + return nil +} + +// FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade 单个待升级NS节点信息 +type FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade struct { + NsNode *NSNode `protobuf:"bytes,1,opt,name=nsNode,proto3" json:"nsNode,omitempty"` + Os string `protobuf:"bytes,2,opt,name=os,proto3" json:"os,omitempty"` + Arch string `protobuf:"bytes,3,opt,name=arch,proto3" json:"arch,omitempty"` + OldVersion string `protobuf:"bytes,4,opt,name=oldVersion,proto3" json:"oldVersion,omitempty"` + NewVersion string `protobuf:"bytes,5,opt,name=newVersion,proto3" json:"newVersion,omitempty"` +} + +func (x *FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade) Reset() { + *x = FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade{} +} +func (x *FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade) String() string { + return fmt.Sprintf("%+v", *x) +} +func (x *FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade) ProtoMessage() {} + +func (x *FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade) Marshal() ([]byte, error) { + var b []byte + if x.NsNode != nil { + nodeData, err := proto.Marshal(x.NsNode) + if err != nil { + return nil, err + } + b = protowire.AppendTag(b, 1, protowire.BytesType) + b = protowire.AppendBytes(b, nodeData) + } + if x.Os != "" { + b = protowire.AppendTag(b, 2, protowire.BytesType) + b = protowire.AppendString(b, x.Os) + } + if x.Arch != "" { + b = protowire.AppendTag(b, 3, protowire.BytesType) + b = protowire.AppendString(b, x.Arch) + } + if x.OldVersion != "" { + b = protowire.AppendTag(b, 4, protowire.BytesType) + b = protowire.AppendString(b, x.OldVersion) + } + if x.NewVersion != "" { + b = protowire.AppendTag(b, 5, protowire.BytesType) + b = protowire.AppendString(b, x.NewVersion) + } + return b, nil +} + +func (x *FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade) Unmarshal(data []byte) error { + for len(data) > 0 { + num, typ, n := protowire.ConsumeTag(data) + if n < 0 { + return fmt.Errorf("invalid tag") + } + data = data[n:] + switch num { + case 1: + if typ == protowire.BytesType { + v, n := protowire.ConsumeBytes(data) + if n < 0 { + return fmt.Errorf("invalid bytes") + } + x.NsNode = &NSNode{} + if err := proto.Unmarshal(v, x.NsNode); err != nil { + return err + } + data = data[n:] + } + case 2, 3, 4, 5: + if typ == protowire.BytesType { + v, n := protowire.ConsumeString(data) + if n < 0 { + return fmt.Errorf("invalid string") + } + switch num { + case 2: + x.Os = v + case 3: + x.Arch = v + case 4: + x.OldVersion = v + case 5: + x.NewVersion = v + } + data = data[n:] + } + default: + n := protowire.ConsumeFieldValue(num, typ, data) + if n < 0 { + return fmt.Errorf("invalid field value") + } + data = data[n:] + } + } + return nil +} + +// FindAllUpgradeNSNodesWithNSClusterIdResponse 列出所有需要升级的NS节点 +type FindAllUpgradeNSNodesWithNSClusterIdResponse struct { + Nodes []*FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"` +} + +func (x *FindAllUpgradeNSNodesWithNSClusterIdResponse) Reset() { + *x = FindAllUpgradeNSNodesWithNSClusterIdResponse{} +} +func (x *FindAllUpgradeNSNodesWithNSClusterIdResponse) String() string { + return fmt.Sprintf("%+v", *x) +} +func (x *FindAllUpgradeNSNodesWithNSClusterIdResponse) ProtoMessage() {} + +func (x *FindAllUpgradeNSNodesWithNSClusterIdResponse) GetNodes() []*FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade { + if x != nil { + return x.Nodes + } + return nil +} + +func (x *FindAllUpgradeNSNodesWithNSClusterIdResponse) Marshal() ([]byte, error) { + var b []byte + for _, node := range x.Nodes { + nodeData, err := node.Marshal() + if err != nil { + return nil, err + } + b = protowire.AppendTag(b, 1, protowire.BytesType) + b = protowire.AppendBytes(b, nodeData) + } + return b, nil +} + +func (x *FindAllUpgradeNSNodesWithNSClusterIdResponse) Unmarshal(data []byte) error { + for len(data) > 0 { + num, typ, n := protowire.ConsumeTag(data) + if n < 0 { + return fmt.Errorf("invalid tag") + } + data = data[n:] + switch num { + case 1: + if typ == protowire.BytesType { + v, n := protowire.ConsumeBytes(data) + if n < 0 { + return fmt.Errorf("invalid bytes") + } + node := &FindAllUpgradeNSNodesWithNSClusterIdResponse_NSNodeUpgrade{} + if err := node.Unmarshal(v); err != nil { + return err + } + x.Nodes = append(x.Nodes, node) + data = data[n:] + } + default: + n := protowire.ConsumeFieldValue(num, typ, data) + if n < 0 { + return fmt.Errorf("invalid field value") + } + data = data[n:] + } + } + return nil +} + +// UpgradeNSNodeRequest 升级单个NS节点 +type UpgradeNSNodeRequest struct { + NsNodeId int64 `protobuf:"varint,1,opt,name=nsNodeId,proto3" json:"nsNodeId,omitempty"` +} + +func (x *UpgradeNSNodeRequest) Reset() { *x = UpgradeNSNodeRequest{} } +func (x *UpgradeNSNodeRequest) String() string { return fmt.Sprintf("%+v", *x) } +func (x *UpgradeNSNodeRequest) ProtoMessage() {} + +func (x *UpgradeNSNodeRequest) GetNsNodeId() int64 { + if x != nil { + return x.NsNodeId + } + return 0 +} + +func (x *UpgradeNSNodeRequest) Marshal() ([]byte, error) { + var b []byte + if x.NsNodeId != 0 { + b = protowire.AppendTag(b, 1, protowire.VarintType) + b = protowire.AppendVarint(b, uint64(x.NsNodeId)) + } + return b, nil +} + +func (x *UpgradeNSNodeRequest) Unmarshal(data []byte) error { + for len(data) > 0 { + num, typ, n := protowire.ConsumeTag(data) + if n < 0 { + return fmt.Errorf("invalid tag") + } + data = data[n:] + switch num { + case 1: + if typ == protowire.VarintType { + v, n := protowire.ConsumeVarint(data) + if n < 0 { + return fmt.Errorf("invalid varint") + } + x.NsNodeId = int64(v) + data = data[n:] + } + default: + n := protowire.ConsumeFieldValue(num, typ, data) + if n < 0 { + return fmt.Errorf("invalid field value") + } + data = data[n:] + } + } + return nil +} diff --git a/EdgeCommon/pkg/rpc/pb/service_user.pb.go b/EdgeCommon/pkg/rpc/pb/service_user.pb.go index 865cd1c..5940c43 100644 --- a/EdgeCommon/pkg/rpc/pb/service_user.pb.go +++ b/EdgeCommon/pkg/rpc/pb/service_user.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.0 -// protoc v6.33.2 +// protoc-gen-go v1.36.11 +// protoc v3.21.12 // source: service_user.proto package pb @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -381,20 +382,21 @@ func (x *VerifyUserRequest) GetRejectReason() string { // 修改用户 type UpdateUserRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - UserId int64 `protobuf:"varint,1,opt,name=userId,proto3" json:"userId,omitempty"` - Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` - Password string `protobuf:"bytes,3,opt,name=password,proto3" json:"password,omitempty"` - Fullname string `protobuf:"bytes,4,opt,name=fullname,proto3" json:"fullname,omitempty"` - Mobile string `protobuf:"bytes,5,opt,name=mobile,proto3" json:"mobile,omitempty"` - Tel string `protobuf:"bytes,6,opt,name=tel,proto3" json:"tel,omitempty"` - Email string `protobuf:"bytes,7,opt,name=email,proto3" json:"email,omitempty"` - Remark string `protobuf:"bytes,8,opt,name=remark,proto3" json:"remark,omitempty"` - IsOn bool `protobuf:"varint,9,opt,name=isOn,proto3" json:"isOn,omitempty"` - NodeClusterId int64 `protobuf:"varint,10,opt,name=nodeClusterId,proto3" json:"nodeClusterId,omitempty"` - BandwidthAlgo string `protobuf:"bytes,11,opt,name=bandwidthAlgo,proto3" json:"bandwidthAlgo,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + UserId int64 `protobuf:"varint,1,opt,name=userId,proto3" json:"userId,omitempty"` + Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` + Password string `protobuf:"bytes,3,opt,name=password,proto3" json:"password,omitempty"` + Fullname string `protobuf:"bytes,4,opt,name=fullname,proto3" json:"fullname,omitempty"` + Mobile string `protobuf:"bytes,5,opt,name=mobile,proto3" json:"mobile,omitempty"` + Tel string `protobuf:"bytes,6,opt,name=tel,proto3" json:"tel,omitempty"` + Email string `protobuf:"bytes,7,opt,name=email,proto3" json:"email,omitempty"` + Remark string `protobuf:"bytes,8,opt,name=remark,proto3" json:"remark,omitempty"` + IsOn bool `protobuf:"varint,9,opt,name=isOn,proto3" json:"isOn,omitempty"` + NodeClusterId int64 `protobuf:"varint,10,opt,name=nodeClusterId,proto3" json:"nodeClusterId,omitempty"` + BandwidthAlgo string `protobuf:"bytes,11,opt,name=bandwidthAlgo,proto3" json:"bandwidthAlgo,omitempty"` + HttpdnsClusterIdsJSON []byte `protobuf:"bytes,12,opt,name=httpdnsClusterIdsJSON,proto3" json:"httpdnsClusterIdsJSON,omitempty"` // HTTPDNS关联集群ID列表 + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *UpdateUserRequest) Reset() { @@ -504,6 +506,13 @@ func (x *UpdateUserRequest) GetBandwidthAlgo() string { return "" } +func (x *UpdateUserRequest) GetHttpdnsClusterIdsJSON() []byte { + if x != nil { + return x.HttpdnsClusterIdsJSON + } + return nil +} + // 删除用户 type DeleteUserRequest struct { state protoimpl.MessageState `protogen:"open.v1"` @@ -2842,511 +2851,235 @@ func (x *ComposeUserGlobalBoardResponse_TrafficStat) GetBytes() int64 { var File_service_user_proto protoreflect.FileDescriptor -var file_service_user_proto_rawDesc = []byte{ - 0x0a, 0x12, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x19, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2f, 0x72, 0x70, 0x63, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, - 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e, 0x6f, 0x64, 0x65, - 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfd, 0x01, 0x0a, - 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, - 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x75, - 0x6c, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x75, - 0x6c, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x12, 0x10, - 0x0a, 0x03, 0x74, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x65, 0x6c, - 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x61, 0x72, 0x6b, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x12, 0x16, - 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, - 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x6e, - 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x12, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0xbf, 0x01, 0x0a, 0x13, 0x52, - 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, - 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x6f, - 0x62, 0x69, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x6f, 0x62, 0x69, - 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x75, 0x6c, 0x6c, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, - 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x02, 0x69, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x6a, 0x0a, 0x14, - 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x3a, 0x0a, 0x18, - 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x56, 0x65, 0x72, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x18, - 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x56, 0x65, 0x72, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x6f, 0x0a, 0x11, 0x56, 0x65, 0x72, 0x69, - 0x66, 0x79, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, - 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, - 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x52, 0x65, 0x6a, 0x65, 0x63, - 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x52, 0x65, 0x6a, - 0x65, 0x63, 0x74, 0x65, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x52, - 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x6a, - 0x65, 0x63, 0x74, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0xb7, 0x02, 0x0a, 0x11, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, - 0x1a, 0x0a, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6d, - 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x6f, 0x62, - 0x69, 0x6c, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x74, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x72, - 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x6d, - 0x61, 0x72, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x43, - 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, - 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x24, 0x0a, - 0x0d, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x41, 0x6c, 0x67, 0x6f, 0x18, 0x0b, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x41, - 0x6c, 0x67, 0x6f, 0x22, 0x2b, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, - 0x22, 0x85, 0x01, 0x0a, 0x1b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, - 0x62, 0x6c, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x18, 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x73, - 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0b, 0x69, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x69, 0x6e, 0x67, 0x12, 0x2a, 0x0a, 0x10, - 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x49, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x49, 0x73, - 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x22, 0xad, 0x01, 0x0a, 0x17, 0x4c, 0x69, 0x73, - 0x74, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x20, - 0x0a, 0x0b, 0x69, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x69, 0x6e, 0x67, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x69, 0x6e, 0x67, - 0x12, 0x2a, 0x0a, 0x10, 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x49, 0x73, 0x56, 0x65, 0x72, 0x69, - 0x66, 0x69, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x6d, 0x6f, 0x62, 0x69, - 0x6c, 0x65, 0x49, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, - 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, - 0x66, 0x73, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3a, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, - 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1e, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, - 0x73, 0x65, 0x72, 0x73, 0x22, 0x30, 0x0a, 0x16, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, - 0x6c, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, - 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, - 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x37, 0x0a, 0x17, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, - 0x61, 0x62, 0x6c, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x1c, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x08, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, - 0x4e, 0x0a, 0x18, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, - 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, - 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, - 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x22, - 0x33, 0x0a, 0x19, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, - 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, - 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x78, - 0x69, 0x73, 0x74, 0x73, 0x22, 0x4a, 0x0a, 0x10, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x55, 0x73, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, - 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x22, 0x59, 0x0a, 0x11, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, - 0x04, 0x69, 0x73, 0x4f, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, - 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x79, 0x0a, 0x15, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, - 0x66, 0x75, 0x6c, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x66, 0x75, 0x6c, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x6f, 0x62, 0x69, - 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, - 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x22, 0x68, 0x0a, 0x16, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, - 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x22, 0x35, 0x0a, 0x1b, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x44, - 0x61, 0x73, 0x68, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0xa7, 0x07, 0x0a, 0x1c, 0x43, 0x6f, 0x6d, 0x70, - 0x6f, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x73, 0x68, 0x62, 0x6f, 0x61, 0x72, 0x64, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x12, 0x30, 0x0a, 0x13, - 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, 0x79, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x42, 0x79, - 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x6d, 0x6f, 0x6e, 0x74, 0x68, - 0x6c, 0x79, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x3c, - 0x0a, 0x19, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, 0x79, 0x50, 0x65, 0x65, 0x6b, 0x42, 0x61, 0x6e, - 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x42, 0x79, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x19, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, 0x79, 0x50, 0x65, 0x65, 0x6b, 0x42, 0x61, - 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x2c, 0x0a, 0x11, - 0x64, 0x61, 0x69, 0x6c, 0x79, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x42, 0x79, 0x74, 0x65, - 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x54, 0x72, - 0x61, 0x66, 0x66, 0x69, 0x63, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x38, 0x0a, 0x17, 0x64, 0x61, - 0x69, 0x6c, 0x79, 0x50, 0x65, 0x65, 0x6b, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x42, 0x79, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x17, 0x64, 0x61, 0x69, - 0x6c, 0x79, 0x50, 0x65, 0x65, 0x6b, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x42, - 0x79, 0x74, 0x65, 0x73, 0x12, 0x5f, 0x0a, 0x11, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x54, 0x72, 0x61, - 0x66, 0x66, 0x69, 0x63, 0x53, 0x74, 0x61, 0x74, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x31, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, - 0x44, 0x61, 0x73, 0x68, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x2e, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x53, 0x74, - 0x61, 0x74, 0x52, 0x11, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, - 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x71, 0x0a, 0x17, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x50, 0x65, - 0x65, 0x6b, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x73, - 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x6d, 0x70, - 0x6f, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x73, 0x68, 0x62, 0x6f, 0x61, 0x72, 0x64, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x50, 0x65, - 0x65, 0x6b, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x52, - 0x17, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x50, 0x65, 0x65, 0x6b, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x30, 0x0a, 0x13, 0x62, 0x61, 0x6e, 0x64, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x13, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x12, 0x38, 0x0a, 0x17, 0x62, 0x61, - 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, - 0x65, 0x42, 0x69, 0x74, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x17, 0x62, 0x61, 0x6e, - 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, - 0x42, 0x69, 0x74, 0x73, 0x1a, 0x88, 0x02, 0x0a, 0x10, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x54, 0x72, - 0x61, 0x66, 0x66, 0x69, 0x63, 0x53, 0x74, 0x61, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x62, - 0x79, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x62, 0x79, 0x74, 0x65, - 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x42, 0x79, - 0x74, 0x65, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x42, 0x79, 0x74, - 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, - 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x30, 0x0a, 0x13, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, - 0x61, 0x63, 0x68, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x30, 0x0a, - 0x13, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x1a, - 0x40, 0x0a, 0x16, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x50, 0x65, 0x65, 0x6b, 0x42, 0x61, 0x6e, 0x64, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x62, - 0x79, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x62, 0x79, 0x74, 0x65, - 0x73, 0x22, 0x36, 0x0a, 0x1c, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x6f, 0x64, - 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x45, 0x0a, 0x1d, 0x46, 0x69, 0x6e, - 0x64, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, - 0x49, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x6e, 0x6f, - 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, - 0x22, 0x57, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, - 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, - 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, - 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, - 0x43, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x66, 0x65, 0x61, - 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x22, 0x61, 0x0a, 0x1d, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x73, 0x46, 0x65, 0x61, 0x74, 0x75, - 0x72, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x65, - 0x61, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x0c, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x1c, - 0x0a, 0x09, 0x6f, 0x76, 0x65, 0x72, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x09, 0x6f, 0x76, 0x65, 0x72, 0x77, 0x72, 0x69, 0x74, 0x65, 0x22, 0x31, 0x0a, 0x17, - 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, - 0x47, 0x0a, 0x18, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, 0x61, 0x74, 0x75, - 0x72, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2b, 0x0a, 0x08, 0x66, - 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, - 0x70, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x08, - 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0x26, 0x0a, 0x24, 0x46, 0x69, 0x6e, 0x64, - 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x44, 0x65, - 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x22, 0x54, 0x0a, 0x25, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x46, - 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2b, 0x0a, 0x08, 0x66, 0x65, 0x61, - 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x08, 0x66, 0x65, - 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0x1f, 0x0a, 0x1d, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, - 0x65, 0x55, 0x73, 0x65, 0x72, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x42, 0x6f, 0x61, 0x72, 0x64, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xa9, 0x06, 0x0a, 0x1e, 0x43, 0x6f, 0x6d, 0x70, - 0x6f, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x42, 0x6f, 0x61, - 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, - 0x74, 0x61, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, - 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x54, 0x6f, 0x64, 0x61, 0x79, 0x55, 0x73, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x0f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x54, 0x6f, 0x64, 0x61, 0x79, 0x55, - 0x73, 0x65, 0x72, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x57, 0x65, 0x65, - 0x6b, 0x6c, 0x79, 0x55, 0x73, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x55, 0x73, 0x65, 0x72, 0x73, - 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x6f, 0x64, - 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x55, - 0x73, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x15, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x4f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, - 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x15, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4f, 0x66, - 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x30, - 0x0a, 0x13, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x69, 0x6e, 0x67, - 0x55, 0x73, 0x65, 0x72, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x72, 0x73, - 0x12, 0x4c, 0x0a, 0x0a, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x53, 0x74, 0x61, 0x74, 0x73, 0x18, 0x1e, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, - 0x65, 0x55, 0x73, 0x65, 0x72, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x42, 0x6f, 0x61, 0x72, 0x64, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x53, 0x74, - 0x61, 0x74, 0x52, 0x0a, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x33, - 0x0a, 0x0d, 0x63, 0x70, 0x75, 0x4e, 0x6f, 0x64, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, - 0x1f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0d, 0x63, 0x70, 0x75, 0x4e, 0x6f, 0x64, 0x65, 0x56, 0x61, 0x6c, - 0x75, 0x65, 0x73, 0x12, 0x39, 0x0a, 0x10, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x64, - 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x20, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, - 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x10, 0x6d, 0x65, - 0x6d, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x64, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x35, - 0x0a, 0x0e, 0x6c, 0x6f, 0x61, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, - 0x18, 0x21, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0e, 0x6c, 0x6f, 0x61, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x58, 0x0a, 0x0f, 0x74, 0x6f, 0x70, 0x54, 0x72, 0x61, 0x66, - 0x66, 0x69, 0x63, 0x53, 0x74, 0x61, 0x74, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, - 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x47, - 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x42, 0x6f, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x53, 0x74, 0x61, 0x74, 0x52, 0x0f, - 0x74, 0x6f, 0x70, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x53, 0x74, 0x61, 0x74, 0x73, 0x1a, - 0x33, 0x0a, 0x09, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x53, 0x74, 0x61, 0x74, 0x12, 0x10, 0x0a, 0x03, - 0x64, 0x61, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x14, - 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x7d, 0x0a, 0x0b, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x53, - 0x74, 0x61, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x75, - 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, - 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x14, 0x0a, - 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x62, 0x79, - 0x74, 0x65, 0x73, 0x22, 0x3d, 0x0a, 0x1f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, - 0x4f, 0x54, 0x50, 0x57, 0x69, 0x74, 0x68, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, - 0x6d, 0x65, 0x22, 0x42, 0x0a, 0x20, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4f, - 0x54, 0x50, 0x57, 0x69, 0x74, 0x68, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, - 0x65, 0x4f, 0x54, 0x50, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x72, 0x65, 0x71, 0x75, - 0x69, 0x72, 0x65, 0x4f, 0x54, 0x50, 0x22, 0x32, 0x0a, 0x18, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, - 0x65, 0x72, 0x50, 0x72, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x5b, 0x0a, 0x19, 0x46, 0x69, - 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x50, 0x72, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x63, 0x65, - 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, 0x69, 0x63, - 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x63, 0x65, 0x50, 0x65, - 0x72, 0x69, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x72, 0x69, 0x63, - 0x65, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x22, 0x52, 0x0a, 0x1a, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x72, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, - 0x09, 0x70, 0x72, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x70, 0x72, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x58, 0x0a, 0x1c, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x72, 0x69, 0x63, 0x65, 0x50, 0x65, - 0x72, 0x69, 0x6f, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, - 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, - 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x63, 0x65, 0x50, 0x65, 0x72, 0x69, - 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x72, 0x69, 0x63, 0x65, 0x50, - 0x65, 0x72, 0x69, 0x6f, 0x64, 0x22, 0x36, 0x0a, 0x1c, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, - 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x3d, 0x0a, - 0x1d, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, - 0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, - 0x0a, 0x09, 0x69, 0x73, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x09, 0x69, 0x73, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x22, 0x36, 0x0a, 0x1c, - 0x52, 0x65, 0x6e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, - 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, - 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, - 0x65, 0x72, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x1d, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x55, 0x73, 0x65, - 0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x45, 0x6e, 0x61, 0x62, 0x6c, - 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x45, 0x6e, 0x61, 0x62, - 0x6c, 0x65, 0x64, 0x22, 0x2d, 0x0a, 0x15, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, - 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, - 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6d, 0x61, - 0x69, 0x6c, 0x22, 0x30, 0x0a, 0x16, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x45, - 0x6d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, - 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x78, - 0x69, 0x73, 0x74, 0x73, 0x22, 0x30, 0x0a, 0x16, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, - 0x72, 0x4d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, - 0x0a, 0x06, 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x22, 0x31, 0x0a, 0x17, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, - 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x06, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x22, 0x46, 0x0a, 0x28, 0x46, 0x69, 0x6e, - 0x64, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, 0x6d, 0x61, - 0x69, 0x6c, 0x57, 0x69, 0x74, 0x68, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, - 0x65, 0x22, 0x41, 0x0a, 0x29, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, - 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x57, 0x69, 0x74, 0x68, 0x55, 0x73, - 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, - 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, - 0x6d, 0x61, 0x69, 0x6c, 0x32, 0xae, 0x11, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x12, 0x3b, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, - 0x65, 0x72, 0x12, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, - 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x70, 0x62, 0x2e, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x41, 0x0a, 0x0c, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, - 0x72, 0x12, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x55, - 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x70, 0x62, 0x2e, - 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a, 0x0a, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x55, 0x73, - 0x65, 0x72, 0x12, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x55, 0x73, - 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, - 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x33, 0x0a, 0x0a, 0x75, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, - 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x33, - 0x0a, 0x0a, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x15, 0x2e, 0x70, - 0x62, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, - 0x65, 0x73, 0x73, 0x12, 0x4d, 0x0a, 0x14, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6c, 0x6c, 0x45, - 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x73, 0x12, 0x1f, 0x2e, 0x70, 0x62, - 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, - 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x70, - 0x62, 0x2e, 0x52, 0x50, 0x43, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x10, 0x6c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, - 0x64, 0x55, 0x73, 0x65, 0x72, 0x73, 0x12, 0x1b, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, - 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x61, - 0x62, 0x6c, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x4a, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, - 0x55, 0x73, 0x65, 0x72, 0x12, 0x1a, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, - 0x61, 0x62, 0x6c, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1b, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, - 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x50, 0x0a, - 0x11, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, - 0x6d, 0x65, 0x12, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, - 0x72, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x55, - 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x38, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x12, 0x14, 0x2e, 0x70, - 0x62, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x55, 0x73, 0x65, - 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x0e, 0x75, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x19, 0x2e, 0x70, 0x62, - 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, - 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x3d, 0x0a, 0x0f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x1a, 0x2e, 0x70, 0x62, 0x2e, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, - 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x59, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, - 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x73, 0x68, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x12, 0x1f, 0x2e, - 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, - 0x73, 0x68, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, - 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x44, - 0x61, 0x73, 0x68, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x5c, 0x0a, 0x15, 0x66, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, - 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x20, 0x2e, 0x70, 0x62, 0x2e, 0x46, - 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, - 0x65, 0x72, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x70, 0x62, - 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, - 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, - 0x0a, 0x12, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, 0x61, 0x74, - 0x75, 0x72, 0x65, 0x73, 0x12, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, - 0x65, 0x73, 0x73, 0x12, 0x4b, 0x0a, 0x16, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x6c, - 0x55, 0x73, 0x65, 0x72, 0x73, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x21, 0x2e, - 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, - 0x73, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, - 0x12, 0x4d, 0x0a, 0x10, 0x66, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, 0x61, 0x74, - 0x75, 0x72, 0x65, 0x73, 0x12, 0x1b, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, - 0x65, 0x72, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x46, - 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x74, 0x0a, 0x1d, 0x66, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, - 0x61, 0x74, 0x75, 0x72, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x12, 0x28, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, - 0x72, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x70, 0x62, 0x2e, - 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, 0x61, 0x74, 0x75, - 0x72, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5f, 0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, - 0x55, 0x73, 0x65, 0x72, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x42, 0x6f, 0x61, 0x72, 0x64, 0x12, - 0x21, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, - 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x42, 0x6f, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x55, - 0x73, 0x65, 0x72, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x42, 0x6f, 0x61, 0x72, 0x64, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x65, 0x0a, 0x18, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x55, - 0x73, 0x65, 0x72, 0x4f, 0x54, 0x50, 0x57, 0x69, 0x74, 0x68, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, - 0x6d, 0x65, 0x12, 0x23, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, - 0x72, 0x4f, 0x54, 0x50, 0x57, 0x69, 0x74, 0x68, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x68, 0x65, - 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x54, 0x50, 0x57, 0x69, 0x74, 0x68, 0x55, 0x73, 0x65, - 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x50, 0x0a, - 0x11, 0x66, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x50, 0x72, 0x69, 0x63, 0x65, 0x49, 0x6e, - 0x66, 0x6f, 0x12, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, - 0x50, 0x72, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x50, 0x72, - 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x45, 0x0a, 0x13, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x72, 0x69, - 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x72, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, - 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x49, 0x0a, 0x15, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x55, 0x73, 0x65, 0x72, 0x50, 0x72, 0x69, 0x63, 0x65, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, - 0x20, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, - 0x72, 0x69, 0x63, 0x65, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x12, 0x5c, 0x0a, 0x15, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, - 0x72, 0x76, 0x65, 0x72, 0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x20, 0x2e, 0x70, 0x62, 0x2e, - 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, - 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x70, - 0x62, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65, - 0x72, 0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x5c, 0x0a, 0x15, 0x72, 0x65, 0x6e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, - 0x65, 0x72, 0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x20, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, - 0x6e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x70, 0x62, 0x2e, - 0x52, 0x65, 0x6e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, - 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, 0x0a, - 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x12, - 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x45, 0x6d, - 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x70, 0x62, 0x2e, - 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4a, 0x0a, 0x0f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x55, - 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x12, 0x1a, 0x2e, 0x70, 0x62, 0x2e, 0x43, - 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, - 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x80, 0x01, 0x0a, 0x21, 0x66, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x56, - 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x57, 0x69, 0x74, 0x68, - 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2c, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, - 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, 0x6d, - 0x61, 0x69, 0x6c, 0x57, 0x69, 0x74, 0x68, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, - 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, 0x6d, 0x61, 0x69, - 0x6c, 0x57, 0x69, 0x74, 0x68, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +const file_service_user_proto_rawDesc = "" + + "\n" + + "\x12service_user.proto\x12\x02pb\x1a\x19models/rpc_messages.proto\x1a\x17models/model_user.proto\x1a\x1fmodels/model_user_feature.proto\x1a\x1dmodels/model_node_value.proto\"\xfd\x01\n" + + "\x11CreateUserRequest\x12\x1a\n" + + "\busername\x18\x01 \x01(\tR\busername\x12\x1a\n" + + "\bpassword\x18\x02 \x01(\tR\bpassword\x12\x1a\n" + + "\bfullname\x18\x03 \x01(\tR\bfullname\x12\x16\n" + + "\x06mobile\x18\x04 \x01(\tR\x06mobile\x12\x10\n" + + "\x03tel\x18\x05 \x01(\tR\x03tel\x12\x14\n" + + "\x05email\x18\x06 \x01(\tR\x05email\x12\x16\n" + + "\x06remark\x18\a \x01(\tR\x06remark\x12\x16\n" + + "\x06source\x18\b \x01(\tR\x06source\x12$\n" + + "\rnodeClusterId\x18\t \x01(\x03R\rnodeClusterId\",\n" + + "\x12CreateUserResponse\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\"\xbf\x01\n" + + "\x13RegisterUserRequest\x12\x1a\n" + + "\busername\x18\x01 \x01(\tR\busername\x12\x1a\n" + + "\bpassword\x18\x02 \x01(\tR\bpassword\x12\x16\n" + + "\x06mobile\x18\x03 \x01(\tR\x06mobile\x12\x14\n" + + "\x05email\x18\x04 \x01(\tR\x05email\x12\x1a\n" + + "\bfullname\x18\x05 \x01(\tR\bfullname\x12\x0e\n" + + "\x02ip\x18\x06 \x01(\tR\x02ip\x12\x16\n" + + "\x06source\x18\a \x01(\tR\x06source\"j\n" + + "\x14RegisterUserResponse\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12:\n" + + "\x18requireEmailVerification\x18\x02 \x01(\bR\x18requireEmailVerification\"o\n" + + "\x11VerifyUserRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1e\n" + + "\n" + + "isRejected\x18\x02 \x01(\bR\n" + + "isRejected\x12\"\n" + + "\frejectReason\x18\x03 \x01(\tR\frejectReason\"\xed\x02\n" + + "\x11UpdateUserRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" + + "\busername\x18\x02 \x01(\tR\busername\x12\x1a\n" + + "\bpassword\x18\x03 \x01(\tR\bpassword\x12\x1a\n" + + "\bfullname\x18\x04 \x01(\tR\bfullname\x12\x16\n" + + "\x06mobile\x18\x05 \x01(\tR\x06mobile\x12\x10\n" + + "\x03tel\x18\x06 \x01(\tR\x03tel\x12\x14\n" + + "\x05email\x18\a \x01(\tR\x05email\x12\x16\n" + + "\x06remark\x18\b \x01(\tR\x06remark\x12\x12\n" + + "\x04isOn\x18\t \x01(\bR\x04isOn\x12$\n" + + "\rnodeClusterId\x18\n" + + " \x01(\x03R\rnodeClusterId\x12$\n" + + "\rbandwidthAlgo\x18\v \x01(\tR\rbandwidthAlgo\x124\n" + + "\x15httpdnsClusterIdsJSON\x18\f \x01(\fR\x15httpdnsClusterIdsJSON\"+\n" + + "\x11DeleteUserRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\"\x85\x01\n" + + "\x1bCountAllEnabledUsersRequest\x12\x18\n" + + "\akeyword\x18\x01 \x01(\tR\akeyword\x12 \n" + + "\visVerifying\x18\x02 \x01(\bR\visVerifying\x12*\n" + + "\x10mobileIsVerified\x18\x03 \x01(\x05R\x10mobileIsVerified\"\xad\x01\n" + + "\x17ListEnabledUsersRequest\x12\x18\n" + + "\akeyword\x18\x01 \x01(\tR\akeyword\x12 \n" + + "\visVerifying\x18\x04 \x01(\bR\visVerifying\x12*\n" + + "\x10mobileIsVerified\x18\x05 \x01(\x05R\x10mobileIsVerified\x12\x16\n" + + "\x06offset\x18\x02 \x01(\x03R\x06offset\x12\x12\n" + + "\x04size\x18\x03 \x01(\x03R\x04size\":\n" + + "\x18ListEnabledUsersResponse\x12\x1e\n" + + "\x05users\x18\x01 \x03(\v2\b.pb.UserR\x05users\"0\n" + + "\x16FindEnabledUserRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\"7\n" + + "\x17FindEnabledUserResponse\x12\x1c\n" + + "\x04user\x18\x01 \x01(\v2\b.pb.UserR\x04user\"N\n" + + "\x18CheckUserUsernameRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" + + "\busername\x18\x02 \x01(\tR\busername\"3\n" + + "\x19CheckUserUsernameResponse\x12\x16\n" + + "\x06exists\x18\x01 \x01(\bR\x06exists\"J\n" + + "\x10LoginUserRequest\x12\x1a\n" + + "\busername\x18\x01 \x01(\tR\busername\x12\x1a\n" + + "\bpassword\x18\x02 \x01(\tR\bpassword\"Y\n" + + "\x11LoginUserResponse\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x12\n" + + "\x04isOk\x18\x02 \x01(\bR\x04isOk\x12\x18\n" + + "\amessage\x18\x03 \x01(\tR\amessage\"y\n" + + "\x15UpdateUserInfoRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" + + "\bfullname\x18\x02 \x01(\tR\bfullname\x12\x16\n" + + "\x06mobile\x18\x03 \x01(\tR\x06mobile\x12\x14\n" + + "\x05email\x18\x04 \x01(\tR\x05email\"h\n" + + "\x16UpdateUserLoginRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" + + "\busername\x18\x02 \x01(\tR\busername\x12\x1a\n" + + "\bpassword\x18\x03 \x01(\tR\bpassword\"5\n" + + "\x1bComposeUserDashboardRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\"\xa7\a\n" + + "\x1cComposeUserDashboardResponse\x12\"\n" + + "\fcountServers\x18\x01 \x01(\x03R\fcountServers\x120\n" + + "\x13monthlyTrafficBytes\x18\x02 \x01(\x03R\x13monthlyTrafficBytes\x12<\n" + + "\x19monthlyPeekBandwidthBytes\x18\x03 \x01(\x03R\x19monthlyPeekBandwidthBytes\x12,\n" + + "\x11dailyTrafficBytes\x18\x04 \x01(\x03R\x11dailyTrafficBytes\x128\n" + + "\x17dailyPeekBandwidthBytes\x18\x05 \x01(\x03R\x17dailyPeekBandwidthBytes\x12_\n" + + "\x11dailyTrafficStats\x18\x06 \x03(\v21.pb.ComposeUserDashboardResponse.DailyTrafficStatR\x11dailyTrafficStats\x12q\n" + + "\x17dailyPeekBandwidthStats\x18\a \x03(\v27.pb.ComposeUserDashboardResponse.DailyPeekBandwidthStatR\x17dailyPeekBandwidthStats\x120\n" + + "\x13bandwidthPercentile\x18\b \x01(\x05R\x13bandwidthPercentile\x128\n" + + "\x17bandwidthPercentileBits\x18\t \x01(\x03R\x17bandwidthPercentileBits\x1a\x88\x02\n" + + "\x10DailyTrafficStat\x12\x10\n" + + "\x03day\x18\x01 \x01(\tR\x03day\x12\x14\n" + + "\x05bytes\x18\x02 \x01(\x03R\x05bytes\x12 \n" + + "\vcachedBytes\x18\x03 \x01(\x03R\vcachedBytes\x12 \n" + + "\vattackBytes\x18\x04 \x01(\x03R\vattackBytes\x12$\n" + + "\rcountRequests\x18\x05 \x01(\x03R\rcountRequests\x120\n" + + "\x13countCachedRequests\x18\x06 \x01(\x03R\x13countCachedRequests\x120\n" + + "\x13countAttackRequests\x18\a \x01(\x03R\x13countAttackRequests\x1a@\n" + + "\x16DailyPeekBandwidthStat\x12\x10\n" + + "\x03day\x18\x01 \x01(\tR\x03day\x12\x14\n" + + "\x05bytes\x18\x02 \x01(\x03R\x05bytes\"6\n" + + "\x1cFindUserNodeClusterIdRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\"E\n" + + "\x1dFindUserNodeClusterIdResponse\x12$\n" + + "\rnodeClusterId\x18\x01 \x01(\x03R\rnodeClusterId\"W\n" + + "\x19UpdateUserFeaturesRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\"\n" + + "\ffeatureCodes\x18\x02 \x03(\tR\ffeatureCodes\"a\n" + + "\x1dUpdateAllUsersFeaturesRequest\x12\"\n" + + "\ffeatureCodes\x18\x01 \x03(\tR\ffeatureCodes\x12\x1c\n" + + "\toverwrite\x18\x02 \x01(\bR\toverwrite\"1\n" + + "\x17FindUserFeaturesRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\"G\n" + + "\x18FindUserFeaturesResponse\x12+\n" + + "\bfeatures\x18\x01 \x03(\v2\x0f.pb.UserFeatureR\bfeatures\"&\n" + + "$FindAllUserFeatureDefinitionsRequest\"T\n" + + "%FindAllUserFeatureDefinitionsResponse\x12+\n" + + "\bfeatures\x18\x01 \x03(\v2\x0f.pb.UserFeatureR\bfeatures\"\x1f\n" + + "\x1dComposeUserGlobalBoardRequest\"\xa9\x06\n" + + "\x1eComposeUserGlobalBoardResponse\x12\x1e\n" + + "\n" + + "totalUsers\x18\x01 \x01(\x03R\n" + + "totalUsers\x12(\n" + + "\x0fcountTodayUsers\x18\x02 \x01(\x03R\x0fcountTodayUsers\x12*\n" + + "\x10countWeeklyUsers\x18\x03 \x01(\x03R\x10countWeeklyUsers\x12&\n" + + "\x0ecountUserNodes\x18\x04 \x01(\x03R\x0ecountUserNodes\x124\n" + + "\x15countOfflineUserNodes\x18\x05 \x01(\x03R\x15countOfflineUserNodes\x120\n" + + "\x13countVerifyingUsers\x18\x06 \x01(\x03R\x13countVerifyingUsers\x12L\n" + + "\n" + + "dailyStats\x18\x1e \x03(\v2,.pb.ComposeUserGlobalBoardResponse.DailyStatR\n" + + "dailyStats\x123\n" + + "\rcpuNodeValues\x18\x1f \x03(\v2\r.pb.NodeValueR\rcpuNodeValues\x129\n" + + "\x10memoryNodeValues\x18 \x03(\v2\r.pb.NodeValueR\x10memoryNodeValues\x125\n" + + "\x0eloadNodeValues\x18! \x03(\v2\r.pb.NodeValueR\x0eloadNodeValues\x12X\n" + + "\x0ftopTrafficStats\x18\" \x03(\v2..pb.ComposeUserGlobalBoardResponse.TrafficStatR\x0ftopTrafficStats\x1a3\n" + + "\tDailyStat\x12\x10\n" + + "\x03day\x18\x01 \x01(\tR\x03day\x12\x14\n" + + "\x05count\x18\x02 \x01(\x03R\x05count\x1a}\n" + + "\vTrafficStat\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" + + "\buserName\x18\x02 \x01(\tR\buserName\x12$\n" + + "\rcountRequests\x18\x03 \x01(\x03R\rcountRequests\x12\x14\n" + + "\x05bytes\x18\x04 \x01(\x03R\x05bytes\"=\n" + + "\x1fCheckUserOTPWithUsernameRequest\x12\x1a\n" + + "\busername\x18\x01 \x01(\tR\busername\"B\n" + + " CheckUserOTPWithUsernameResponse\x12\x1e\n" + + "\n" + + "requireOTP\x18\x01 \x01(\bR\n" + + "requireOTP\"2\n" + + "\x18FindUserPriceInfoRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\"[\n" + + "\x19FindUserPriceInfoResponse\x12\x1c\n" + + "\tpriceType\x18\x01 \x01(\tR\tpriceType\x12 \n" + + "\vpricePeriod\x18\x02 \x01(\tR\vpricePeriod\"R\n" + + "\x1aUpdateUserPriceTypeRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1c\n" + + "\tpriceType\x18\x02 \x01(\tR\tpriceType\"X\n" + + "\x1cUpdateUserPricePeriodRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12 \n" + + "\vpricePeriod\x18\x02 \x01(\tR\vpricePeriod\"6\n" + + "\x1cCheckUserServersStateRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\"=\n" + + "\x1dCheckUserServersStateResponse\x12\x1c\n" + + "\tisEnabled\x18\x01 \x01(\bR\tisEnabled\"6\n" + + "\x1cRenewUserServersStateRequest\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\"=\n" + + "\x1dRenewUserServersStateResponse\x12\x1c\n" + + "\tisEnabled\x18\x01 \x01(\bR\tisEnabled\"-\n" + + "\x15CheckUserEmailRequest\x12\x14\n" + + "\x05email\x18\x01 \x01(\tR\x05email\"0\n" + + "\x16CheckUserEmailResponse\x12\x16\n" + + "\x06exists\x18\x01 \x01(\bR\x06exists\"0\n" + + "\x16CheckUserMobileRequest\x12\x16\n" + + "\x06mobile\x18\x01 \x01(\tR\x06mobile\"1\n" + + "\x17CheckUserMobileResponse\x12\x16\n" + + "\x06exists\x18\x01 \x01(\bR\x06exists\"F\n" + + "(FindUserVerifiedEmailWithUsernameRequest\x12\x1a\n" + + "\busername\x18\x01 \x01(\tR\busername\"A\n" + + ")FindUserVerifiedEmailWithUsernameResponse\x12\x14\n" + + "\x05email\x18\x01 \x01(\tR\x05email2\xae\x11\n" + + "\vUserService\x12;\n" + + "\n" + + "createUser\x12\x15.pb.CreateUserRequest\x1a\x16.pb.CreateUserResponse\x12A\n" + + "\fregisterUser\x12\x17.pb.RegisterUserRequest\x1a\x18.pb.RegisterUserResponse\x123\n" + + "\n" + + "verifyUser\x12\x15.pb.VerifyUserRequest\x1a\x0e.pb.RPCSuccess\x123\n" + + "\n" + + "updateUser\x12\x15.pb.UpdateUserRequest\x1a\x0e.pb.RPCSuccess\x123\n" + + "\n" + + "deleteUser\x12\x15.pb.DeleteUserRequest\x1a\x0e.pb.RPCSuccess\x12M\n" + + "\x14countAllEnabledUsers\x12\x1f.pb.CountAllEnabledUsersRequest\x1a\x14.pb.RPCCountResponse\x12M\n" + + "\x10listEnabledUsers\x12\x1b.pb.ListEnabledUsersRequest\x1a\x1c.pb.ListEnabledUsersResponse\x12J\n" + + "\x0ffindEnabledUser\x12\x1a.pb.FindEnabledUserRequest\x1a\x1b.pb.FindEnabledUserResponse\x12P\n" + + "\x11checkUserUsername\x12\x1c.pb.CheckUserUsernameRequest\x1a\x1d.pb.CheckUserUsernameResponse\x128\n" + + "\tloginUser\x12\x14.pb.LoginUserRequest\x1a\x15.pb.LoginUserResponse\x12;\n" + + "\x0eupdateUserInfo\x12\x19.pb.UpdateUserInfoRequest\x1a\x0e.pb.RPCSuccess\x12=\n" + + "\x0fupdateUserLogin\x12\x1a.pb.UpdateUserLoginRequest\x1a\x0e.pb.RPCSuccess\x12Y\n" + + "\x14composeUserDashboard\x12\x1f.pb.ComposeUserDashboardRequest\x1a .pb.ComposeUserDashboardResponse\x12\\\n" + + "\x15findUserNodeClusterId\x12 .pb.FindUserNodeClusterIdRequest\x1a!.pb.FindUserNodeClusterIdResponse\x12C\n" + + "\x12updateUserFeatures\x12\x1d.pb.UpdateUserFeaturesRequest\x1a\x0e.pb.RPCSuccess\x12K\n" + + "\x16updateAllUsersFeatures\x12!.pb.UpdateAllUsersFeaturesRequest\x1a\x0e.pb.RPCSuccess\x12M\n" + + "\x10findUserFeatures\x12\x1b.pb.FindUserFeaturesRequest\x1a\x1c.pb.FindUserFeaturesResponse\x12t\n" + + "\x1dfindAllUserFeatureDefinitions\x12(.pb.FindAllUserFeatureDefinitionsRequest\x1a).pb.FindAllUserFeatureDefinitionsResponse\x12_\n" + + "\x16composeUserGlobalBoard\x12!.pb.ComposeUserGlobalBoardRequest\x1a\".pb.ComposeUserGlobalBoardResponse\x12e\n" + + "\x18checkUserOTPWithUsername\x12#.pb.CheckUserOTPWithUsernameRequest\x1a$.pb.CheckUserOTPWithUsernameResponse\x12P\n" + + "\x11findUserPriceInfo\x12\x1c.pb.FindUserPriceInfoRequest\x1a\x1d.pb.FindUserPriceInfoResponse\x12E\n" + + "\x13updateUserPriceType\x12\x1e.pb.UpdateUserPriceTypeRequest\x1a\x0e.pb.RPCSuccess\x12I\n" + + "\x15updateUserPricePeriod\x12 .pb.UpdateUserPricePeriodRequest\x1a\x0e.pb.RPCSuccess\x12\\\n" + + "\x15checkUserServersState\x12 .pb.CheckUserServersStateRequest\x1a!.pb.CheckUserServersStateResponse\x12\\\n" + + "\x15renewUserServersState\x12 .pb.RenewUserServersStateRequest\x1a!.pb.RenewUserServersStateResponse\x12G\n" + + "\x0echeckUserEmail\x12\x19.pb.CheckUserEmailRequest\x1a\x1a.pb.CheckUserEmailResponse\x12J\n" + + "\x0fcheckUserMobile\x12\x1a.pb.CheckUserMobileRequest\x1a\x1b.pb.CheckUserMobileResponse\x12\x80\x01\n" + + "!findUserVerifiedEmailWithUsername\x12,.pb.FindUserVerifiedEmailWithUsernameRequest\x1a-.pb.FindUserVerifiedEmailWithUsernameResponseB\x06Z\x04./pbb\x06proto3" var ( file_service_user_proto_rawDescOnce sync.Once - file_service_user_proto_rawDescData = file_service_user_proto_rawDesc + file_service_user_proto_rawDescData []byte ) func file_service_user_proto_rawDescGZIP() []byte { file_service_user_proto_rawDescOnce.Do(func() { - file_service_user_proto_rawDescData = protoimpl.X.CompressGZIP(file_service_user_proto_rawDescData) + file_service_user_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_service_user_proto_rawDesc), len(file_service_user_proto_rawDesc))) }) return file_service_user_proto_rawDescData } @@ -3497,7 +3230,7 @@ func file_service_user_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_service_user_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_service_user_proto_rawDesc), len(file_service_user_proto_rawDesc)), NumEnums: 0, NumMessages: 50, NumExtensions: 0, @@ -3508,7 +3241,6 @@ func file_service_user_proto_init() { MessageInfos: file_service_user_proto_msgTypes, }.Build() File_service_user_proto = out.File - file_service_user_proto_rawDesc = nil file_service_user_proto_goTypes = nil file_service_user_proto_depIdxs = nil } diff --git a/EdgeCommon/pkg/rpc/pb/service_user_grpc.pb.go b/EdgeCommon/pkg/rpc/pb/service_user_grpc.pb.go index 97d95f4..8d24141 100644 --- a/EdgeCommon/pkg/rpc/pb/service_user_grpc.pb.go +++ b/EdgeCommon/pkg/rpc/pb/service_user_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.5.1 -// - protoc v6.33.2 +// - protoc-gen-go-grpc v1.6.1 +// - protoc v3.21.12 // source: service_user.proto package pb @@ -473,88 +473,88 @@ type UserServiceServer interface { type UnimplementedUserServiceServer struct{} func (UnimplementedUserServiceServer) CreateUser(context.Context, *CreateUserRequest) (*CreateUserResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CreateUser not implemented") + return nil, status.Error(codes.Unimplemented, "method CreateUser not implemented") } func (UnimplementedUserServiceServer) RegisterUser(context.Context, *RegisterUserRequest) (*RegisterUserResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method RegisterUser not implemented") + return nil, status.Error(codes.Unimplemented, "method RegisterUser not implemented") } func (UnimplementedUserServiceServer) VerifyUser(context.Context, *VerifyUserRequest) (*RPCSuccess, error) { - return nil, status.Errorf(codes.Unimplemented, "method VerifyUser not implemented") + return nil, status.Error(codes.Unimplemented, "method VerifyUser not implemented") } func (UnimplementedUserServiceServer) UpdateUser(context.Context, *UpdateUserRequest) (*RPCSuccess, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateUser not implemented") + return nil, status.Error(codes.Unimplemented, "method UpdateUser not implemented") } func (UnimplementedUserServiceServer) DeleteUser(context.Context, *DeleteUserRequest) (*RPCSuccess, error) { - return nil, status.Errorf(codes.Unimplemented, "method DeleteUser not implemented") + return nil, status.Error(codes.Unimplemented, "method DeleteUser not implemented") } func (UnimplementedUserServiceServer) CountAllEnabledUsers(context.Context, *CountAllEnabledUsersRequest) (*RPCCountResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CountAllEnabledUsers not implemented") + return nil, status.Error(codes.Unimplemented, "method CountAllEnabledUsers not implemented") } func (UnimplementedUserServiceServer) ListEnabledUsers(context.Context, *ListEnabledUsersRequest) (*ListEnabledUsersResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ListEnabledUsers not implemented") + return nil, status.Error(codes.Unimplemented, "method ListEnabledUsers not implemented") } func (UnimplementedUserServiceServer) FindEnabledUser(context.Context, *FindEnabledUserRequest) (*FindEnabledUserResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method FindEnabledUser not implemented") + return nil, status.Error(codes.Unimplemented, "method FindEnabledUser not implemented") } func (UnimplementedUserServiceServer) CheckUserUsername(context.Context, *CheckUserUsernameRequest) (*CheckUserUsernameResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CheckUserUsername not implemented") + return nil, status.Error(codes.Unimplemented, "method CheckUserUsername not implemented") } func (UnimplementedUserServiceServer) LoginUser(context.Context, *LoginUserRequest) (*LoginUserResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method LoginUser not implemented") + return nil, status.Error(codes.Unimplemented, "method LoginUser not implemented") } func (UnimplementedUserServiceServer) UpdateUserInfo(context.Context, *UpdateUserInfoRequest) (*RPCSuccess, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateUserInfo not implemented") + return nil, status.Error(codes.Unimplemented, "method UpdateUserInfo not implemented") } func (UnimplementedUserServiceServer) UpdateUserLogin(context.Context, *UpdateUserLoginRequest) (*RPCSuccess, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateUserLogin not implemented") + return nil, status.Error(codes.Unimplemented, "method UpdateUserLogin not implemented") } func (UnimplementedUserServiceServer) ComposeUserDashboard(context.Context, *ComposeUserDashboardRequest) (*ComposeUserDashboardResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ComposeUserDashboard not implemented") + return nil, status.Error(codes.Unimplemented, "method ComposeUserDashboard not implemented") } func (UnimplementedUserServiceServer) FindUserNodeClusterId(context.Context, *FindUserNodeClusterIdRequest) (*FindUserNodeClusterIdResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method FindUserNodeClusterId not implemented") + return nil, status.Error(codes.Unimplemented, "method FindUserNodeClusterId not implemented") } func (UnimplementedUserServiceServer) UpdateUserFeatures(context.Context, *UpdateUserFeaturesRequest) (*RPCSuccess, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateUserFeatures not implemented") + return nil, status.Error(codes.Unimplemented, "method UpdateUserFeatures not implemented") } func (UnimplementedUserServiceServer) UpdateAllUsersFeatures(context.Context, *UpdateAllUsersFeaturesRequest) (*RPCSuccess, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateAllUsersFeatures not implemented") + return nil, status.Error(codes.Unimplemented, "method UpdateAllUsersFeatures not implemented") } func (UnimplementedUserServiceServer) FindUserFeatures(context.Context, *FindUserFeaturesRequest) (*FindUserFeaturesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method FindUserFeatures not implemented") + return nil, status.Error(codes.Unimplemented, "method FindUserFeatures not implemented") } func (UnimplementedUserServiceServer) FindAllUserFeatureDefinitions(context.Context, *FindAllUserFeatureDefinitionsRequest) (*FindAllUserFeatureDefinitionsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method FindAllUserFeatureDefinitions not implemented") + return nil, status.Error(codes.Unimplemented, "method FindAllUserFeatureDefinitions not implemented") } func (UnimplementedUserServiceServer) ComposeUserGlobalBoard(context.Context, *ComposeUserGlobalBoardRequest) (*ComposeUserGlobalBoardResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ComposeUserGlobalBoard not implemented") + return nil, status.Error(codes.Unimplemented, "method ComposeUserGlobalBoard not implemented") } func (UnimplementedUserServiceServer) CheckUserOTPWithUsername(context.Context, *CheckUserOTPWithUsernameRequest) (*CheckUserOTPWithUsernameResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CheckUserOTPWithUsername not implemented") + return nil, status.Error(codes.Unimplemented, "method CheckUserOTPWithUsername not implemented") } func (UnimplementedUserServiceServer) FindUserPriceInfo(context.Context, *FindUserPriceInfoRequest) (*FindUserPriceInfoResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method FindUserPriceInfo not implemented") + return nil, status.Error(codes.Unimplemented, "method FindUserPriceInfo not implemented") } func (UnimplementedUserServiceServer) UpdateUserPriceType(context.Context, *UpdateUserPriceTypeRequest) (*RPCSuccess, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateUserPriceType not implemented") + return nil, status.Error(codes.Unimplemented, "method UpdateUserPriceType not implemented") } func (UnimplementedUserServiceServer) UpdateUserPricePeriod(context.Context, *UpdateUserPricePeriodRequest) (*RPCSuccess, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateUserPricePeriod not implemented") + return nil, status.Error(codes.Unimplemented, "method UpdateUserPricePeriod not implemented") } func (UnimplementedUserServiceServer) CheckUserServersState(context.Context, *CheckUserServersStateRequest) (*CheckUserServersStateResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CheckUserServersState not implemented") + return nil, status.Error(codes.Unimplemented, "method CheckUserServersState not implemented") } func (UnimplementedUserServiceServer) RenewUserServersState(context.Context, *RenewUserServersStateRequest) (*RenewUserServersStateResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method RenewUserServersState not implemented") + return nil, status.Error(codes.Unimplemented, "method RenewUserServersState not implemented") } func (UnimplementedUserServiceServer) CheckUserEmail(context.Context, *CheckUserEmailRequest) (*CheckUserEmailResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CheckUserEmail not implemented") + return nil, status.Error(codes.Unimplemented, "method CheckUserEmail not implemented") } func (UnimplementedUserServiceServer) CheckUserMobile(context.Context, *CheckUserMobileRequest) (*CheckUserMobileResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CheckUserMobile not implemented") + return nil, status.Error(codes.Unimplemented, "method CheckUserMobile not implemented") } func (UnimplementedUserServiceServer) FindUserVerifiedEmailWithUsername(context.Context, *FindUserVerifiedEmailWithUsernameRequest) (*FindUserVerifiedEmailWithUsernameResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method FindUserVerifiedEmailWithUsername not implemented") + return nil, status.Error(codes.Unimplemented, "method FindUserVerifiedEmailWithUsername not implemented") } func (UnimplementedUserServiceServer) testEmbeddedByValue() {} @@ -566,7 +566,7 @@ type UnsafeUserServiceServer interface { } func RegisterUserServiceServer(s grpc.ServiceRegistrar, srv UserServiceServer) { - // If the following call pancis, it indicates UnimplementedUserServiceServer was + // If the following call panics, it indicates UnimplementedUserServiceServer was // embedded by pointer and is nil. This will cause panics if an // unimplemented method is ever invoked, so we test this at initialization // time to prevent it from happening at runtime later due to I/O. diff --git a/EdgeCommon/pkg/rpc/protos/models/model_httpdns_access_log.proto b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_access_log.proto new file mode 100644 index 0000000..fe23460 --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_access_log.proto @@ -0,0 +1,29 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +message HTTPDNSAccessLog { + int64 id = 1; + string requestId = 2; + int64 clusterId = 3; + int64 nodeId = 4; + string appId = 5; + string appName = 6; + string domain = 7; + string qtype = 8; + string clientIP = 9; + string clientRegion = 10; + string carrier = 11; + string sdkVersion = 12; + string os = 13; + string resultIPs = 14; + string status = 15; + string errorCode = 16; + int32 costMs = 17; + int64 createdAt = 18; + string day = 19; + string summary = 20; + string nodeName = 21; + string clusterName = 22; +} diff --git a/EdgeCommon/pkg/rpc/protos/models/model_httpdns_app.proto b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_app.proto new file mode 100644 index 0000000..553ca89 --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_app.proto @@ -0,0 +1,20 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +message HTTPDNSApp { + int64 id = 1; + string name = 2; + string appId = 3; + bool isOn = 4; + reserved 5, 6; // removed: primaryClusterId, backupClusterId + string sniMode = 7; + bool signEnabled = 8; + string signSecret = 9; + int64 signUpdatedAt = 10; + int64 createdAt = 11; + int64 updatedAt = 12; + int64 userId = 13; + bytes clusterIdsJSON = 14; +} diff --git a/EdgeCommon/pkg/rpc/protos/models/model_httpdns_cluster.proto b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_cluster.proto new file mode 100644 index 0000000..3f38b02 --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_cluster.proto @@ -0,0 +1,21 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +message HTTPDNSCluster { + int64 id = 1; + bool isOn = 2; + bool isDefault = 3; + string name = 4; + string serviceDomain = 5; + int32 defaultTTL = 6; + int32 fallbackTimeoutMs = 7; + string installDir = 8; + bytes tlsPolicyJSON = 9; + int64 createdAt = 10; + int64 updatedAt = 11; + bool autoRemoteStart = 12; + bool accessLogIsOn = 13; + string timeZone = 14; +} diff --git a/EdgeCommon/pkg/rpc/protos/models/model_httpdns_domain.proto b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_domain.proto new file mode 100644 index 0000000..5b7f3f0 --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_domain.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +message HTTPDNSDomain { + int64 id = 1; + int64 appId = 2; + string domain = 3; + bool isOn = 4; + int64 createdAt = 5; + int64 updatedAt = 6; + int64 ruleCount = 7; +} diff --git a/EdgeCommon/pkg/rpc/protos/models/model_httpdns_node.proto b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_node.proto new file mode 100644 index 0000000..ecfbe5f --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_node.proto @@ -0,0 +1,24 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +import "models/model_node_login.proto"; + +message HTTPDNSNode { + int64 id = 1; + int64 clusterId = 2; + string name = 3; + bool isOn = 4; + bool isUp = 5; + bool isInstalled = 6; + bool isActive = 7; + string uniqueId = 8; + string secret = 9; + string installDir = 10; + bytes statusJSON = 11; + bytes installStatusJSON = 12; + int64 createdAt = 13; + int64 updatedAt = 14; + NodeLogin nodeLogin = 15; +} diff --git a/EdgeCommon/pkg/rpc/protos/models/model_httpdns_rule.proto b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_rule.proto new file mode 100644 index 0000000..7141520 --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_rule.proto @@ -0,0 +1,31 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +message HTTPDNSRuleRecord { + int64 id = 1; + int64 ruleId = 2; + string recordType = 3; + string recordValue = 4; + int32 weight = 5; + int32 sort = 6; +} + +message HTTPDNSCustomRule { + int64 id = 1; + int64 appId = 2; + int64 domainId = 3; + string ruleName = 4; + string lineScope = 5; + string lineCarrier = 6; + string lineRegion = 7; + string lineProvince = 8; + string lineContinent = 9; + string lineCountry = 10; + int32 ttl = 11; + bool isOn = 12; + int32 priority = 13; + int64 updatedAt = 14; + repeated HTTPDNSRuleRecord records = 15; +} diff --git a/EdgeCommon/pkg/rpc/protos/models/model_httpdns_runtime_log.proto b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_runtime_log.proto new file mode 100644 index 0000000..73e7069 --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/models/model_httpdns_runtime_log.proto @@ -0,0 +1,20 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +message HTTPDNSRuntimeLog { + int64 id = 1; + int64 clusterId = 2; + int64 nodeId = 3; + string level = 4; + string type = 5; + string module = 6; + string description = 7; + int64 count = 8; + string requestId = 9; + int64 createdAt = 10; + string day = 11; + string clusterName = 12; + string nodeName = 13; +} diff --git a/EdgeCommon/pkg/rpc/protos/models/model_user.proto b/EdgeCommon/pkg/rpc/protos/models/model_user.proto index 16d729d..ac09565 100644 --- a/EdgeCommon/pkg/rpc/protos/models/model_user.proto +++ b/EdgeCommon/pkg/rpc/protos/models/model_user.proto @@ -28,6 +28,7 @@ message User { bool isEnterpriseIdentified = 18; // 是否已通过企业验证 string bandwidthAlgo = 21; // 带宽算法 string lang = 22; // 语言代号 + bytes httpdnsClusterIdsJSON = 24; // HTTPDNS关联集群ID列表 Login otpLogin = 19; // OTP认证 diff --git a/EdgeCommon/pkg/rpc/protos/service_httpdns_access_log.proto b/EdgeCommon/pkg/rpc/protos/service_httpdns_access_log.proto new file mode 100644 index 0000000..766eb64 --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/service_httpdns_access_log.proto @@ -0,0 +1,35 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +import "models/model_httpdns_access_log.proto"; + +service HTTPDNSAccessLogService { + rpc createHTTPDNSAccessLogs (CreateHTTPDNSAccessLogsRequest) returns (CreateHTTPDNSAccessLogsResponse); + rpc listHTTPDNSAccessLogs (ListHTTPDNSAccessLogsRequest) returns (ListHTTPDNSAccessLogsResponse); +} + +message CreateHTTPDNSAccessLogsRequest { + repeated HTTPDNSAccessLog logs = 1; +} + +message CreateHTTPDNSAccessLogsResponse { +} + +message ListHTTPDNSAccessLogsRequest { + string day = 1; + int64 clusterId = 2; + int64 nodeId = 3; + string appId = 4; + string domain = 5; + string status = 6; + string keyword = 7; + int64 offset = 8; + int64 size = 9; +} + +message ListHTTPDNSAccessLogsResponse { + repeated HTTPDNSAccessLog logs = 1; + int64 total = 2; +} diff --git a/EdgeCommon/pkg/rpc/protos/service_httpdns_app.proto b/EdgeCommon/pkg/rpc/protos/service_httpdns_app.proto new file mode 100644 index 0000000..da8b9f9 --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/service_httpdns_app.proto @@ -0,0 +1,84 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +import "models/model_httpdns_app.proto"; +import "models/rpc_messages.proto"; + +service HTTPDNSAppService { + rpc createHTTPDNSApp (CreateHTTPDNSAppRequest) returns (CreateHTTPDNSAppResponse); + rpc updateHTTPDNSApp (UpdateHTTPDNSAppRequest) returns (RPCSuccess); + rpc deleteHTTPDNSApp (DeleteHTTPDNSAppRequest) returns (RPCSuccess); + rpc findHTTPDNSApp (FindHTTPDNSAppRequest) returns (FindHTTPDNSAppResponse); + rpc listHTTPDNSApps (ListHTTPDNSAppsRequest) returns (ListHTTPDNSAppsResponse); + rpc findAllHTTPDNSApps (FindAllHTTPDNSAppsRequest) returns (FindAllHTTPDNSAppsResponse); + rpc updateHTTPDNSAppSignEnabled (UpdateHTTPDNSAppSignEnabledRequest) returns (RPCSuccess); + rpc resetHTTPDNSAppSignSecret (ResetHTTPDNSAppSignSecretRequest) returns (ResetHTTPDNSAppSignSecretResponse); +} + +message CreateHTTPDNSAppRequest { + string name = 1; + string appId = 2; + reserved 3, 4; // removed: primaryClusterId, backupClusterId + bool isOn = 5; + bool signEnabled = 6; + int64 userId = 7; + bytes clusterIdsJSON = 8; +} + +message CreateHTTPDNSAppResponse { + int64 appDbId = 1; +} + +message UpdateHTTPDNSAppRequest { + int64 appDbId = 1; + string name = 2; + reserved 3, 4; // removed: primaryClusterId, backupClusterId + bool isOn = 5; + int64 userId = 6; + bytes clusterIdsJSON = 7; +} + +message DeleteHTTPDNSAppRequest { + int64 appDbId = 1; +} + +message FindHTTPDNSAppRequest { + int64 appDbId = 1; +} + +message FindHTTPDNSAppResponse { + HTTPDNSApp app = 1; +} + +message ListHTTPDNSAppsRequest { + int64 offset = 1; + int64 size = 2; + string keyword = 3; +} + +message ListHTTPDNSAppsResponse { + repeated HTTPDNSApp apps = 1; +} + +message FindAllHTTPDNSAppsRequest { +} + +message FindAllHTTPDNSAppsResponse { + repeated HTTPDNSApp apps = 1; +} + +message UpdateHTTPDNSAppSignEnabledRequest { + int64 appDbId = 1; + bool signEnabled = 2; +} + +message ResetHTTPDNSAppSignSecretRequest { + int64 appDbId = 1; +} + +message ResetHTTPDNSAppSignSecretResponse { + string signSecret = 1; + int64 updatedAt = 2; +} diff --git a/EdgeCommon/pkg/rpc/protos/service_httpdns_cluster.proto b/EdgeCommon/pkg/rpc/protos/service_httpdns_cluster.proto new file mode 100644 index 0000000..9167467 --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/service_httpdns_cluster.proto @@ -0,0 +1,93 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +import "models/model_httpdns_cluster.proto"; +import "models/model_httpdns_node.proto"; +import "models/rpc_messages.proto"; + +service HTTPDNSClusterService { + rpc createHTTPDNSCluster (CreateHTTPDNSClusterRequest) returns (CreateHTTPDNSClusterResponse); + rpc updateHTTPDNSCluster (UpdateHTTPDNSClusterRequest) returns (RPCSuccess); + rpc deleteHTTPDNSCluster (DeleteHTTPDNSClusterRequest) returns (RPCSuccess); + rpc findHTTPDNSCluster (FindHTTPDNSClusterRequest) returns (FindHTTPDNSClusterResponse); + rpc listHTTPDNSClusters (ListHTTPDNSClustersRequest) returns (ListHTTPDNSClustersResponse); + rpc findAllHTTPDNSClusters (FindAllHTTPDNSClustersRequest) returns (FindAllHTTPDNSClustersResponse); + rpc updateHTTPDNSClusterDefault (UpdateHTTPDNSClusterDefaultRequest) returns (RPCSuccess); + rpc listHTTPDNSNodesWithClusterId (ListHTTPDNSNodesWithClusterIdRequest) returns (ListHTTPDNSNodesWithClusterIdResponse); +} + +message CreateHTTPDNSClusterRequest { + string name = 1; + string serviceDomain = 2; + int32 defaultTTL = 3; + int32 fallbackTimeoutMs = 4; + string installDir = 5; + bytes tlsPolicyJSON = 6; + bool isOn = 7; + bool isDefault = 8; + bool autoRemoteStart = 9; + bool accessLogIsOn = 10; + string timeZone = 11; +} + +message CreateHTTPDNSClusterResponse { + int64 clusterId = 1; +} + +message UpdateHTTPDNSClusterRequest { + int64 clusterId = 1; + string name = 2; + string serviceDomain = 3; + int32 defaultTTL = 4; + int32 fallbackTimeoutMs = 5; + string installDir = 6; + bytes tlsPolicyJSON = 7; + bool isOn = 8; + bool isDefault = 9; + bool autoRemoteStart = 10; + bool accessLogIsOn = 11; + string timeZone = 12; +} + +message DeleteHTTPDNSClusterRequest { + int64 clusterId = 1; +} + +message FindHTTPDNSClusterRequest { + int64 clusterId = 1; +} + +message FindHTTPDNSClusterResponse { + HTTPDNSCluster cluster = 1; +} + +message ListHTTPDNSClustersRequest { + int64 offset = 1; + int64 size = 2; + string keyword = 3; +} + +message ListHTTPDNSClustersResponse { + repeated HTTPDNSCluster clusters = 1; +} + +message FindAllHTTPDNSClustersRequest { +} + +message FindAllHTTPDNSClustersResponse { + repeated HTTPDNSCluster clusters = 1; +} + +message UpdateHTTPDNSClusterDefaultRequest { + int64 clusterId = 1; +} + +message ListHTTPDNSNodesWithClusterIdRequest { + int64 clusterId = 1; +} + +message ListHTTPDNSNodesWithClusterIdResponse { + repeated HTTPDNSNode nodes = 1; +} diff --git a/EdgeCommon/pkg/rpc/protos/service_httpdns_domain.proto b/EdgeCommon/pkg/rpc/protos/service_httpdns_domain.proto new file mode 100644 index 0000000..21171b9 --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/service_httpdns_domain.proto @@ -0,0 +1,42 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +import "models/model_httpdns_domain.proto"; +import "models/rpc_messages.proto"; + +service HTTPDNSDomainService { + rpc createHTTPDNSDomain (CreateHTTPDNSDomainRequest) returns (CreateHTTPDNSDomainResponse); + rpc deleteHTTPDNSDomain (DeleteHTTPDNSDomainRequest) returns (RPCSuccess); + rpc updateHTTPDNSDomainStatus (UpdateHTTPDNSDomainStatusRequest) returns (RPCSuccess); + rpc listHTTPDNSDomainsWithAppId (ListHTTPDNSDomainsWithAppIdRequest) returns (ListHTTPDNSDomainsWithAppIdResponse); +} + +message CreateHTTPDNSDomainRequest { + int64 appDbId = 1; + string domain = 2; + bool isOn = 3; +} + +message CreateHTTPDNSDomainResponse { + int64 domainId = 1; +} + +message DeleteHTTPDNSDomainRequest { + int64 domainId = 1; +} + +message UpdateHTTPDNSDomainStatusRequest { + int64 domainId = 1; + bool isOn = 2; +} + +message ListHTTPDNSDomainsWithAppIdRequest { + int64 appDbId = 1; + string keyword = 2; +} + +message ListHTTPDNSDomainsWithAppIdResponse { + repeated HTTPDNSDomain domains = 1; +} diff --git a/EdgeCommon/pkg/rpc/protos/service_httpdns_node.proto b/EdgeCommon/pkg/rpc/protos/service_httpdns_node.proto new file mode 100644 index 0000000..052a6f7 --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/service_httpdns_node.proto @@ -0,0 +1,141 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +import "models/model_httpdns_node.proto"; +import "models/model_node_login.proto"; +import "models/rpc_messages.proto"; + +service HTTPDNSNodeService { + rpc createHTTPDNSNode (CreateHTTPDNSNodeRequest) returns (CreateHTTPDNSNodeResponse); + rpc updateHTTPDNSNode (UpdateHTTPDNSNodeRequest) returns (RPCSuccess); + rpc deleteHTTPDNSNode (DeleteHTTPDNSNodeRequest) returns (RPCSuccess); + rpc findHTTPDNSNode (FindHTTPDNSNodeRequest) returns (FindHTTPDNSNodeResponse); + rpc listHTTPDNSNodes (ListHTTPDNSNodesRequest) returns (ListHTTPDNSNodesResponse); + rpc updateHTTPDNSNodeStatus (UpdateHTTPDNSNodeStatusRequest) returns (RPCSuccess); + // 修改HTTPDNS节点登录信息 + rpc updateHTTPDNSNodeLogin (UpdateHTTPDNSNodeLoginRequest) returns (RPCSuccess); + + // 检查HTTPDNS节点新版本 + rpc checkHTTPDNSNodeLatestVersion (CheckHTTPDNSNodeLatestVersionRequest) returns (CheckHTTPDNSNodeLatestVersionResponse); + + // 下载最新HTTPDNS节点安装文件 + rpc downloadHTTPDNSNodeInstallationFile (DownloadHTTPDNSNodeInstallationFileRequest) returns (DownloadHTTPDNSNodeInstallationFileResponse); + + // 计算需要升级的HTTPDNS节点数量 + rpc countAllUpgradeHTTPDNSNodesWithClusterId (CountAllUpgradeHTTPDNSNodesWithClusterIdRequest) returns (RPCCountResponse); + + // 列出所有需要升级的HTTPDNS节点 + rpc findAllUpgradeHTTPDNSNodesWithClusterId (FindAllUpgradeHTTPDNSNodesWithClusterIdRequest) returns (FindAllUpgradeHTTPDNSNodesWithClusterIdResponse); + + // 升级单个HTTPDNS节点 + rpc upgradeHTTPDNSNode (UpgradeHTTPDNSNodeRequest) returns (RPCSuccess); +} + +message CreateHTTPDNSNodeRequest { + int64 clusterId = 1; + string name = 2; + string installDir = 3; + bool isOn = 4; +} + +message CreateHTTPDNSNodeResponse { + int64 nodeId = 1; +} + +message UpdateHTTPDNSNodeRequest { + int64 nodeId = 1; + string name = 2; + string installDir = 3; + bool isOn = 4; +} + +message DeleteHTTPDNSNodeRequest { + int64 nodeId = 1; +} + +message FindHTTPDNSNodeRequest { + int64 nodeId = 1; +} + +message FindHTTPDNSNodeResponse { + HTTPDNSNode node = 1; +} + +message ListHTTPDNSNodesRequest { + int64 clusterId = 1; +} + +message ListHTTPDNSNodesResponse { + repeated HTTPDNSNode nodes = 1; +} + +message UpdateHTTPDNSNodeStatusRequest { + int64 nodeId = 1; + bool isUp = 2; + bool isInstalled = 3; + bool isActive = 4; + bytes statusJSON = 5; + bytes installStatusJSON = 6; +} + +// 修改HTTPDNS节点登录信息 +message UpdateHTTPDNSNodeLoginRequest { + int64 nodeId = 1; + NodeLogin nodeLogin = 2; +} + +// 检查HTTPDNS节点新版本 +message CheckHTTPDNSNodeLatestVersionRequest { + string os = 1; + string arch = 2; + string currentVersion = 3; +} + +message CheckHTTPDNSNodeLatestVersionResponse { + bool hasNewVersion = 1; + string newVersion = 2; +} + +// 下载最新HTTPDNS节点安装文件 +message DownloadHTTPDNSNodeInstallationFileRequest { + string os = 1; + string arch = 2; + int64 chunkOffset = 3; +} + +message DownloadHTTPDNSNodeInstallationFileResponse { + bytes chunkData = 1; + string sum = 2; + int64 offset = 3; + string version = 4; + string filename = 5; +} + +// 计算需要升级的HTTPDNS节点数量 +message CountAllUpgradeHTTPDNSNodesWithClusterIdRequest { + int64 clusterId = 1; +} + +// 列出所有需要升级的HTTPDNS节点 +message FindAllUpgradeHTTPDNSNodesWithClusterIdRequest { + int64 clusterId = 1; +} + +message FindAllUpgradeHTTPDNSNodesWithClusterIdResponse { + repeated HTTPDNSNodeUpgrade nodes = 1; + + message HTTPDNSNodeUpgrade { + HTTPDNSNode node = 1; + string os = 2; + string arch = 3; + string oldVersion = 4; + string newVersion = 5; + } +} + +// 升级单个HTTPDNS节点 +message UpgradeHTTPDNSNodeRequest { + int64 nodeId = 1; +} diff --git a/EdgeCommon/pkg/rpc/protos/service_httpdns_rule.proto b/EdgeCommon/pkg/rpc/protos/service_httpdns_rule.proto new file mode 100644 index 0000000..2d23b5f --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/service_httpdns_rule.proto @@ -0,0 +1,44 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +import "models/model_httpdns_rule.proto"; +import "models/rpc_messages.proto"; + +service HTTPDNSRuleService { + rpc createHTTPDNSCustomRule (CreateHTTPDNSCustomRuleRequest) returns (CreateHTTPDNSCustomRuleResponse); + rpc updateHTTPDNSCustomRule (UpdateHTTPDNSCustomRuleRequest) returns (RPCSuccess); + rpc deleteHTTPDNSCustomRule (DeleteHTTPDNSCustomRuleRequest) returns (RPCSuccess); + rpc updateHTTPDNSCustomRuleStatus (UpdateHTTPDNSCustomRuleStatusRequest) returns (RPCSuccess); + rpc listHTTPDNSCustomRulesWithDomainId (ListHTTPDNSCustomRulesWithDomainIdRequest) returns (ListHTTPDNSCustomRulesWithDomainIdResponse); +} + +message CreateHTTPDNSCustomRuleRequest { + HTTPDNSCustomRule rule = 1; +} + +message CreateHTTPDNSCustomRuleResponse { + int64 ruleId = 1; +} + +message UpdateHTTPDNSCustomRuleRequest { + HTTPDNSCustomRule rule = 1; +} + +message DeleteHTTPDNSCustomRuleRequest { + int64 ruleId = 1; +} + +message UpdateHTTPDNSCustomRuleStatusRequest { + int64 ruleId = 1; + bool isOn = 2; +} + +message ListHTTPDNSCustomRulesWithDomainIdRequest { + int64 domainId = 1; +} + +message ListHTTPDNSCustomRulesWithDomainIdResponse { + repeated HTTPDNSCustomRule rules = 1; +} diff --git a/EdgeCommon/pkg/rpc/protos/service_httpdns_runtime_log.proto b/EdgeCommon/pkg/rpc/protos/service_httpdns_runtime_log.proto new file mode 100644 index 0000000..7aff93a --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/service_httpdns_runtime_log.proto @@ -0,0 +1,33 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +import "models/model_httpdns_runtime_log.proto"; + +service HTTPDNSRuntimeLogService { + rpc createHTTPDNSRuntimeLogs (CreateHTTPDNSRuntimeLogsRequest) returns (CreateHTTPDNSRuntimeLogsResponse); + rpc listHTTPDNSRuntimeLogs (ListHTTPDNSRuntimeLogsRequest) returns (ListHTTPDNSRuntimeLogsResponse); +} + +message CreateHTTPDNSRuntimeLogsRequest { + repeated HTTPDNSRuntimeLog logs = 1; +} + +message CreateHTTPDNSRuntimeLogsResponse { +} + +message ListHTTPDNSRuntimeLogsRequest { + string day = 1; + int64 clusterId = 2; + int64 nodeId = 3; + string level = 4; + string keyword = 5; + int64 offset = 6; + int64 size = 7; +} + +message ListHTTPDNSRuntimeLogsResponse { + repeated HTTPDNSRuntimeLog logs = 1; + int64 total = 2; +} diff --git a/EdgeCommon/pkg/rpc/protos/service_httpdns_sandbox.proto b/EdgeCommon/pkg/rpc/protos/service_httpdns_sandbox.proto new file mode 100644 index 0000000..5a95fbe --- /dev/null +++ b/EdgeCommon/pkg/rpc/protos/service_httpdns_sandbox.proto @@ -0,0 +1,45 @@ +syntax = "proto3"; +option go_package = "./pb"; + +package pb; + +import "models/rpc_messages.proto"; + +service HTTPDNSSandboxService { + rpc testHTTPDNSResolve (TestHTTPDNSResolveRequest) returns (TestHTTPDNSResolveResponse); +} + +message TestHTTPDNSResolveRequest { + int64 clusterId = 1; + string appId = 2; + string domain = 3; + string qtype = 4; + string clientIP = 5; + string sid = 6; + string sdkVersion = 7; + string os = 8; +} + +message HTTPDNSResolveRecord { + string type = 1; + string ip = 2; + int32 ttl = 3; + int32 weight = 4; + string line = 5; + string region = 6; +} + +message TestHTTPDNSResolveResponse { + string code = 1; + string message = 2; + string requestId = 3; + string domain = 4; + string qtype = 5; + int32 ttl = 6; + repeated HTTPDNSResolveRecord records = 7; + string clientIP = 8; + string clientRegion = 9; + string clientCarrier = 10; + string clientCountry = 11; + string summary = 12; +} diff --git a/EdgeCommon/pkg/rpc/protos/service_ns_node.proto b/EdgeCommon/pkg/rpc/protos/service_ns_node.proto index 0bed186..2546c88 100644 --- a/EdgeCommon/pkg/rpc/protos/service_ns_node.proto +++ b/EdgeCommon/pkg/rpc/protos/service_ns_node.proto @@ -25,6 +25,12 @@ service NSNodeService { // 计算需要升级的NS节点数量 rpc countAllUpgradeNSNodesWithNSClusterId (CountAllUpgradeNSNodesWithNSClusterIdRequest) returns (RPCCountResponse); + // 列出所有需要升级的NS节点 + rpc findAllUpgradeNSNodesWithNSClusterId (FindAllUpgradeNSNodesWithNSClusterIdRequest) returns (FindAllUpgradeNSNodesWithNSClusterIdResponse); + + // 升级单个NS节点 + rpc upgradeNSNode (UpgradeNSNodeRequest) returns (RPCSuccess); + // 创建NS节点 rpc createNSNode (CreateNSNodeRequest) returns (CreateNSNodeResponse); @@ -316,4 +322,26 @@ message FindNSNodeAPIConfigResponse { message UpdateNSNodeAPIConfigRequest { int64 nsNodeId = 1; bytes apiNodeAddrsJSON = 2; +} + +// 列出所有需要升级的NS节点 +message FindAllUpgradeNSNodesWithNSClusterIdRequest { + int64 nsClusterId = 1; +} + +message FindAllUpgradeNSNodesWithNSClusterIdResponse { + repeated NSNodeUpgrade nodes = 1; + + message NSNodeUpgrade { + NSNode nsNode = 1; + string os = 2; + string arch = 3; + string oldVersion = 4; + string newVersion = 5; + } +} + +// 升级单个NS节点 +message UpgradeNSNodeRequest { + int64 nsNodeId = 1; } \ No newline at end of file diff --git a/EdgeCommon/pkg/rpc/protos/service_user.proto b/EdgeCommon/pkg/rpc/protos/service_user.proto index 940acac..a490de1 100644 --- a/EdgeCommon/pkg/rpc/protos/service_user.proto +++ b/EdgeCommon/pkg/rpc/protos/service_user.proto @@ -148,6 +148,7 @@ message UpdateUserRequest { bool isOn = 9; int64 nodeClusterId = 10; string bandwidthAlgo = 11; + bytes httpdnsClusterIdsJSON = 12; // HTTPDNS关联集群ID列表 } // 删除用户 diff --git a/EdgeCommon/pkg/systemconfigs/settings.go b/EdgeCommon/pkg/systemconfigs/settings.go index 45224fd..26f3f7a 100644 --- a/EdgeCommon/pkg/systemconfigs/settings.go +++ b/EdgeCommon/pkg/systemconfigs/settings.go @@ -3,18 +3,19 @@ package systemconfigs type SettingCode = string const ( - SettingCodeNodeMonitor SettingCode = "nodeMonitor" // 监控节点状态 - SettingCodeClusterHealthCheck SettingCode = "clusterHealthCheck" // 集群健康检查 - SettingCodeIPListVersion SettingCode = "ipListVersion" // IP名单的版本号 - SettingCodeAdminSecurityConfig SettingCode = "adminSecurityConfig" // 管理员安全设置 - SettingCodeAdminUIConfig SettingCode = "adminUIConfig" // 管理员界面设置 - SettingCodeDatabaseConfigSetting SettingCode = "databaseConfig" // 数据库相关配置 - SettingCodeAccessLogQueue SettingCode = "accessLogQueue" // 访问日志队列 - SettingCodeCheckUpdates SettingCode = "checkUpdates" // 检查自动更新配置 + SettingCodeNodeMonitor SettingCode = "nodeMonitor" // 监控节点状态 + SettingCodeClusterHealthCheck SettingCode = "clusterHealthCheck" // 集群健康检查 + SettingCodeIPListVersion SettingCode = "ipListVersion" // IP名单版本号 + SettingCodeAdminSecurityConfig SettingCode = "adminSecurityConfig" // 管理端安全设置 + SettingCodeAdminUIConfig SettingCode = "adminUIConfig" // 管理端界面设置 + SettingCodeDatabaseConfigSetting SettingCode = "databaseConfig" // 数据库配置 + SettingCodeAccessLogQueue SettingCode = "accessLogQueue" // 访问日志队列 + SettingCodeCheckUpdates SettingCode = "checkUpdates" // 自动更新配置 + SettingCodeUserServerConfig SettingCode = "userServerConfig" // 用户服务设置 + SettingCodeUserRegisterConfig SettingCode = "userRegisterConfig" // 用户注册配置 + SettingCodeUserUIConfig SettingCode = "userUIConfig" // 用户界面配置 + SettingCodeStandaloneInstanceInitialized SettingCode = "standaloneInstanceInitialized" // 单体实例初始化状态 - SettingCodeUserServerConfig SettingCode = "userServerConfig" // 用户服务设置 - SettingCodeUserRegisterConfig SettingCode = "userRegisterConfig" // 用户注册配置 - SettingCodeUserUIConfig SettingCode = "userUIConfig" // 用户界面配置 - - SettingCodeStandaloneInstanceInitialized SettingCode = "standaloneInstanceInitialized" // 单体实例是否已经被初始化：0 未被初始化, 1 已经成功初始化 + SettingCodeHTTPDNSDefaultBackupClusterId SettingCode = "httpdnsDefaultBackupClusterId" // HTTPDNS默认备用集群ID + SettingCodeUpgradeConfig SettingCode = "upgradeConfig" // 升级设置 ) diff --git a/EdgeCommon/pkg/systemconfigs/upgrade_config.go b/EdgeCommon/pkg/systemconfigs/upgrade_config.go new file mode 100644 index 0000000..e511cd3 --- /dev/null +++ b/EdgeCommon/pkg/systemconfigs/upgrade_config.go @@ -0,0 +1,12 @@ +package systemconfigs + +// UpgradeConfig 升级设置 +type UpgradeConfig struct { + AutoUpgrade bool `json:"autoUpgrade"` // 是否开启自动升级（控制EdgeNode、EdgeDNS、EdgeHTTPDNS三个模块） +} + +func NewUpgradeConfig() *UpgradeConfig { + return &UpgradeConfig{ + AutoUpgrade: false, + } +} diff --git a/EdgeCommon/pkg/userconfigs/user_features.go b/EdgeCommon/pkg/userconfigs/user_features.go index 2df5b35..84a3fb9 100644 --- a/EdgeCommon/pkg/userconfigs/user_features.go +++ b/EdgeCommon/pkg/userconfigs/user_features.go @@ -9,6 +9,7 @@ type UserFeatureCode = string const ( UserFeatureCodePlan UserFeatureCode = "plan" + UserFeatureCodeHTTPDNS UserFeatureCode = "httpdns" UserFeatureCodeServerTCP UserFeatureCode = "server.tcp" UserFeatureCodeServerTCPPort UserFeatureCode = "server.tcp.port" @@ -57,7 +58,7 @@ func (this *UserFeature) ToPB() *pb.UserFeature { func FindAllUserFeatures() []*UserFeature { return []*UserFeature{ { - Name: "记录访问日志", + Name: "访问日志记录", Code: UserFeatureCodeServerAccessLog, Description: "用户可以开启服务的访问日志。", SupportPlan: true, @@ -105,7 +106,7 @@ func FindAllUserFeatures() []*UserFeature { SupportPlan: false, }, { - Name: "开启WAF", + Name: "WAF", Code: UserFeatureCodeServerWAF, Description: "用户可以开启WAF功能并可以设置黑白名单等。", SupportPlan: true, @@ -135,7 +136,7 @@ func FindAllUserFeatures() []*UserFeature { SupportPlan: true, }, { - Name: "页面优化", + Name: "页面动态加密", Code: UserFeatureCodeServerOptimization, Description: "用户可以开启页面优化功能。", SupportPlan: true, @@ -212,6 +213,7 @@ func FindAllUserFeatures() []*UserFeature { Description: "用户可以购买和管理套餐。", SupportPlan: false, }, + // HTTPDNS 功能已改为通过用户设置页面全局开关控制，不再作为单独的功能选项 } } diff --git a/EdgeCommon/pkg/userconfigs/user_register_config.go b/EdgeCommon/pkg/userconfigs/user_register_config.go index 175009e..862c732 100644 --- a/EdgeCommon/pkg/userconfigs/user_register_config.go +++ b/EdgeCommon/pkg/userconfigs/user_register_config.go @@ -52,6 +52,9 @@ type UserRegisterConfig struct { // 开通DNS服务 NSIsOn bool `json:"nsIsOn"` // 是否开启智能DNS服务 + // 开通HTTPDNS服务 + HTTPDNSIsOn bool `json:"httpdnsIsOn"` // 是否开启用户端HTTPDNS服务 + HTTPDNSDefaultClusterIds []int64 `json:"httpdnsDefaultClusterIds"` // HTTPDNS默认集群ID列表 // 开通高防服务 ADIsOn bool `json:"adIsOn"` // 是否开启高防服务 @@ -63,6 +66,7 @@ func DefaultUserRegisterConfig() *UserRegisterConfig { ComplexPassword: true, CDNIsOn: true, NSIsOn: false, + HTTPDNSIsOn: false, Features: []string{ UserFeatureCodeServerAccessLog, UserFeatureCodeServerViewAccessLog, diff --git a/EdgeDNS/internal/const/const.go b/EdgeDNS/internal/const/const.go index 6eea4be..1770316 100644 --- a/EdgeDNS/internal/const/const.go +++ b/EdgeDNS/internal/const/const.go @@ -1,7 +1,7 @@ package teaconst const ( - Version = "1.4.7" //1.3.8.2 + Version = "1.4.9" //1.3.8.2 ProductName = "Edge DNS" ProcessName = "edge-dns" diff --git a/EdgeDNS/internal/firewalls/ddos_protection.go b/EdgeDNS/internal/firewalls/ddos_protection.go index c852a08..45b38fa 100644 --- a/EdgeDNS/internal/firewalls/ddos_protection.go +++ b/EdgeDNS/internal/firewalls/ddos_protection.go @@ -173,6 +173,10 @@ func (this *DDoSProtectionManager) addTCPRules(tcpConfig *ddosconfigs.TCPConfig) var ports = []int32{} for _, portConfig := range tcpConfig.Ports { + // 校验端口范围 + if portConfig.Port <= 0 || portConfig.Port > 65535 { + continue + } if !lists.ContainsInt32(ports, portConfig.Port) { ports = append(ports, portConfig.Port) } @@ -367,7 +371,19 @@ func (this *DDoSProtectionManager) encodeUserData(attrs []string) string { return "" } - return "ZZ" + strings.Join(attrs, "_") + "ZZ" + // 清洗每个属性值，只保留字母、数字和横杠 + var safeAttrs = make([]string, len(attrs)) + for i, attr := range attrs { + var safe strings.Builder + for _, c := range attr { + if (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' { + safe.WriteRune(c) + } + } + safeAttrs[i] = safe.String() + } + + return "ZZ" + strings.Join(safeAttrs, "_") + "ZZ" } // 解码user data diff --git a/EdgeDNS/internal/nodes/dns_node.go b/EdgeDNS/internal/nodes/dns_node.go index 5c5d15c..a2c7d11 100644 --- a/EdgeDNS/internal/nodes/dns_node.go +++ b/EdgeDNS/internal/nodes/dns_node.go @@ -31,6 +31,7 @@ import ( "os" "os/exec" "os/signal" + "regexp" "runtime" "runtime/debug" "syscall" @@ -328,6 +329,13 @@ func (this *DNSNode) start() { apiConfig.NumberId = config.Id } + // 验证 NodeId 防止路径遍历 + var nodeIdRegexp = regexp.MustCompile(`^[a-zA-Z0-9_\-]+$`) + if !nodeIdRegexp.MatchString(config.NodeId) { + remotelogs.Error("NODE", "invalid NodeId: contains illegal characters") + return + } + var db = dbs.NewDB(Tea.Root + "/data/data-" + types.String(config.Id) + "-" + config.NodeId + "-v0.1.0.db") err = db.Init() if err != nil { diff --git a/EdgeDNS/internal/nodes/server.go b/EdgeDNS/internal/nodes/server.go index 2ebab02..e4f3630 100644 --- a/EdgeDNS/internal/nodes/server.go +++ b/EdgeDNS/internal/nodes/server.go @@ -247,6 +247,15 @@ func (this *Server) parseAction(questionName string, remoteAddr *string) (string return "", errors.New("decode question option failed: " + err.Error()) } else { var ip = m.GetString("ip") + // 验证 IP 地址合法性，防止 IP 欺骗 + parsedIP := net.ParseIP(ip) + if parsedIP == nil { + return "", errors.New("invalid IP address in setRemoteAddr: " + ip) + } + // 拒绝回环地址和未指定地址 + if parsedIP.IsLoopback() || parsedIP.IsUnspecified() { + return "", errors.New("disallowed IP address in setRemoteAddr: " + ip) + } *remoteAddr = ip } } diff --git a/EdgeHttpDNS/.gitignore b/EdgeHttpDNS/.gitignore new file mode 100644 index 0000000..419bf8d --- /dev/null +++ b/EdgeHttpDNS/.gitignore @@ -0,0 +1,4 @@ +*.zip +edge-dns +logs/ +data/ diff --git a/EdgeHttpDNS/bin/edge-httpdns b/EdgeHttpDNS/bin/edge-httpdns new file mode 100644 index 0000000..6ce2729 Binary files /dev/null and b/EdgeHttpDNS/bin/edge-httpdns differ diff --git a/EdgeHttpDNS/bin/edge-httpdns.exe b/EdgeHttpDNS/bin/edge-httpdns.exe new file mode 100644 index 0000000..d41c3e3 Binary files /dev/null and b/EdgeHttpDNS/bin/edge-httpdns.exe differ diff --git a/EdgeHttpDNS/build/build-all.sh b/EdgeHttpDNS/build/build-all.sh new file mode 100644 index 0000000..119d58b --- /dev/null +++ b/EdgeHttpDNS/build/build-all.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +./build.sh linux amd64 +# ./build.sh linux arm64 +# ./build.sh darwin amd64 +# ./build.sh darwin arm64 diff --git a/EdgeHttpDNS/build/build.sh b/EdgeHttpDNS/build/build.sh new file mode 100644 index 0000000..adc3efb --- /dev/null +++ b/EdgeHttpDNS/build/build.sh @@ -0,0 +1,150 @@ +#!/usr/bin/env bash +set -e + +function build() { + ROOT=$(dirname "$0") + NAME="edge-httpdns" + VERSION=$(lookup-version "$ROOT"/../internal/const/const.go) + DIST=$ROOT/"../dist/${NAME}" + OS=${1} + ARCH=${2} + + if [ -z "$OS" ]; then + echo "usage: build.sh OS ARCH" + exit 1 + fi + if [ -z "$ARCH" ]; then + echo "usage: build.sh OS ARCH" + exit 1 + fi + + ZIP_PATH=$(which zip) + if [ -z "$ZIP_PATH" ]; then + echo "we need 'zip' command to compress files" + exit 1 + fi + + echo "building v${VERSION}/${OS}/${ARCH} ..." + ZIP="${NAME}-${OS}-${ARCH}-v${VERSION}.zip" + + rm -rf "$DIST" + mkdir -p "$DIST"/bin + mkdir -p "$DIST"/configs + mkdir -p "$DIST"/logs + mkdir -p "$DIST"/data + + cp "$ROOT"/configs/api_httpdns.template.yaml "$DIST"/configs + copy_fluent_bit_assets "$ROOT" "$DIST" "$OS" "$ARCH" || exit 1 + + env GOOS="${OS}" GOARCH="${ARCH}" CGO_ENABLED=1 \ + go build -trimpath -o "$DIST"/bin/${NAME} -ldflags="-s -w" "$ROOT"/../cmd/edge-httpdns/main.go + + if [ ! -f "$DIST"/bin/${NAME} ]; then + echo "build failed!" + exit 1 + fi + + # delete hidden files + find "$DIST" -name ".DS_Store" -delete + find "$DIST" -name ".gitignore" -delete + + echo "zip files ..." + cd "${DIST}/../" || exit 1 + if [ -f "${ZIP}" ]; then + rm -f "${ZIP}" + fi + zip -r -X -q "${ZIP}" ${NAME}/ + rm -rf "${NAME}" + cd - || exit 1 + + echo "OK" +} + +function copy_fluent_bit_assets() { + ROOT=$1 + DIST=$2 + OS=$3 + ARCH=$4 + FLUENT_ROOT="$ROOT/../../deploy/fluent-bit" + FLUENT_DIST="$DIST/deploy/fluent-bit" + + if [ ! -d "$FLUENT_ROOT" ]; then + echo "[error] fluent-bit source directory not found: $FLUENT_ROOT" + return 1 + fi + verify_fluent_bit_package_matrix "$FLUENT_ROOT" "$ARCH" || return 1 + + rm -rf "$FLUENT_DIST" + mkdir -p "$FLUENT_DIST" + + for file in fluent-bit.conf fluent-bit-dns.conf fluent-bit-https.conf fluent-bit-dns-https.conf fluent-bit-windows.conf fluent-bit-windows-https.conf parsers.conf clickhouse-upstream.conf clickhouse-upstream-windows.conf README.md; do + if [ -f "$FLUENT_ROOT/$file" ]; then + cp "$FLUENT_ROOT/$file" "$FLUENT_DIST/" + fi + done + + if [ "$OS" = "linux" ]; then + PACKAGE_SRC="$FLUENT_ROOT/packages/linux-$ARCH" + PACKAGE_DST="$FLUENT_DIST/packages/linux-$ARCH" + if [ -d "$PACKAGE_SRC" ]; then + mkdir -p "$PACKAGE_DST" + cp -R "$PACKAGE_SRC/." "$PACKAGE_DST/" + else + echo "[error] fluent-bit package directory not found: $PACKAGE_SRC" + return 1 + fi + fi + + rm -f "$FLUENT_DIST/.gitignore" + rm -f "$FLUENT_DIST"/logs.db* + rm -rf "$FLUENT_DIST/storage" + + return 0 +} + +function verify_fluent_bit_package_matrix() { + FLUENT_ROOT=$1 + ARCH=$2 + REQUIRED_FILES=() + if [ "$ARCH" = "amd64" ]; then + REQUIRED_FILES=( + "packages/linux-amd64/fluent-bit_4.2.2_amd64.deb" + "packages/linux-amd64/fluent-bit-4.2.2-1.x86_64.rpm" + ) + elif [ "$ARCH" = "arm64" ]; then + REQUIRED_FILES=( + "packages/linux-arm64/fluent-bit_4.2.2_arm64.deb" + "packages/linux-arm64/fluent-bit-4.2.2-1.aarch64.rpm" + ) + else + echo "[error] unsupported arch for fluent-bit package validation: $ARCH" + return 1 + fi + + MISSING=0 + for FILE in "${REQUIRED_FILES[@]}"; do + if [ ! -f "$FLUENT_ROOT/$FILE" ]; then + echo "[error] fluent-bit matrix package missing: $FLUENT_ROOT/$FILE" + MISSING=1 + fi + done + + if [ "$MISSING" -ne 0 ]; then + return 1 + fi + return 0 +} + +function lookup-version() { + FILE=$1 + VERSION_DATA=$(cat "$FILE") + re="Version[ ]+=[ ]+\"([0-9.]+)\"" + if [[ $VERSION_DATA =~ $re ]]; then + echo "${BASH_REMATCH[1]}" + else + echo "could not match version" + exit 1 + fi +} + +build "$1" "$2" diff --git a/EdgeHttpDNS/cmd/edge-httpdns/main.go b/EdgeHttpDNS/cmd/edge-httpdns/main.go new file mode 100644 index 0000000..f85e62e --- /dev/null +++ b/EdgeHttpDNS/cmd/edge-httpdns/main.go @@ -0,0 +1,43 @@ +package main + +import ( + "fmt" + "os" + + "github.com/TeaOSLab/EdgeHttpDNS/internal/apps" + "github.com/TeaOSLab/EdgeHttpDNS/internal/configs" + teaconst "github.com/TeaOSLab/EdgeHttpDNS/internal/const" + "github.com/TeaOSLab/EdgeHttpDNS/internal/nodes" +) + +func main() { + app := apps.NewAppCmd(). + Version(teaconst.Version). + Product(teaconst.ProductName). + Usage(teaconst.ProcessName + " [-v|start|stop|restart|status|service|daemon]") + + app.On("start:before", func() { + _, err := configs.LoadAPIConfig() + if err != nil { + fmt.Println("[ERROR]start failed: load config from '" + configs.ConfigFileName + "' failed: " + err.Error()) + os.Exit(1) + } + }) + + app.On("daemon", func() { + nodes.NewHTTPDNSNode().Daemon() + }) + + app.On("service", func() { + err := nodes.NewHTTPDNSNode().InstallSystemService() + if err != nil { + fmt.Println("[ERROR]install failed: " + err.Error()) + return + } + fmt.Println("done") + }) + + app.Run(func() { + nodes.NewHTTPDNSNode().Run() + }) +} diff --git a/EdgeHttpDNS/edge-httpdns.exe b/EdgeHttpDNS/edge-httpdns.exe new file mode 100644 index 0000000..0311351 Binary files /dev/null and b/EdgeHttpDNS/edge-httpdns.exe differ diff --git a/EdgeHttpDNS/go.mod b/EdgeHttpDNS/go.mod new file mode 100644 index 0000000..fec8371 --- /dev/null +++ b/EdgeHttpDNS/go.mod @@ -0,0 +1,28 @@ +module github.com/TeaOSLab/EdgeHttpDNS + +go 1.25 + +replace github.com/TeaOSLab/EdgeCommon => ../EdgeCommon + +require ( + github.com/TeaOSLab/EdgeCommon v0.0.0-00010101000000-000000000000 + github.com/iwind/TeaGo v0.0.0-20240411075713-6c1fc9aca7b6 + github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4 + google.golang.org/grpc v1.78.0 + gopkg.in/yaml.v3 v3.0.1 +) + +require ( + github.com/miekg/dns v1.1.72 // indirect + github.com/oschwald/geoip2-golang v1.13.0 // indirect + github.com/oschwald/maxminddb-golang v1.13.0 // indirect + golang.org/x/mod v0.31.0 // indirect + golang.org/x/net v0.48.0 // indirect + golang.org/x/sync v0.19.0 // indirect + golang.org/x/sys v0.39.0 // indirect + golang.org/x/text v0.32.0 // indirect + golang.org/x/tools v0.40.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect + google.golang.org/protobuf v1.36.10 // indirect + gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect +) diff --git a/EdgeHttpDNS/go.sum b/EdgeHttpDNS/go.sum new file mode 100644 index 0000000..fe5cf68 --- /dev/null +++ b/EdgeHttpDNS/go.sum @@ -0,0 +1,69 @@ +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/iwind/TeaGo v0.0.0-20240411075713-6c1fc9aca7b6 h1:dS3pTxrLlDQxdoxSUcHkHnr3LHpsBIXv8v2/xw65RN8= +github.com/iwind/TeaGo v0.0.0-20240411075713-6c1fc9aca7b6/go.mod h1:SfqVbWyIPdVflyA6lMgicZzsoGS8pyeLiTRe8/CIpGI= +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/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI= +github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs= +github.com/oschwald/geoip2-golang v1.13.0 h1:Q44/Ldc703pasJeP5V9+aFSZFmBN7DKHbNsSFzQATJI= +github.com/oschwald/geoip2-golang v1.13.0/go.mod h1:P9zG+54KPEFOliZ29i7SeYZ/GM6tfEL+rgSn03hYuUo= +github.com/oschwald/maxminddb-golang v1.13.0 h1:R8xBorY71s84yO06NgTmQvqvTvlS/bnYZrrWX1MElnU= +github.com/oschwald/maxminddb-golang v1.13.0/go.mod h1:BU0z8BfFVhi1LQaonTwwGQlsHUEu9pWNdMfmq4ztm0o= +go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= +go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= +go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= +go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= +go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= +go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= +go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= +go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= +go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= +go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= +go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= +golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI= +golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg= +golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= +golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= +golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU= +golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY= +golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= +golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk= +golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= +golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= +golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU= +golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY= +golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA= +golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc= +gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= +gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= +google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc= +google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U= +google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= +google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= +gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/EdgeHttpDNS/internal/accesslogs/httpdns_file_writer.go b/EdgeHttpDNS/internal/accesslogs/httpdns_file_writer.go new file mode 100644 index 0000000..a6c66dd --- /dev/null +++ b/EdgeHttpDNS/internal/accesslogs/httpdns_file_writer.go @@ -0,0 +1,172 @@ +package accesslogs + +import ( + "encoding/json" + "fmt" + "log" + "os" + "path/filepath" + "strings" + "sync" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" + "gopkg.in/natefinch/lumberjack.v2" +) + +const ( + defaultHTTPDNSLogDir = "/var/log/edge/edge-httpdns" + envHTTPDNSLogDir = "EDGE_HTTPDNS_LOG_DIR" +) + +var ( + sharedHTTPDNSFileWriter *HTTPDNSFileWriter + sharedHTTPDNSFileWriterOnce sync.Once +) + +// SharedHTTPDNSFileWriter 返回 HTTPDNS 本地日志写入器（单例）. +func SharedHTTPDNSFileWriter() *HTTPDNSFileWriter { + sharedHTTPDNSFileWriterOnce.Do(func() { + sharedHTTPDNSFileWriter = NewHTTPDNSFileWriter() + }) + return sharedHTTPDNSFileWriter +} + +// HTTPDNSFileWriter 将 HTTPDNS 访问日志以 JSON Lines 写入本地文件，供 Fluent Bit 采集。 +type HTTPDNSFileWriter struct { + dir string + mu sync.Mutex + file *lumberjack.Logger + rotateConfig *serverconfigs.AccessLogRotateConfig + inited bool +} + +// NewHTTPDNSFileWriter 创建 HTTPDNS 本地日志写入器. +func NewHTTPDNSFileWriter() *HTTPDNSFileWriter { + logDir := resolveDefaultHTTPDNSLogDir() + return &HTTPDNSFileWriter{ + dir: logDir, + rotateConfig: serverconfigs.NewDefaultAccessLogRotateConfig(), + } +} + +func resolveDefaultHTTPDNSLogDir() string { + logDir := strings.TrimSpace(os.Getenv(envHTTPDNSLogDir)) + if logDir == "" { + return defaultHTTPDNSLogDir + } + return logDir +} + +// SetDir 更新日志目录并重置文件句柄。 +func (w *HTTPDNSFileWriter) SetDir(dir string) { + if strings.TrimSpace(dir) == "" { + dir = resolveDefaultHTTPDNSLogDir() + } + + w.mu.Lock() + defer w.mu.Unlock() + + if dir == w.dir { + return + } + + if w.file != nil { + _ = w.file.Close() + w.file = nil + } + w.inited = false + w.dir = dir +} + +// Dir 返回当前日志目录. +func (w *HTTPDNSFileWriter) Dir() string { + return w.dir +} + +// EnsureInit 在启动时预创建目录与 access.log. +func (w *HTTPDNSFileWriter) EnsureInit() error { + if w.dir == "" { + return nil + } + return w.init() +} + +func (w *HTTPDNSFileWriter) init() error { + w.mu.Lock() + defer w.mu.Unlock() + + if w.inited && w.file != nil { + return nil + } + + if w.dir == "" { + return nil + } + + if err := os.MkdirAll(w.dir, 0755); err != nil { + log.Println("[HTTPDNS_ACCESS_LOG]mkdir log dir failed:", err.Error()) + return err + } + + rotateConfig := w.rotateConfig.Normalize() + w.file = &lumberjack.Logger{ + Filename: filepath.Join(w.dir, "access.log"), + MaxSize: rotateConfig.MaxSizeMB, + MaxBackups: rotateConfig.MaxBackups, + MaxAge: rotateConfig.MaxAgeDays, + Compress: *rotateConfig.Compress, + LocalTime: *rotateConfig.LocalTime, + } + + w.inited = true + return nil +} + +// WriteBatch 批量写入 HTTPDNS 访问日志. +func (w *HTTPDNSFileWriter) WriteBatch(logs []*pb.HTTPDNSAccessLog) { + if len(logs) == 0 || w.dir == "" { + return + } + if err := w.init(); err != nil { + return + } + + w.mu.Lock() + file := w.file + w.mu.Unlock() + if file == nil { + return + } + + for _, logItem := range logs { + ingestLog := FromPBAccessLog(logItem) + if ingestLog == nil { + continue + } + line, err := json.Marshal(ingestLog) + if err != nil { + continue + } + _, _ = file.Write(append(line, '\n')) + } +} + +// Close 关闭日志文件. +func (w *HTTPDNSFileWriter) Close() error { + w.mu.Lock() + defer w.mu.Unlock() + + if w.file == nil { + return nil + } + + err := w.file.Close() + w.file = nil + w.inited = false + if err != nil { + log.Println(fmt.Sprintf("[HTTPDNS_ACCESS_LOG]close access.log failed: %v", err)) + return err + } + return nil +} diff --git a/EdgeHttpDNS/internal/accesslogs/httpdns_ingest_log.go b/EdgeHttpDNS/internal/accesslogs/httpdns_ingest_log.go new file mode 100644 index 0000000..60ad141 --- /dev/null +++ b/EdgeHttpDNS/internal/accesslogs/httpdns_ingest_log.go @@ -0,0 +1,57 @@ +package accesslogs + +import "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + +// HTTPDNSIngestLog HTTPDNS 访问日志单行结构（JSONEachRow），字段与 +// ClickHouse httpdns_access_logs_ingest 表一一对应。 +type HTTPDNSIngestLog struct { + Timestamp int64 `json:"timestamp"` + RequestId string `json:"request_id"` + ClusterId int64 `json:"cluster_id"` + NodeId int64 `json:"node_id"` + AppId string `json:"app_id"` + AppName string `json:"app_name"` + Domain string `json:"domain"` + QType string `json:"qtype"` + ClientIP string `json:"client_ip"` + ClientRegion string `json:"client_region"` + Carrier string `json:"carrier"` + SDKVersion string `json:"sdk_version"` + OS string `json:"os"` + ResultIPs string `json:"result_ips"` + Status string `json:"status"` + ErrorCode string `json:"error_code"` + CostMs int32 `json:"cost_ms"` + CreatedAt int64 `json:"created_at"` + Day string `json:"day"` + Summary string `json:"summary"` +} + +// FromPBAccessLog 将 pb.HTTPDNSAccessLog 转为本地 ingest 结构。 +func FromPBAccessLog(log *pb.HTTPDNSAccessLog) *HTTPDNSIngestLog { + if log == nil { + return nil + } + return &HTTPDNSIngestLog{ + Timestamp: log.GetCreatedAt(), + RequestId: log.GetRequestId(), + ClusterId: log.GetClusterId(), + NodeId: log.GetNodeId(), + AppId: log.GetAppId(), + AppName: log.GetAppName(), + Domain: log.GetDomain(), + QType: log.GetQtype(), + ClientIP: log.GetClientIP(), + ClientRegion: log.GetClientRegion(), + Carrier: log.GetCarrier(), + SDKVersion: log.GetSdkVersion(), + OS: log.GetOs(), + ResultIPs: log.GetResultIPs(), + Status: log.GetStatus(), + ErrorCode: log.GetErrorCode(), + CostMs: log.GetCostMs(), + CreatedAt: log.GetCreatedAt(), + Day: log.GetDay(), + Summary: log.GetSummary(), + } +} diff --git a/EdgeHttpDNS/internal/apps/app_cmd.go b/EdgeHttpDNS/internal/apps/app_cmd.go new file mode 100644 index 0000000..d7db2f8 --- /dev/null +++ b/EdgeHttpDNS/internal/apps/app_cmd.go @@ -0,0 +1,153 @@ +package apps + +import ( + "fmt" + "os" + "os/exec" + "runtime" + "time" + + teaconst "github.com/TeaOSLab/EdgeHttpDNS/internal/const" + "github.com/iwind/TeaGo/maps" + "github.com/iwind/gosock/pkg/gosock" +) + +type AppCmd struct { + product string + version string + usage string + directives map[string]func() + sock *gosock.Sock +} + +func NewAppCmd() *AppCmd { + return &AppCmd{ + directives: map[string]func(){}, + sock: gosock.NewTmpSock(teaconst.ProcessName), + } +} + +func (a *AppCmd) Product(product string) *AppCmd { + a.product = product + return a +} + +func (a *AppCmd) Version(version string) *AppCmd { + a.version = version + return a +} + +func (a *AppCmd) Usage(usage string) *AppCmd { + a.usage = usage + return a +} + +func (a *AppCmd) On(arg string, callback func()) { + a.directives[arg] = callback +} + +func (a *AppCmd) Run(main func()) { + args := os.Args[1:] + if len(args) == 0 { + main() + return + } + + switch args[0] { + case "-v", "version", "-version", "--version": + fmt.Println(a.product+" v"+a.version, "(build:", runtimeString()+")") + return + case "help", "-h", "--help": + fmt.Println(a.product + " v" + a.version) + fmt.Println("Usage:") + fmt.Println(" " + a.usage) + return + case "start": + a.runDirective("start:before") + a.runStart() + return + case "stop": + a.runStop() + return + case "restart": + a.runStop() + time.Sleep(1 * time.Second) + a.runDirective("start:before") + a.runStart() + return + case "status": + a.runStatus() + return + default: + if callback, ok := a.directives[args[0]]; ok { + callback() + return + } + fmt.Println("unknown command '" + args[0] + "'") + } +} + +func (a *AppCmd) runStart() { + pid := a.getPID() + if pid > 0 { + fmt.Println(a.product+" already started, pid:", pid) + return + } + + exe, _ := os.Executable() + if len(exe) == 0 { + exe = os.Args[0] + } + cmd := exec.Command(exe) + cmd.Env = append(os.Environ(), "EdgeBackground=on") + err := cmd.Start() + if err != nil { + fmt.Println(a.product+" start failed:", err.Error()) + return + } + + fmt.Println(a.product+" started, pid:", cmd.Process.Pid) +} + +func (a *AppCmd) runStop() { + pid := a.getPID() + if pid == 0 { + fmt.Println(a.product + " not started") + return + } + + _, _ = a.sock.Send(&gosock.Command{Code: "stop"}) + fmt.Println(a.product+" stopped, pid:", pid) +} + +func (a *AppCmd) runStatus() { + pid := a.getPID() + if pid == 0 { + fmt.Println(a.product + " not started") + return + } + fmt.Println(a.product+" is running, pid:", pid) +} + +func (a *AppCmd) runDirective(name string) { + if callback, ok := a.directives[name]; ok && callback != nil { + callback() + } +} + +func (a *AppCmd) getPID() int { + if !a.sock.IsListening() { + return 0 + } + + reply, err := a.sock.Send(&gosock.Command{Code: "pid"}) + if err != nil { + return 0 + } + + return maps.NewMap(reply.Params).GetInt("pid") +} + +func runtimeString() string { + return runtime.GOOS + "/" + runtime.GOARCH +} diff --git a/EdgeHttpDNS/internal/configs/api_config.go b/EdgeHttpDNS/internal/configs/api_config.go new file mode 100644 index 0000000..05e0739 --- /dev/null +++ b/EdgeHttpDNS/internal/configs/api_config.go @@ -0,0 +1,171 @@ +package configs + +import ( + "errors" + "os" + "path/filepath" + + "github.com/iwind/TeaGo/Tea" + "gopkg.in/yaml.v3" +) + +const ConfigFileName = "api_httpdns.yaml" +const oldConfigFileName = "api.yaml" + +var sharedAPIConfig *APIConfig + +type APIConfig struct { + OldRPC struct { + Endpoints []string `yaml:"endpoints"` + DisableUpdate bool `yaml:"disableUpdate"` + } `yaml:"rpc,omitempty"` + + RPCEndpoints []string `yaml:"rpc.endpoints,flow" json:"rpc.endpoints"` + RPCDisableUpdate bool `yaml:"rpc.disableUpdate" json:"rpc.disableUpdate"` + + NodeId string `yaml:"nodeId"` + Secret string `yaml:"secret"` + + ListenAddr string `yaml:"listenAddr"` + + HTTPSListenAddr string `yaml:"https.listenAddr" json:"https.listenAddr"` + HTTPSCert string `yaml:"https.cert" json:"https.cert"` + HTTPSKey string `yaml:"https.key" json:"https.key"` + + LogDir string `yaml:"logDir" json:"logDir"` +} + +func SharedAPIConfig() (*APIConfig, error) { + if sharedAPIConfig != nil { + return sharedAPIConfig, nil + } + + config, err := LoadAPIConfig() + if err != nil { + return nil, err + } + sharedAPIConfig = config + return config, nil +} + +func LoadAPIConfig() (*APIConfig, error) { + for _, filename := range []string{ConfigFileName, oldConfigFileName} { + var loadedData []byte + var loadedPath string + for _, candidate := range findConfigCandidates(filename) { + data, err := os.ReadFile(candidate) + if err != nil { + if os.IsNotExist(err) { + continue + } + return nil, err + } + loadedData = data + loadedPath = candidate + break + } + + if len(loadedData) == 0 { + if filename == oldConfigFileName { + continue + } + return nil, errors.New("no config file '" + ConfigFileName + "' found") + } + + config := &APIConfig{} + err := yaml.Unmarshal(loadedData, config) + if err != nil { + return nil, err + } + + err = config.Init() + if err != nil { + return nil, err + } + + if filename == oldConfigFileName { + config.OldRPC.Endpoints = nil + // 优先写回当前旧配置所在目录，避免依赖启动时工作目录 + _ = config.WriteFile(filepath.Join(filepath.Dir(loadedPath), ConfigFileName)) + } + + return config, nil + } + return nil, errors.New("no config file '" + ConfigFileName + "' found") +} + +func (c *APIConfig) Init() error { + if len(c.RPCEndpoints) == 0 && len(c.OldRPC.Endpoints) > 0 { + c.RPCEndpoints = c.OldRPC.Endpoints + c.RPCDisableUpdate = c.OldRPC.DisableUpdate + } + + if len(c.RPCEndpoints) == 0 { + return errors.New("no valid 'rpc.endpoints'") + } + + if len(c.NodeId) == 0 { + return errors.New("'nodeId' required") + } + if len(c.Secret) == 0 { + return errors.New("'secret' required") + } + + // 兼容旧配置中的 listenAddr + if len(c.HTTPSListenAddr) == 0 { + if len(c.ListenAddr) > 0 { + c.HTTPSListenAddr = c.ListenAddr + } else { + c.HTTPSListenAddr = ":8443" + } + } + + if len(c.HTTPSCert) == 0 { + // return errors.New("'https.cert' required") + } + if len(c.HTTPSKey) == 0 { + // return errors.New("'https.key' required") + } + return nil +} + +func (c *APIConfig) WriteFile(path string) error { + data, err := yaml.Marshal(c) + if err != nil { + return err + } + return os.WriteFile(path, data, 0666) +} + +func findConfigCandidates(filename string) []string { + candidates := []string{ + Tea.ConfigFile(filename), + Tea.ConfigFile(filepath.Join("configs", filename)), + filename, + filepath.Join("configs", filename), + } + + if exePath, err := os.Executable(); err == nil { + exeDir := filepath.Dir(exePath) + candidates = append(candidates, + filepath.Join(exeDir, filename), + filepath.Join(exeDir, "configs", filename), + filepath.Join(exeDir, "..", "configs", filename), + ) + } + + uniq := map[string]struct{}{} + result := make([]string, 0, len(candidates)) + for _, candidate := range candidates { + candidate = filepath.Clean(candidate) + if len(candidate) == 0 { + continue + } + if _, ok := uniq[candidate]; ok { + continue + } + uniq[candidate] = struct{}{} + result = append(result, candidate) + } + return result +} diff --git a/EdgeHttpDNS/internal/const/const.go b/EdgeHttpDNS/internal/const/const.go new file mode 100644 index 0000000..f254982 --- /dev/null +++ b/EdgeHttpDNS/internal/const/const.go @@ -0,0 +1,23 @@ +package teaconst + +const ( + Version = "1.4.9" + + ProductName = "Edge HTTPDNS" + ProcessName = "edge-httpdns" + ProductNameZH = "Edge HTTPDNS" + + Role = "httpdns" + + EncryptKey = "8f983f4d69b83aaa0d74b21a212f6967" + EncryptMethod = "aes-256-cfb" + + SystemdServiceName = "edge-httpdns" + + // HTTPDNS node tasks from API. + TaskTypeHTTPDNSConfigChanged = "httpdnsConfigChanged" + TaskTypeHTTPDNSAppChanged = "httpdnsAppChanged" + TaskTypeHTTPDNSDomainChanged = "httpdnsDomainChanged" + TaskTypeHTTPDNSRuleChanged = "httpdnsRuleChanged" + TaskTypeHTTPDNSTLSChanged = "httpdnsTLSChanged" +) diff --git a/EdgeHttpDNS/internal/encrypt/method.go b/EdgeHttpDNS/internal/encrypt/method.go new file mode 100644 index 0000000..a297e7f --- /dev/null +++ b/EdgeHttpDNS/internal/encrypt/method.go @@ -0,0 +1,7 @@ +package encrypt + +type MethodInterface interface { + Init(key []byte, iv []byte) error + Encrypt(src []byte) (dst []byte, err error) + Decrypt(dst []byte) (src []byte, err error) +} diff --git a/EdgeHttpDNS/internal/encrypt/method_aes_256_cfb.go b/EdgeHttpDNS/internal/encrypt/method_aes_256_cfb.go new file mode 100644 index 0000000..3c3435f --- /dev/null +++ b/EdgeHttpDNS/internal/encrypt/method_aes_256_cfb.go @@ -0,0 +1,64 @@ +package encrypt + +import ( + "bytes" + "crypto/aes" + "crypto/cipher" +) + +type AES256CFBMethod struct { + block cipher.Block + iv []byte +} + +func (m *AES256CFBMethod) Init(key, iv []byte) error { + keyLen := len(key) + if keyLen > 32 { + key = key[:32] + } else if keyLen < 32 { + key = append(key, bytes.Repeat([]byte{' '}, 32-keyLen)...) + } + + block, err := aes.NewCipher(key) + if err != nil { + return err + } + m.block = block + + ivLen := len(iv) + if ivLen > aes.BlockSize { + iv = iv[:aes.BlockSize] + } else if ivLen < aes.BlockSize { + iv = append(iv, bytes.Repeat([]byte{' '}, aes.BlockSize-ivLen)...) + } + m.iv = iv + return nil +} + +func (m *AES256CFBMethod) Encrypt(src []byte) (dst []byte, err error) { + if len(src) == 0 { + return + } + + defer func() { + err = RecoverMethodPanic(recover()) + }() + + dst = make([]byte, len(src)) + cipher.NewCFBEncrypter(m.block, m.iv).XORKeyStream(dst, src) + return +} + +func (m *AES256CFBMethod) Decrypt(dst []byte) (src []byte, err error) { + if len(dst) == 0 { + return + } + + defer func() { + err = RecoverMethodPanic(recover()) + }() + + src = make([]byte, len(dst)) + cipher.NewCFBDecrypter(m.block, m.iv).XORKeyStream(src, dst) + return +} diff --git a/EdgeHttpDNS/internal/encrypt/method_raw.go b/EdgeHttpDNS/internal/encrypt/method_raw.go new file mode 100644 index 0000000..a823cc3 --- /dev/null +++ b/EdgeHttpDNS/internal/encrypt/method_raw.go @@ -0,0 +1,15 @@ +package encrypt + +type RawMethod struct{} + +func (m *RawMethod) Init(key []byte, iv []byte) error { + return nil +} + +func (m *RawMethod) Encrypt(src []byte) (dst []byte, err error) { + return src, nil +} + +func (m *RawMethod) Decrypt(dst []byte) (src []byte, err error) { + return dst, nil +} diff --git a/EdgeHttpDNS/internal/encrypt/method_utils.go b/EdgeHttpDNS/internal/encrypt/method_utils.go new file mode 100644 index 0000000..7c4077b --- /dev/null +++ b/EdgeHttpDNS/internal/encrypt/method_utils.go @@ -0,0 +1,40 @@ +package encrypt + +import ( + "errors" + "reflect" +) + +var methods = map[string]reflect.Type{ + "raw": reflect.TypeOf(new(RawMethod)).Elem(), + "aes-256-cfb": reflect.TypeOf(new(AES256CFBMethod)).Elem(), +} + +func NewMethodInstance(method string, key string, iv string) (MethodInterface, error) { + valueType, ok := methods[method] + if !ok { + return nil, errors.New("method '" + method + "' not found") + } + + instance, ok := reflect.New(valueType).Interface().(MethodInterface) + if !ok { + return nil, errors.New("method '" + method + "' must implement MethodInterface") + } + + err := instance.Init([]byte(key), []byte(iv)) + return instance, err +} + +func RecoverMethodPanic(err interface{}) error { + if err == nil { + return nil + } + + if s, ok := err.(string); ok { + return errors.New(s) + } + if e, ok := err.(error); ok { + return e + } + return errors.New("unknown error") +} diff --git a/EdgeHttpDNS/internal/nodes/httpdns_node.go b/EdgeHttpDNS/internal/nodes/httpdns_node.go new file mode 100644 index 0000000..322da60 --- /dev/null +++ b/EdgeHttpDNS/internal/nodes/httpdns_node.go @@ -0,0 +1,168 @@ +package nodes + +import ( + "errors" + "log" + "net" + "os" + "os/exec" + "runtime" + "sync" + "time" + + teaconst "github.com/TeaOSLab/EdgeHttpDNS/internal/const" + "github.com/TeaOSLab/EdgeHttpDNS/internal/utils" + "github.com/iwind/TeaGo/maps" + "github.com/iwind/gosock/pkg/gosock" +) + +var DaemonIsOn = false +var DaemonPid = 0 + +type HTTPDNSNode struct { + sock *gosock.Sock + + quitOnce sync.Once + quitCh chan struct{} +} + +func NewHTTPDNSNode() *HTTPDNSNode { + return &HTTPDNSNode{ + sock: gosock.NewTmpSock(teaconst.ProcessName), + quitCh: make(chan struct{}), + } +} + +func (n *HTTPDNSNode) Run() { + _, ok := os.LookupEnv("EdgeDaemon") + if ok { + DaemonIsOn = true + DaemonPid = os.Getppid() + } + + err := n.listenSock() + if err != nil { + log.Println("[HTTPDNS_NODE]" + err.Error()) + return + } + + go n.start() + select {} +} + +func (n *HTTPDNSNode) Daemon() { + path := os.TempDir() + "/" + teaconst.ProcessName + ".sock" + for { + conn, err := net.DialTimeout("unix", path, 1*time.Second) + if err != nil { + exe, exeErr := os.Executable() + if exeErr != nil { + log.Println("[DAEMON]", exeErr) + time.Sleep(1 * time.Second) + continue + } + + cmd := exec.Command(exe) + cmd.Env = append(os.Environ(), "EdgeBackground=on", "EdgeDaemon=on") + if runtime.GOOS != "windows" { + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + } + startErr := cmd.Start() + if startErr != nil { + log.Println("[DAEMON]", startErr) + time.Sleep(1 * time.Second) + continue + } + _ = cmd.Wait() + time.Sleep(5 * time.Second) + continue + } + + _ = conn.Close() + time.Sleep(5 * time.Second) + } +} + +func (n *HTTPDNSNode) InstallSystemService() error { + exe, err := os.Executable() + if err != nil { + return err + } + + manager := utils.NewServiceManager(teaconst.SystemdServiceName, teaconst.ProductName) + return manager.Install(exe, []string{}) +} + +func (n *HTTPDNSNode) listenSock() error { + if runtime.GOOS == "windows" { + return nil + } + + if n.sock.IsListening() { + reply, err := n.sock.Send(&gosock.Command{Code: "pid"}) + if err == nil { + return errors.New("the process is already running, pid: " + maps.NewMap(reply.Params).GetString("pid")) + } + return errors.New("the process is already running") + } + + go func() { + n.sock.OnCommand(func(cmd *gosock.Command) { + switch cmd.Code { + case "pid": + _ = cmd.Reply(&gosock.Command{ + Code: "pid", + Params: map[string]interface{}{ + "pid": os.Getpid(), + }, + }) + case "info": + exePath, _ := os.Executable() + _ = cmd.Reply(&gosock.Command{ + Code: "info", + Params: map[string]interface{}{ + "pid": os.Getpid(), + "version": teaconst.Version, + "path": exePath, + }, + }) + case "stop": + _ = cmd.ReplyOk() + n.stop() + time.Sleep(100 * time.Millisecond) + os.Exit(0) + } + }) + + err := n.sock.Listen() + if err != nil { + log.Println("[HTTPDNS_NODE][sock]", err.Error()) + } + }() + + return nil +} + +func (n *HTTPDNSNode) start() { + log.Println("[HTTPDNS_NODE]started") + + snapshotManager := NewSnapshotManager(n.quitCh) + statusManager := NewStatusManager(n.quitCh) + taskManager := NewTaskManager(n.quitCh, snapshotManager) + resolveServer := NewResolveServer(n.quitCh, snapshotManager) + + go snapshotManager.Start() + go statusManager.Start() + go taskManager.Start() + go resolveServer.Start() + + go NewUpgradeManager().Loop() +} + +func (n *HTTPDNSNode) stop() { + n.quitOnce.Do(func() { + close(n.quitCh) + _ = n.sock.Close() + }) +} diff --git a/EdgeHttpDNS/internal/nodes/resolve_server.go b/EdgeHttpDNS/internal/nodes/resolve_server.go new file mode 100644 index 0000000..a4e4d12 --- /dev/null +++ b/EdgeHttpDNS/internal/nodes/resolve_server.go @@ -0,0 +1,1489 @@ +package nodes + +import ( + "context" + "crypto/hmac" + "crypto/sha256" + "crypto/tls" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "log" + "net" + "net/http" + "net/url" + "sort" + "strconv" + "strings" + "sync" + "time" + + "github.com/TeaOSLab/EdgeCommon/pkg/iplibrary" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" + "github.com/TeaOSLab/EdgeHttpDNS/internal/accesslogs" + "github.com/TeaOSLab/EdgeHttpDNS/internal/configs" + "github.com/iwind/TeaGo/rands" + "github.com/miekg/dns" +) + +// sharedRecursionDNSClient 共享的递归DNS客户端（对齐 EdgeDNS 实现） +var sharedRecursionDNSClient = &dns.Client{ + Timeout: 3 * time.Second, +} + +const ( + httpdnsCodeSuccess = "SUCCESS" + httpdnsCodeAppInvalid = "APP_NOT_FOUND_OR_DISABLED" + httpdnsCodeDomainNotBound = "DOMAIN_NOT_BOUND" + httpdnsCodeSignInvalid = "SIGN_INVALID" + httpdnsCodeNoRecords = "NO_RECORDS" + httpdnsCodeInternalError = "RESOLVE_TIMEOUT_OR_INTERNAL" + httpdnsCodeMethodNotAllow = "METHOD_NOT_ALLOWED" + httpdnsCodeInvalidArgument = "INVALID_ARGUMENT" +) + +type resolveClientInfo struct { + IP string `json:"ip"` + Region string `json:"region"` + Carrier string `json:"carrier"` + Country string `json:"country"` +} + +type resolveRecord struct { + Type string `json:"type"` + IP string `json:"ip"` + Weight int32 `json:"weight,omitempty"` + Line string `json:"line,omitempty"` + Region string `json:"region,omitempty"` +} + +type resolveData struct { + Domain string `json:"domain"` + QType string `json:"qtype"` + TTL int32 `json:"ttl"` + Records []*resolveRecord `json:"records"` + Client *resolveClientInfo `json:"client"` + Summary string `json:"summary"` +} + +type resolveResponse struct { + Code string `json:"code"` + Message string `json:"message"` + RequestID string `json:"requestId"` + Data *resolveData `json:"data,omitempty"` +} + +type clientRouteProfile struct { + IP string + Country string + Province string + Carrier string + ProviderRaw string + Region string + Continent string + RegionText string +} + +type tlsListener struct { + addr string // e.g. ":443" + listener net.Listener + server *http.Server +} + +type ResolveServer struct { + quitCh <-chan struct{} + snapshotManager *SnapshotManager + + // Local config fallback + fallbackAddr string + certFile string + keyFile string + + handler http.Handler // shared mux + tlsConfig *tls.Config // shared TLS config (with GetCertificate) + + logWriter *accesslogs.HTTPDNSFileWriter + logQueue chan *pb.HTTPDNSAccessLog + + // TLS certificate hot-reload + certMu sync.RWMutex + currentCert *tls.Certificate + certSnapshotAt int64 + + // Listener hot-reload + listenerMu sync.Mutex + listeners map[string]*tlsListener // key: addr (e.g. ":443") +} + +func NewResolveServer(quitCh <-chan struct{}, snapshotManager *SnapshotManager) *ResolveServer { + fallbackAddr := ":443" + certFile := "" + keyFile := "" + if apiConfig, err := configs.SharedAPIConfig(); err == nil && apiConfig != nil { + if len(apiConfig.HTTPSListenAddr) > 0 { + fallbackAddr = apiConfig.HTTPSListenAddr + } + certFile = apiConfig.HTTPSCert + keyFile = apiConfig.HTTPSKey + } + + logWriter := accesslogs.SharedHTTPDNSFileWriter() + if apiConfig, err := configs.SharedAPIConfig(); err == nil && apiConfig != nil { + if len(strings.TrimSpace(apiConfig.LogDir)) > 0 { + logWriter.SetDir(strings.TrimSpace(apiConfig.LogDir)) + } + } + if err := logWriter.EnsureInit(); err != nil { + log.Println("[HTTPDNS_NODE][resolve]init access log file writer failed:", err.Error()) + } + + instance := &ResolveServer{ + quitCh: quitCh, + snapshotManager: snapshotManager, + fallbackAddr: fallbackAddr, + certFile: certFile, + keyFile: keyFile, + logWriter: logWriter, + logQueue: make(chan *pb.HTTPDNSAccessLog, 8192), + listeners: make(map[string]*tlsListener), + } + + mux := http.NewServeMux() + mux.HandleFunc("/resolve", instance.handleResolve) + mux.HandleFunc("/healthz", instance.handleHealth) + instance.handler = mux + + instance.tlsConfig = &tls.Config{ + MinVersion: tls.VersionTLS11, + NextProtos: []string{"http/1.1"}, + GetCertificate: instance.getCertificate, + } + + return instance +} + +func (s *ResolveServer) Start() { + go s.startAccessLogFlusher() + + // 1. Load initial certificate from file (fallback) + if len(s.certFile) > 0 && len(s.keyFile) > 0 { + cert, err := tls.LoadX509KeyPair(s.certFile, s.keyFile) + if err != nil { + log.Println("[HTTPDNS_NODE][resolve]load cert file failed:", err.Error()) + } else { + s.currentCert = &cert + log.Println("[HTTPDNS_NODE][resolve]loaded initial TLS cert from file") + } + } + + // 2. Try loading certificate from cluster snapshot (takes priority over file) + if snapshot := s.snapshotManager.Current(); snapshot != nil { + s.reloadCertFromSnapshot(snapshot) + } + + if s.currentCert == nil { + log.Println("[HTTPDNS_NODE][resolve]WARNING: no TLS certificate available, HTTPS will fail") + } + + // 3. Parse initial listen addresses and start listeners + if snapshot := s.snapshotManager.Current(); snapshot != nil { + addrs := s.desiredAddrs(snapshot) + s.syncListeners(addrs) + } else { + s.syncListeners([]string{s.fallbackAddr}) + } + + // 4. Watch for changes (blocks until quit) + s.watchLoop() +} + +func (s *ResolveServer) getCertificate(_ *tls.ClientHelloInfo) (*tls.Certificate, error) { + s.certMu.RLock() + cert := s.currentCert + s.certMu.RUnlock() + if cert != nil { + return cert, nil + } + return nil, errors.New("no TLS certificate available") +} + +type snapshotTLSConfig struct { + Listen []*serverconfigs.NetworkAddressConfig `json:"listen"` + SSLPolicy *sslconfigs.SSLPolicy `json:"sslPolicy"` +} + +func (s *ResolveServer) parseTLSConfig(snapshot *LoadedSnapshot) *snapshotTLSConfig { + if snapshot.ClusterID <= 0 { + return nil + } + cluster := snapshot.Clusters[snapshot.ClusterID] + if cluster == nil { + return nil + } + raw := cluster.GetTlsPolicyJSON() + if len(raw) == 0 { + return nil + } + + var cfg snapshotTLSConfig + if err := json.Unmarshal(raw, &cfg); err != nil { + log.Println("[HTTPDNS_NODE][resolve]parse tlsPolicyJSON failed:", err.Error()) + return nil + } + return &cfg +} + +func (s *ResolveServer) desiredAddrs(snapshot *LoadedSnapshot) []string { + cfg := s.parseTLSConfig(snapshot) + if cfg == nil || len(cfg.Listen) == 0 { + return []string{s.fallbackAddr} + } + + seen := make(map[string]struct{}) + var addrs []string + for _, listenCfg := range cfg.Listen { + if listenCfg == nil { + continue + } + if err := listenCfg.Init(); err != nil { + log.Println("[HTTPDNS_NODE][resolve]init listen config failed:", err.Error()) + continue + } + for _, addr := range listenCfg.Addresses() { + if _, ok := seen[addr]; !ok { + seen[addr] = struct{}{} + addrs = append(addrs, addr) + } + } + } + + if len(addrs) == 0 { + return []string{s.fallbackAddr} + } + sort.Strings(addrs) + return addrs +} + +func (s *ResolveServer) reloadCertFromSnapshot(snapshot *LoadedSnapshot) { + cfg := s.parseTLSConfig(snapshot) + if cfg == nil || cfg.SSLPolicy == nil || len(cfg.SSLPolicy.Certs) == 0 { + // 没有TLS配置，标记已处理（不需要重试） + s.certMu.Lock() + s.certSnapshotAt = snapshot.LoadedAt + s.certMu.Unlock() + reportRuntimeLog("info", "tls", "resolve", "no TLS policy in cluster snapshot, skipped cert reload", fmt.Sprintf("cert-skip-%d", snapshot.LoadedAt)) + return + } + if err := cfg.SSLPolicy.Init(context.Background()); err != nil { + log.Println("[HTTPDNS_NODE][resolve]init SSLPolicy failed:", err.Error()) + reportRuntimeLog("error", "tls", "resolve", "init SSLPolicy failed: "+err.Error(), fmt.Sprintf("cert-err-%d", snapshot.LoadedAt)) + // 不更新 certSnapshotAt，下次 watchLoop 会重试 + return + } + cert := cfg.SSLPolicy.FirstCert() + if cert == nil { + log.Println("[HTTPDNS_NODE][resolve]SSLPolicy has no valid certificate after Init") + reportRuntimeLog("error", "tls", "resolve", "SSLPolicy has no valid certificate after Init", fmt.Sprintf("cert-err-%d", snapshot.LoadedAt)) + // 不更新 certSnapshotAt，下次 watchLoop 会重试 + return + } + + s.certMu.Lock() + s.currentCert = cert + s.certSnapshotAt = snapshot.LoadedAt + s.certMu.Unlock() + log.Println("[HTTPDNS_NODE][resolve]TLS certificate reloaded from snapshot") + reportRuntimeLog("info", "tls", "resolve", "TLS certificate reloaded from snapshot successfully", fmt.Sprintf("cert-ok-%d", snapshot.LoadedAt)) +} + +func (s *ResolveServer) startListener(addr string) error { + ln, err := net.Listen("tcp", addr) + if err != nil { + return fmt.Errorf("listen on %s: %w", addr, err) + } + tlsLn := tls.NewListener(ln, s.tlsConfig) + + srv := &http.Server{ + Handler: s.handler, + ReadTimeout: 5 * time.Second, + ReadHeaderTimeout: 3 * time.Second, + WriteTimeout: 5 * time.Second, + IdleTimeout: 75 * time.Second, + MaxHeaderBytes: 8 * 1024, + TLSNextProto: map[string]func(*http.Server, *tls.Conn, http.Handler){}, + } + + s.listeners[addr] = &tlsListener{ + addr: addr, + listener: tlsLn, + server: srv, + } + + go func() { + if err := srv.Serve(tlsLn); err != nil && !errors.Is(err, http.ErrServerClosed) { + log.Println("[HTTPDNS_NODE][resolve]serve failed on", addr, ":", err.Error()) + } + }() + + log.Println("[HTTPDNS_NODE][resolve]listening HTTPS on", addr) + return nil +} + +func (s *ResolveServer) stopListener(addr string) { + tl, ok := s.listeners[addr] + if !ok { + return + } + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + defer cancel() + _ = tl.server.Shutdown(ctx) + delete(s.listeners, addr) + log.Println("[HTTPDNS_NODE][resolve]stopped listener on", addr) +} + +func (s *ResolveServer) syncListeners(desired []string) { + s.listenerMu.Lock() + defer s.listenerMu.Unlock() + + desiredSet := make(map[string]struct{}, len(desired)) + for _, addr := range desired { + desiredSet[addr] = struct{}{} + } + + // Stop listeners that are no longer desired + for addr := range s.listeners { + if _, ok := desiredSet[addr]; !ok { + s.stopListener(addr) + } + } + + // Start new listeners + for _, addr := range desired { + if _, ok := s.listeners[addr]; !ok { + if err := s.startListener(addr); err != nil { + log.Println("[HTTPDNS_NODE][resolve]start listener failed:", err.Error()) + } + } + } +} + +func (s *ResolveServer) watchLoop() { + ticker := time.NewTicker(5 * time.Second) + defer ticker.Stop() + for { + select { + case <-ticker.C: + snapshot := s.snapshotManager.Current() + if snapshot == nil { + continue + } + s.certMu.RLock() + lastAt := s.certSnapshotAt + s.certMu.RUnlock() + if snapshot.LoadedAt == lastAt { + continue + } + // Snapshot changed — sync listeners and reload cert + addrs := s.desiredAddrs(snapshot) + s.syncListeners(addrs) + s.reloadCertFromSnapshot(snapshot) + case <-s.quitCh: + s.shutdownAll() + return + } + } +} + +func (s *ResolveServer) shutdownAll() { + s.listenerMu.Lock() + defer s.listenerMu.Unlock() + for addr := range s.listeners { + s.stopListener(addr) + } +} + +func (s *ResolveServer) handleHealth(writer http.ResponseWriter, _ *http.Request) { + writer.WriteHeader(http.StatusOK) + _, _ = writer.Write([]byte("ok")) +} + +func (s *ResolveServer) handleResolve(writer http.ResponseWriter, request *http.Request) { + startAt := time.Now() + requestID := "rid-" + rands.HexString(16) + + if request.Method != http.MethodGet { + s.writeResolveJSON(writer, http.StatusMethodNotAllowed, &resolveResponse{ + Code: httpdnsCodeMethodNotAllow, + Message: "只允许使用 GET 方法", + RequestID: requestID, + }) + return + } + + query := request.URL.Query() + appID := strings.TrimSpace(query.Get("appId")) + domain := strings.TrimSuffix(strings.ToLower(strings.TrimSpace(query.Get("dn"))), ".") + qtype := strings.ToUpper(strings.TrimSpace(query.Get("qtype"))) + if len(qtype) == 0 { + qtype = "A" + } + if qtype != "A" && qtype != "AAAA" { + s.writeResolveJSON(writer, http.StatusBadRequest, &resolveResponse{ + Code: httpdnsCodeInvalidArgument, + Message: "qtype 参数仅支持 A 或 AAAA", + RequestID: requestID, + }) + return + } + + if len(appID) == 0 || len(domain) == 0 { + s.writeResolveJSON(writer, http.StatusBadRequest, &resolveResponse{ + Code: httpdnsCodeInvalidArgument, + Message: "缺少必填参数: appId 和 dn", + RequestID: requestID, + }) + return + } + + snapshot := s.snapshotManager.Current() + if snapshot == nil { + s.writeResolveJSON(writer, http.StatusServiceUnavailable, &resolveResponse{ + Code: httpdnsCodeInternalError, + Message: "服务节点尚未准备就绪，请稍后再试", + RequestID: requestID, + }) + return + } + + loadedApp := snapshot.Apps[strings.ToLower(appID)] + if loadedApp == nil || loadedApp.App == nil || !loadedApp.App.GetIsOn() { + s.writeFailedResolve(writer, requestID, snapshot, nil, domain, qtype, httpdnsCodeAppInvalid, "找不到指定的应用，或该应用已下线", startAt, request, query) + return + } + + if snapshot.ClusterID > 0 { + var appClusterIds []int64 + if len(loadedApp.App.GetClusterIdsJSON()) > 0 { + _ = json.Unmarshal(loadedApp.App.GetClusterIdsJSON(), &appClusterIds) + } + var clusterBound bool + for _, cid := range appClusterIds { + if cid == snapshot.ClusterID { + clusterBound = true + break + } + } + if !clusterBound { + s.writeFailedResolve(writer, requestID, snapshot, loadedApp.App, domain, qtype, httpdnsCodeAppInvalid, "当前应用未绑定到该解析集群", startAt, request, query) + return + } + } + + loadedDomain := loadedApp.Domains[domain] + if loadedDomain == nil || loadedDomain.Domain == nil || !loadedDomain.Domain.GetIsOn() { + s.writeFailedResolve(writer, requestID, snapshot, loadedApp.App, domain, qtype, httpdnsCodeDomainNotBound, "应用尚未绑定该域名，或域名解析已暂停", startAt, request, query) + return + } + + if loadedApp.App.GetSignEnabled() { + if !validateResolveSign(loadedApp.App.GetSignSecret(), loadedApp.App.GetAppId(), domain, qtype, query.Get("nonce"), query.Get("exp"), query.Get("sign")) { + s.writeFailedResolve(writer, requestID, snapshot, loadedApp.App, domain, qtype, httpdnsCodeSignInvalid, "请求鉴权失败：签名无效或已过期", startAt, request, query) + return + } + } + + clientIP := detectClientIP(request, query.Get("cip")) + clientProfile := buildClientRouteProfile(clientIP) + + clusterTTL := pickDefaultTTL(snapshot, loadedApp.App) + rule, records, ttl := pickRuleRecords(loadedDomain.Rules, qtype, clientProfile, clusterTTL) + if len(records) == 0 { + // Fallback：回源上游 DNS 查询真实记录 + fallbackRecords, fallbackTTL, fallbackErr := fallbackResolve(domain, qtype) + if fallbackErr != nil || len(fallbackRecords) == 0 { + errMsg := "未找到解析记录" + if fallbackErr != nil { + errMsg = "未找到解析记录 (上游回源失败: " + fallbackErr.Error() + ")" + } + s.writeFailedResolve(writer, requestID, snapshot, loadedApp.App, domain, qtype, httpdnsCodeNoRecords, errMsg, startAt, request, query) + return + } + records = fallbackRecords + if fallbackTTL > 0 { + ttl = fallbackTTL + } else { + ttl = clusterTTL + } + } + if ttl <= 0 { + ttl = clusterTTL + } + if ttl <= 0 { + ttl = 30 + } + + resultIPs := make([]string, 0, len(records)) + for _, record := range records { + resultIPs = append(resultIPs, record.IP) + } + + summary := fmt.Sprintf("%s|%s(%s)|%s|%s %s -> %s|success|%dms", + time.Now().Format("2006-01-02 15:04:05"), + loadedApp.App.GetName(), + loadedApp.App.GetAppId(), + clientProfile.IP, + qtype, + domain, + strings.Join(resultIPs, ", "), + time.Since(startAt).Milliseconds(), + ) + if rule != nil && len(strings.TrimSpace(rule.GetRuleName())) > 0 { + summary += "|rule:" + strings.TrimSpace(rule.GetRuleName()) + } + + s.writeResolveJSON(writer, http.StatusOK, &resolveResponse{ + Code: httpdnsCodeSuccess, + Message: "ok", + RequestID: requestID, + Data: &resolveData{ + Domain: domain, + QType: qtype, + TTL: ttl, + Records: records, + Client: &resolveClientInfo{ + IP: clientProfile.IP, + Region: clientProfile.RegionText, + Carrier: clientProfile.Carrier, + Country: clientProfile.Country, + }, + Summary: summary, + }, + }) + + if s.isAccessLogEnabled(snapshot) { + s.enqueueAccessLog(&pb.HTTPDNSAccessLog{ + RequestId: requestID, + ClusterId: snapshot.ClusterID, + NodeId: snapshot.NodeID, + AppId: loadedApp.App.GetAppId(), + AppName: loadedApp.App.GetName(), + Domain: domain, + Qtype: qtype, + ClientIP: clientProfile.IP, + ClientRegion: clientProfile.RegionText, + Carrier: clientProfile.Carrier, + SdkVersion: strings.TrimSpace(query.Get("sdk_version")), + Os: strings.TrimSpace(query.Get("os")), + ResultIPs: strings.Join(resultIPs, ","), + Status: "success", + ErrorCode: "none", + CostMs: int32(time.Since(startAt).Milliseconds()), + CreatedAt: time.Now().Unix(), + Day: time.Now().Format("20060102"), + Summary: summary, + }) + } +} + +func pickDefaultTTL(snapshot *LoadedSnapshot, app *pb.HTTPDNSApp) int32 { + if snapshot == nil { + return 30 + } + + if snapshot.ClusterID > 0 { + if cluster := snapshot.Clusters[snapshot.ClusterID]; cluster != nil && cluster.GetDefaultTTL() > 0 { + return cluster.GetDefaultTTL() + } + } + if app != nil { + var appClusterIds []int64 + if len(app.GetClusterIdsJSON()) > 0 { + _ = json.Unmarshal(app.GetClusterIdsJSON(), &appClusterIds) + } + for _, cid := range appClusterIds { + if cluster := snapshot.Clusters[cid]; cluster != nil && cluster.GetDefaultTTL() > 0 { + return cluster.GetDefaultTTL() + } + } + } + return 30 +} + +func (s *ResolveServer) writeFailedResolve( + writer http.ResponseWriter, + requestID string, + snapshot *LoadedSnapshot, + app *pb.HTTPDNSApp, + domain string, + qtype string, + errorCode string, + message string, + startAt time.Time, + request *http.Request, + query url.Values, +) { + clientIP := detectClientIP(request, query.Get("cip")) + clientProfile := buildClientRouteProfile(clientIP) + + appID := "" + appName := "" + if app != nil { + appID = app.GetAppId() + appName = app.GetName() + } + + summary := fmt.Sprintf("%s|%s(%s)|%s|%s %s -> [none]|failed(%s)|%dms", + time.Now().Format("2006-01-02 15:04:05"), + appName, + appID, + clientProfile.IP, + qtype, + domain, + errorCode, + time.Since(startAt).Milliseconds(), + ) + + s.writeResolveJSON(writer, http.StatusOK, &resolveResponse{ + Code: errorCode, + Message: message, + RequestID: requestID, + }) + + clusterID := int64(0) + nodeID := int64(0) + if snapshot != nil { + clusterID = snapshot.ClusterID + nodeID = snapshot.NodeID + } + + if s.isAccessLogEnabled(snapshot) { + s.enqueueAccessLog(&pb.HTTPDNSAccessLog{ + RequestId: requestID, + ClusterId: clusterID, + NodeId: nodeID, + AppId: appID, + AppName: appName, + Domain: domain, + Qtype: qtype, + ClientIP: clientProfile.IP, + ClientRegion: clientProfile.RegionText, + Carrier: clientProfile.Carrier, + SdkVersion: strings.TrimSpace(query.Get("sdk_version")), + Os: strings.TrimSpace(query.Get("os")), + ResultIPs: "", + Status: "failed", + ErrorCode: errorCode, + CostMs: int32(time.Since(startAt).Milliseconds()), + CreatedAt: time.Now().Unix(), + Day: time.Now().Format("20060102"), + Summary: summary, + }) + } +} + +func (s *ResolveServer) writeResolveJSON(writer http.ResponseWriter, status int, resp *resolveResponse) { + writer.Header().Set("Content-Type", "application/json; charset=utf-8") + writer.WriteHeader(status) + data, err := json.Marshal(resp) + if err != nil { + _, _ = writer.Write([]byte(`{"code":"RESOLVE_TIMEOUT_OR_INTERNAL","message":"encode response failed"}`)) + return + } + _, _ = writer.Write(data) +} + +func detectClientIP(request *http.Request, cip string) string { + if candidate := normalizeIPCandidate(cip); len(candidate) > 0 { + return candidate + } + + xff := strings.TrimSpace(request.Header.Get("X-Forwarded-For")) + if len(xff) > 0 { + for _, item := range strings.Split(xff, ",") { + if candidate := normalizeIPCandidate(item); len(candidate) > 0 { + return candidate + } + } + } + + headerKeys := []string{"X-Real-IP", "X-Client-IP", "CF-Connecting-IP", "True-Client-IP"} + for _, key := range headerKeys { + if candidate := normalizeIPCandidate(request.Header.Get(key)); len(candidate) > 0 { + return candidate + } + } + + return normalizeIPCandidate(request.RemoteAddr) +} + +func validateResolveSign(signSecret string, appID string, domain string, qtype string, nonce string, exp string, sign string) bool { + signSecret = strings.TrimSpace(signSecret) + nonce = strings.TrimSpace(nonce) + exp = strings.TrimSpace(exp) + sign = strings.TrimSpace(sign) + if len(signSecret) == 0 || len(nonce) == 0 || len(exp) == 0 || len(sign) == 0 { + return false + } + + expireAt, err := strconv.ParseInt(exp, 10, 64) + if err != nil { + return false + } + now := time.Now().Unix() + if expireAt <= now-30 || expireAt > now+86400 { + return false + } + + raw := appID + "|" + strings.ToLower(domain) + "|" + strings.ToUpper(qtype) + "|" + exp + "|" + nonce + mac := hmac.New(sha256.New, []byte(signSecret)) + _, _ = mac.Write([]byte(raw)) + expected := hex.EncodeToString(mac.Sum(nil)) + return strings.EqualFold(expected, sign) +} + +func buildClientRouteProfile(ip string) *clientRouteProfile { + profile := &clientRouteProfile{ + IP: normalizeIPCandidate(ip), + } + if net.ParseIP(profile.IP) == nil { + return profile + } + + result := iplibrary.LookupIP(profile.IP) + if result == nil || !result.IsOk() { + return profile + } + + profile.Country = normalizeCountryName(strings.TrimSpace(result.CountryName())) + profile.Province = normalizeProvinceName(strings.TrimSpace(result.ProvinceName())) + profile.ProviderRaw = strings.TrimSpace(result.ProviderName()) + profile.Carrier = normalizeCarrier(profile.ProviderRaw, profile.Country) + if len(profile.Carrier) == 0 { + if isMainlandChinaCountry(profile.Country) { + profile.Carrier = "默认" + } else { + if len(profile.ProviderRaw) > 0 { + profile.Carrier = profile.ProviderRaw + } else { + profile.Carrier = "默认" + } + } + } + profile.Region = normalizeChinaRegion(profile.Province) + profile.Continent = normalizeContinent(profile.Country) + profile.RegionText = strings.TrimSpace(result.RegionSummary()) + if len(profile.RegionText) == 0 { + pieces := make([]string, 0, 4) + if len(profile.Country) > 0 { + pieces = append(pieces, profile.Country) + } + if len(profile.Province) > 0 { + pieces = append(pieces, profile.Province) + } + if len(profile.Region) > 0 { + pieces = append(pieces, profile.Region) + } + if len(profile.Carrier) > 0 { + pieces = append(pieces, profile.Carrier) + } + profile.RegionText = strings.Join(pieces, " ") + } + + return profile +} + +func normalizeCarrier(provider string, country string) string { + value := strings.TrimSpace(provider) + if len(value) == 0 { + return "" + } + lower := strings.ToLower(value) + switch { + case strings.Contains(value, "电信"), strings.Contains(value, "天翼"), + strings.Contains(lower, "telecom"), strings.Contains(lower, "chinanet"), + strings.Contains(lower, "chinatelecom"), strings.Contains(lower, "ctnet"), strings.Contains(lower, "cn2"): + return "电信" + case strings.Contains(value, "联通"), strings.Contains(value, "网通"), + strings.Contains(lower, "unicom"), strings.Contains(lower, "chinaunicom"), + strings.Contains(lower, "cucc"), strings.Contains(lower, "china169"), strings.Contains(lower, "cnc"): + return "联通" + case strings.Contains(value, "移动"), + strings.Contains(lower, "mobile"), strings.Contains(lower, "chinamobile"), + strings.Contains(lower, "cmcc"), strings.Contains(lower, "cmnet"): + return "移动" + case strings.Contains(value, "教育"), + strings.Contains(lower, "cernet"), strings.Contains(lower, "edu"), strings.Contains(lower, "education"): + return "教育网" + case strings.Contains(value, "鹏博士"), + strings.Contains(lower, "drpeng"), strings.Contains(lower, "dr.peng"), strings.Contains(lower, "dr_peng"): + return "鹏博士" + case strings.Contains(value, "广电"), + strings.Contains(lower, "broadcast"), strings.Contains(lower, "cable"), strings.Contains(lower, "radio"): + return "广电" + default: + if isMainlandChinaCountry(country) { + return "" + } + return value + } +} + +func normalizeChinaRegion(province string) string { + switch normalizeProvinceName(province) { + case "辽宁", "吉林", "黑龙江": + return "东北" + case "北京", "天津", "河北", "山西", "内蒙古": + return "华北" + case "上海", "江苏", "浙江", "安徽", "福建", "江西", "山东": + return "华东" + case "广东", "广西", "海南": + return "华南" + case "河南", "湖北", "湖南": + return "华中" + case "陕西", "甘肃", "青海", "宁夏", "新疆": + return "西北" + case "重庆", "四川", "贵州", "云南", "西藏": + return "西南" + default: + return "" + } +} + +func normalizeContinent(country string) string { + switch normalizeCountryName(country) { + case "中国", "中国香港", "中国澳门", "中国台湾", "日本", "韩国", "新加坡", "印度", "泰国", "越南", + "印度尼西亚", "马来西亚", "菲律宾", "柬埔寨", "缅甸", "老挝", "斯里兰卡", "孟加拉国", "巴基斯坦", "尼泊尔", + "阿联酋", "沙特阿拉伯", "土耳其", "以色列", "伊朗", "伊拉克", "卡塔尔", "科威特", "蒙古": + return "亚洲" + case "美国", "加拿大", "墨西哥", "巴拿马", "哥斯达黎加", "古巴": + return "北美洲" + case "巴西", "阿根廷", "智利", "哥伦比亚", "秘鲁", "委内瑞拉", "厄瓜多尔": + return "南美洲" + case "德国", "英国", "法国", "荷兰", "西班牙", "意大利", "俄罗斯", + "波兰", "瑞典", "瑞士", "挪威", "芬兰", "丹麦", "葡萄牙", "爱尔兰", "比利时", "奥地利", + "乌克兰", "捷克", "罗马尼亚", "匈牙利", "希腊": + return "欧洲" + case "南非", "埃及", "尼日利亚", "肯尼亚", "摩洛哥", "阿尔及利亚", "坦桑尼亚", "埃塞俄比亚", "加纳", "突尼斯": + return "非洲" + case "澳大利亚", "新西兰": + return "大洋洲" + default: + return "" + } +} +func pickRuleRecords(rules []*pb.HTTPDNSCustomRule, qtype string, profile *clientRouteProfile, defaultTTL int32) (*pb.HTTPDNSCustomRule, []*resolveRecord, int32) { + bestScore := -1 + var bestRule *pb.HTTPDNSCustomRule + var bestRecords []*resolveRecord + bestTTL := defaultTTL + + for _, rule := range rules { + if rule == nil || !rule.GetIsOn() { + continue + } + + score, ok := matchRuleLine(rule, profile) + if !ok { + continue + } + + records := make([]*resolveRecord, 0) + for _, item := range rule.GetRecords() { + if item == nil { + continue + } + if strings.ToUpper(strings.TrimSpace(item.GetRecordType())) != qtype { + continue + } + value := strings.TrimSpace(item.GetRecordValue()) + if len(value) == 0 { + continue + } + records = append(records, &resolveRecord{ + Type: qtype, + IP: value, + Weight: item.GetWeight(), + Line: lookupIPLineLabel(value), + Region: lookupIPRegionSummary(value), + }) + } + if len(records) == 0 { + continue + } + + if score > bestScore { + bestScore = score + bestRule = rule + bestRecords = records + if rule.GetTtl() > 0 { + bestTTL = rule.GetTtl() + } else { + bestTTL = defaultTTL + } + } + } + + return bestRule, bestRecords, bestTTL +} + +// fallbackResolve 当无自定义规则命中时，回源上游 DNS 查询真实记录（对齐 EdgeDNS 做法） +func fallbackResolve(domain string, qtype string) ([]*resolveRecord, int32, error) { + var dnsType uint16 + switch qtype { + case "A": + dnsType = dns.TypeA + case "AAAA": + dnsType = dns.TypeAAAA + default: + return nil, 0, nil // 仅降级处理 A 和 AAAA + } + + m := new(dns.Msg) + m.SetQuestion(dns.Fqdn(domain), dnsType) + m.RecursionDesired = true + + // 优先使用本机 /etc/resolv.conf 中的 DNS 服务器（对齐 EdgeDNS） + var upstream = "223.5.5.5:53" + resolveConfig, confErr := dns.ClientConfigFromFile("/etc/resolv.conf") + if confErr == nil && len(resolveConfig.Servers) > 0 { + port := resolveConfig.Port + if len(port) == 0 { + port = "53" + } + server := resolveConfig.Servers[rands.Int(0, len(resolveConfig.Servers)-1)] + upstream = server + ":" + port + } + + r, _, err := sharedRecursionDNSClient.Exchange(m, upstream) + if err != nil { + return nil, 0, err + } + + if r.Rcode != dns.RcodeSuccess { + return nil, 0, fmt.Errorf("upstream rcode: %d", r.Rcode) + } + + var records []*resolveRecord + var responseTTL int32 + for _, ans := range r.Answer { + switch t := ans.(type) { + case *dns.A: + if qtype == "A" { + if t.Hdr.Ttl > 0 { + ttl := int32(t.Hdr.Ttl) + if responseTTL == 0 || ttl < responseTTL { + responseTTL = ttl + } + } + ip := t.A.String() + records = append(records, &resolveRecord{ + Type: "A", + IP: ip, + Line: lookupIPLineLabel(ip), + Region: lookupIPRegionSummary(ip), + }) + } + case *dns.AAAA: + if qtype == "AAAA" { + if t.Hdr.Ttl > 0 { + ttl := int32(t.Hdr.Ttl) + if responseTTL == 0 || ttl < responseTTL { + responseTTL = ttl + } + } + ip := t.AAAA.String() + records = append(records, &resolveRecord{ + Type: "AAAA", + IP: ip, + Line: lookupIPLineLabel(ip), + Region: lookupIPRegionSummary(ip), + }) + } + } + } + + return records, responseTTL, nil +} + +func lookupIPRegionSummary(ip string) string { + address := strings.TrimSpace(ip) + if len(address) == 0 || net.ParseIP(address) == nil { + return "" + } + + result := iplibrary.LookupIP(address) + if result == nil || !result.IsOk() { + return "" + } + + return strings.TrimSpace(result.RegionSummary()) +} + +func lookupIPLineLabel(ip string) string { + address := strings.TrimSpace(ip) + if len(address) == 0 || net.ParseIP(address) == nil { + return "上游DNS" + } + + result := iplibrary.LookupIP(address) + if result == nil || !result.IsOk() { + return "上游DNS" + } + + provider := strings.TrimSpace(result.ProviderName()) + country := normalizeCountryName(strings.TrimSpace(result.CountryName())) + carrier := strings.TrimSpace(normalizeCarrier(provider, country)) + if isMainlandChinaCountry(country) { + if len(carrier) > 0 { + return carrier + } + return "默认" + } + + if len(carrier) > 0 { + return carrier + } + if len(provider) > 0 { + return provider + } + return "上游DNS" +} + +func isMainlandChinaCountry(country string) bool { + switch normalizeCountryName(country) { + case "中国": + return true + } + return false +} + +func matchRuleLine(rule *pb.HTTPDNSCustomRule, profile *clientRouteProfile) (int, bool) { + scope := strings.ToLower(strings.TrimSpace(rule.GetLineScope())) + score := 0 + + if scope == "overseas" { + // 境外规则只匹配非中国大陆来源 + if isMainlandChinaCountry(profile.Country) { + return 0, false + } + + fieldScore, ok := matchRuleField(rule.GetLineContinent(), profile.Continent) + if !ok { + return 0, false + } + score += fieldScore + + fieldScore, ok = matchRuleField(rule.GetLineCountry(), profile.Country) + if !ok { + return 0, false + } + score += fieldScore + return score, true + } + + // 中国地区规则只匹配中国大陆来源 + if !isMainlandChinaCountry(profile.Country) { + return 0, false + } + + fieldScore, ok := matchRuleField(rule.GetLineCountry(), profile.Country) + if !ok { + return 0, false + } + score += fieldScore + + fieldScore, ok = matchRuleField(rule.GetLineContinent(), profile.Continent) + if !ok { + return 0, false + } + score += fieldScore + + fieldScore, ok = matchRuleField(rule.GetLineCarrier(), profile.Carrier, profile.ProviderRaw) + if !ok { + return 0, false + } + score += fieldScore + + fieldScore, ok = matchRuleField(rule.GetLineRegion(), profile.Region) + if !ok { + return 0, false + } + score += fieldScore + + fieldScore, ok = matchRuleField(rule.GetLineProvince(), profile.Province) + if !ok { + return 0, false + } + score += fieldScore + + return score, true +} + +func matchRuleField(ruleValue string, candidates ...string) (int, bool) { + if isDefaultLineValue(ruleValue) { + return 0, true + } + + want := normalizeLineValue(ruleValue) + if len(want) == 0 { + return 0, true + } + + for _, candidate := range candidates { + got := normalizeLineValue(candidate) + if len(got) == 0 { + // 如果规则设了具体值（want），但客户端信息（got）为空，则不能匹配 + // 否则 strings.Contains("xxx", "") 永远为 true + continue + } + if want == got || strings.Contains(got, want) || strings.Contains(want, got) { + return 1, true + } + } + return 0, false +} + +func isDefaultLineValue(value string) bool { + switch normalizeLineValue(value) { + case "", "default", "all", "*", "any", "默认", "全部", "不限": + return true + } + return false +} + +func normalizeLineValue(value string) string { + v := strings.ToLower(strings.TrimSpace(value)) + v = strings.ReplaceAll(v, " ", "") + v = strings.ReplaceAll(v, "-", "") + v = strings.ReplaceAll(v, "_", "") + v = strings.ReplaceAll(v, "/", "") + return v +} + +func normalizeIPCandidate(ip string) string { + value := strings.TrimSpace(ip) + if len(value) == 0 { + return "" + } + if host, _, err := net.SplitHostPort(value); err == nil { + value = strings.TrimSpace(host) + } + if parsed := net.ParseIP(value); parsed != nil { + return parsed.String() + } + return "" +} + +func normalizeCountryName(country string) string { + value := strings.TrimSpace(country) + if len(value) == 0 { + return "" + } + + normalized := normalizeLineValue(value) + switch normalized { + case "中国香港", "香港", "hongkong": + return "中国香港" + case "中国澳门", "澳门", "macao", "macau": + return "中国澳门" + case "中国台湾", "台湾", "taiwan": + return "中国台湾" + } + + switch normalized { + case "中国", "中国大陆", "中国内地", "中华人民共和国", "prc", "cn", "china", "mainlandchina", "peoplesrepublicofchina", "thepeoplesrepublicofchina": + return "中国" + case "美国", "usa", "unitedstates", "unitedstatesofamerica": + return "美国" + case "加拿大", "canada": + return "加拿大" + case "墨西哥", "mexico": + return "墨西哥" + case "日本", "japan": + return "日本" + case "韩国", "southkorea", "korea": + return "韩国" + case "新加坡", "singapore": + return "新加坡" + case "印度", "india": + return "印度" + case "泰国", "thailand": + return "泰国" + case "越南", "vietnam": + return "越南" + case "德国", "germany": + return "德国" + case "英国", "uk", "unitedkingdom", "greatbritain", "britain": + return "英国" + case "法国", "france": + return "法国" + case "荷兰", "netherlands": + return "荷兰" + case "西班牙", "spain": + return "西班牙" + case "意大利", "italy": + return "意大利" + case "俄罗斯", "russia": + return "俄罗斯" + case "巴西", "brazil": + return "巴西" + case "阿根廷", "argentina": + return "阿根廷" + case "智利", "chile": + return "智利" + case "哥伦比亚", "colombia": + return "哥伦比亚" + // --- 亚洲（新增）--- + case "印度尼西亚", "indonesia": + return "印度尼西亚" + case "马来西亚", "malaysia": + return "马来西亚" + case "菲律宾", "philippines": + return "菲律宾" + case "柬埔寨", "cambodia": + return "柬埔寨" + case "缅甸", "myanmar", "burma": + return "缅甸" + case "老挝", "laos": + return "老挝" + case "斯里兰卡", "srilanka": + return "斯里兰卡" + case "孟加拉国", "孟加拉", "bangladesh": + return "孟加拉国" + case "巴基斯坦", "pakistan": + return "巴基斯坦" + case "尼泊尔", "nepal": + return "尼泊尔" + case "阿联酋", "阿拉伯联合酋长国", "uae", "unitedarabemirates": + return "阿联酋" + case "沙特阿拉伯", "沙特", "saudiarabia", "saudi": + return "沙特阿拉伯" + case "土耳其", "turkey", "türkiye", "turkiye": + return "土耳其" + case "以色列", "israel": + return "以色列" + case "伊朗", "iran": + return "伊朗" + case "伊拉克", "iraq": + return "伊拉克" + case "卡塔尔", "qatar": + return "卡塔尔" + case "科威特", "kuwait": + return "科威特" + case "蒙古", "mongolia": + return "蒙古" + // --- 欧洲（新增）--- + case "波兰", "poland": + return "波兰" + case "瑞典", "sweden": + return "瑞典" + case "瑞士", "switzerland": + return "瑞士" + case "挪威", "norway": + return "挪威" + case "芬兰", "finland": + return "芬兰" + case "丹麦", "denmark": + return "丹麦" + case "葡萄牙", "portugal": + return "葡萄牙" + case "爱尔兰", "ireland": + return "爱尔兰" + case "比利时", "belgium": + return "比利时" + case "奥地利", "austria": + return "奥地利" + case "乌克兰", "ukraine": + return "乌克兰" + case "捷克", "czech", "czechrepublic", "czechia": + return "捷克" + case "罗马尼亚", "romania": + return "罗马尼亚" + case "匈牙利", "hungary": + return "匈牙利" + case "希腊", "greece": + return "希腊" + // --- 北美洲（新增）--- + case "巴拿马", "panama": + return "巴拿马" + case "哥斯达黎加", "costarica": + return "哥斯达黎加" + case "古巴", "cuba": + return "古巴" + // --- 南美洲（新增）--- + case "秘鲁", "peru": + return "秘鲁" + case "委内瑞拉", "venezuela": + return "委内瑞拉" + case "厄瓜多尔", "ecuador": + return "厄瓜多尔" + // --- 非洲 --- + case "南非", "southafrica": + return "南非" + case "埃及", "egypt": + return "埃及" + case "尼日利亚", "nigeria": + return "尼日利亚" + case "肯尼亚", "kenya": + return "肯尼亚" + case "摩洛哥", "morocco": + return "摩洛哥" + case "阿尔及利亚", "algeria": + return "阿尔及利亚" + case "坦桑尼亚", "tanzania": + return "坦桑尼亚" + case "埃塞俄比亚", "ethiopia": + return "埃塞俄比亚" + case "加纳", "ghana": + return "加纳" + case "突尼斯", "tunisia": + return "突尼斯" + // --- 大洋洲 --- + case "澳大利亚", "australia": + return "澳大利亚" + case "新西兰", "newzealand": + return "新西兰" + default: + return value + } +} + +func normalizeProvinceName(province string) string { + value := strings.TrimSpace(province) + if len(value) == 0 { + return "" + } + + switch value { + case "内蒙古自治区": + return "内蒙古" + case "广西壮族自治区": + return "广西" + case "宁夏回族自治区": + return "宁夏" + case "新疆维吾尔自治区": + return "新疆" + case "西藏自治区": + return "西藏" + case "香港特别行政区": + return "香港" + case "澳门特别行政区": + return "澳门" + } + + for _, suffix := range []string{"维吾尔自治区", "回族自治区", "壮族自治区", "自治区", "特别行政区", "省", "市"} { + value = strings.TrimSuffix(value, suffix) + } + + return value +} + +func ruleLineSummary(rule *pb.HTTPDNSCustomRule) string { + if rule == nil { + return "" + } + + scope := strings.ToLower(strings.TrimSpace(rule.GetLineScope())) + if scope == "overseas" { + pieces := make([]string, 0, 2) + if !isDefaultLineValue(rule.GetLineContinent()) { + pieces = append(pieces, strings.TrimSpace(rule.GetLineContinent())) + } + if !isDefaultLineValue(rule.GetLineCountry()) { + pieces = append(pieces, strings.TrimSpace(rule.GetLineCountry())) + } + return strings.Join(pieces, "/") + } + + pieces := make([]string, 0, 3) + if !isDefaultLineValue(rule.GetLineCarrier()) { + pieces = append(pieces, strings.TrimSpace(rule.GetLineCarrier())) + } + if !isDefaultLineValue(rule.GetLineRegion()) { + pieces = append(pieces, strings.TrimSpace(rule.GetLineRegion())) + } + if !isDefaultLineValue(rule.GetLineProvince()) { + pieces = append(pieces, strings.TrimSpace(rule.GetLineProvince())) + } + return strings.Join(pieces, "/") +} + +func ruleRegionSummary(rule *pb.HTTPDNSCustomRule) string { + if rule == nil { + return "" + } + if !isDefaultLineValue(rule.GetLineProvince()) { + return strings.TrimSpace(rule.GetLineProvince()) + } + if !isDefaultLineValue(rule.GetLineCountry()) { + return strings.TrimSpace(rule.GetLineCountry()) + } + if !isDefaultLineValue(rule.GetLineRegion()) { + return strings.TrimSpace(rule.GetLineRegion()) + } + if !isDefaultLineValue(rule.GetLineContinent()) { + return strings.TrimSpace(rule.GetLineContinent()) + } + return "" +} + +func (s *ResolveServer) isAccessLogEnabled(snapshot *LoadedSnapshot) bool { + if snapshot == nil || snapshot.ClusterID <= 0 { + return true + } + cluster := snapshot.Clusters[snapshot.ClusterID] + if cluster == nil { + return true + } + return cluster.GetAccessLogIsOn() +} + +func (s *ResolveServer) enqueueAccessLog(item *pb.HTTPDNSAccessLog) { + if item == nil { + return + } + select { + case s.logQueue <- item: + default: + log.Println("[HTTPDNS_NODE][resolve]access log queue is full, drop request:", item.GetRequestId()) + } +} + +func (s *ResolveServer) startAccessLogFlusher() { + ticker := time.NewTicker(1 * time.Second) + defer ticker.Stop() + + batch := make([]*pb.HTTPDNSAccessLog, 0, 128) + flush := func() { + if len(batch) == 0 { + return + } + s.logWriter.WriteBatch(batch) + batch = batch[:0] + } + + for { + select { + case item := <-s.logQueue: + if item != nil { + batch = append(batch, item) + } + if len(batch) > 4096 { + log.Println("[HTTPDNS_NODE][resolve]access log flush backlog too large, trim:", len(batch)) + batch = batch[len(batch)-2048:] + } + if len(batch) >= 128 { + flush() + } + case <-ticker.C: + flush() + case <-s.quitCh: + flush() + _ = s.logWriter.Close() + return + } + } +} diff --git a/EdgeHttpDNS/internal/nodes/runtime_log.go b/EdgeHttpDNS/internal/nodes/runtime_log.go new file mode 100644 index 0000000..ad6ca39 --- /dev/null +++ b/EdgeHttpDNS/internal/nodes/runtime_log.go @@ -0,0 +1,39 @@ +package nodes + +import ( + "log" + "time" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeHttpDNS/internal/rpc" +) + +func reportRuntimeLog(level string, logType string, module string, description string, requestID string) { + rpcClient, err := rpc.SharedRPC() + if err != nil { + log.Println("[HTTPDNS_NODE][runtime-log]", err.Error()) + return + } + + nodeID := int64(0) + + now := time.Now() + _, err = rpcClient.HTTPDNSRuntimeLogRPC.CreateHTTPDNSRuntimeLogs(rpcClient.Context(), &pb.CreateHTTPDNSRuntimeLogsRequest{ + Logs: []*pb.HTTPDNSRuntimeLog{ + { + NodeId: nodeID, + Level: level, + Type: logType, + Module: module, + Description: description, + Count: 1, + RequestId: requestID, + CreatedAt: now.Unix(), + Day: now.Format("20060102"), + }, + }, + }) + if err != nil { + log.Println("[HTTPDNS_NODE][runtime-log]", err.Error()) + } +} diff --git a/EdgeHttpDNS/internal/nodes/snapshot_manager.go b/EdgeHttpDNS/internal/nodes/snapshot_manager.go new file mode 100644 index 0000000..5c10860 --- /dev/null +++ b/EdgeHttpDNS/internal/nodes/snapshot_manager.go @@ -0,0 +1,193 @@ +package nodes + +import ( + "fmt" + "log" + "strings" + "sync" + "time" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeHttpDNS/internal/rpc" +) + +type LoadedDomain struct { + Domain *pb.HTTPDNSDomain + Rules []*pb.HTTPDNSCustomRule +} + +type LoadedApp struct { + App *pb.HTTPDNSApp + Domains map[string]*LoadedDomain // key: lower(domain) +} + +type LoadedSnapshot struct { + LoadedAt int64 + + NodeID int64 + ClusterID int64 + + Clusters map[int64]*pb.HTTPDNSCluster + Apps map[string]*LoadedApp // key: lower(appId) +} + +type SnapshotManager struct { + quitCh <-chan struct{} + ticker *time.Ticker + + locker sync.RWMutex + snapshot *LoadedSnapshot + + timezone string +} + +func NewSnapshotManager(quitCh <-chan struct{}) *SnapshotManager { + return &SnapshotManager{ + quitCh: quitCh, + ticker: time.NewTicker(30 * time.Second), + } +} + +func (m *SnapshotManager) Start() { + defer m.ticker.Stop() + + if err := m.RefreshNow("startup"); err != nil { + log.Println("[HTTPDNS_NODE][snapshot]initial refresh failed:", err.Error()) + } + + for { + select { + case <-m.ticker.C: + if err := m.RefreshNow("periodic"); err != nil { + log.Println("[HTTPDNS_NODE][snapshot]periodic refresh failed:", err.Error()) + } + case <-m.quitCh: + return + } + } +} + +func (m *SnapshotManager) Current() *LoadedSnapshot { + m.locker.RLock() + defer m.locker.RUnlock() + return m.snapshot +} + +func (m *SnapshotManager) RefreshNow(reason string) error { + rpcClient, err := rpc.SharedRPC() + if err != nil { + return err + } + + nodeResp, err := rpcClient.HTTPDNSNodeRPC.FindHTTPDNSNode(rpcClient.Context(), &pb.FindHTTPDNSNodeRequest{ + NodeId: 0, + }) + if err != nil { + return err + } + if nodeResp.GetNode() == nil { + return fmt.Errorf("httpdns node info not found") + } + + clusterResp, err := rpcClient.HTTPDNSClusterRPC.FindAllHTTPDNSClusters(rpcClient.Context(), &pb.FindAllHTTPDNSClustersRequest{}) + if err != nil { + return err + } + clusters := map[int64]*pb.HTTPDNSCluster{} + for _, cluster := range clusterResp.GetClusters() { + if cluster == nil || cluster.GetId() <= 0 { + continue + } + clusters[cluster.GetId()] = cluster + } + + appResp, err := rpcClient.HTTPDNSAppRPC.FindAllHTTPDNSApps(rpcClient.Context(), &pb.FindAllHTTPDNSAppsRequest{}) + if err != nil { + return err + } + + apps := map[string]*LoadedApp{} + for _, app := range appResp.GetApps() { + if app == nil || app.GetId() <= 0 || len(app.GetAppId()) == 0 { + continue + } + + domainResp, err := rpcClient.HTTPDNSDomainRPC.ListHTTPDNSDomainsWithAppId(rpcClient.Context(), &pb.ListHTTPDNSDomainsWithAppIdRequest{ + AppDbId: app.GetId(), + }) + if err != nil { + log.Println("[HTTPDNS_NODE][snapshot]list domains failed, appId:", app.GetAppId(), "err:", err.Error()) + continue + } + + domains := map[string]*LoadedDomain{} + for _, domain := range domainResp.GetDomains() { + if domain == nil || domain.GetId() <= 0 || len(domain.GetDomain()) == 0 { + continue + } + ruleResp, err := rpcClient.HTTPDNSRuleRPC.ListHTTPDNSCustomRulesWithDomainId(rpcClient.Context(), &pb.ListHTTPDNSCustomRulesWithDomainIdRequest{ + DomainId: domain.GetId(), + }) + if err != nil { + log.Println("[HTTPDNS_NODE][snapshot]list rules failed, domain:", domain.GetDomain(), "err:", err.Error()) + continue + } + + domains[strings.ToLower(strings.TrimSpace(domain.GetDomain()))] = &LoadedDomain{ + Domain: domain, + Rules: ruleResp.GetRules(), + } + } + + apps[strings.ToLower(strings.TrimSpace(app.GetAppId()))] = &LoadedApp{ + App: app, + Domains: domains, + } + } + + snapshot := &LoadedSnapshot{ + LoadedAt: time.Now().UnixNano(), + NodeID: nodeResp.GetNode().GetId(), + ClusterID: nodeResp.GetNode().GetClusterId(), + Clusters: clusters, + Apps: apps, + } + + m.locker.Lock() + m.snapshot = snapshot + m.locker.Unlock() + + reportRuntimeLog("info", "config", "snapshot", "snapshot refreshed: "+reason, fmt.Sprintf("snapshot-%d", time.Now().UnixNano())) + + // timezone sync - prefer current node's cluster timezone + var timeZone string + if snapshot.ClusterID > 0 { + if cluster := clusters[snapshot.ClusterID]; cluster != nil && len(cluster.GetTimeZone()) > 0 { + timeZone = cluster.GetTimeZone() + } + } + // fallback to any non-empty cluster timezone for compatibility + if len(timeZone) == 0 { + for _, cluster := range clusters { + if cluster != nil && len(cluster.GetTimeZone()) > 0 { + timeZone = cluster.GetTimeZone() + break + } + } + } + if len(timeZone) == 0 { + timeZone = "Asia/Shanghai" + } + if m.timezone != timeZone { + location, err := time.LoadLocation(timeZone) + if err != nil { + log.Println("[HTTPDNS_NODE][TIMEZONE]change time zone failed:", err.Error()) + } else { + log.Println("[HTTPDNS_NODE][TIMEZONE]change time zone to '" + timeZone + "'") + time.Local = location + m.timezone = timeZone + } + } + + return nil +} diff --git a/EdgeHttpDNS/internal/nodes/status_manager.go b/EdgeHttpDNS/internal/nodes/status_manager.go new file mode 100644 index 0000000..2a3c159 --- /dev/null +++ b/EdgeHttpDNS/internal/nodes/status_manager.go @@ -0,0 +1,144 @@ +package nodes + +import ( + "encoding/json" + "log" + "os" + "runtime" + "strconv" + "strings" + "time" + + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeHttpDNS/internal/configs" + teaconst "github.com/TeaOSLab/EdgeHttpDNS/internal/const" + "github.com/TeaOSLab/EdgeHttpDNS/internal/rpc" + "github.com/TeaOSLab/EdgeHttpDNS/internal/utils" +) + + +type StatusManager struct { + quitCh <-chan struct{} + ticker *time.Ticker +} + +func NewStatusManager(quitCh <-chan struct{}) *StatusManager { + return &StatusManager{ + quitCh: quitCh, + ticker: time.NewTicker(30 * time.Second), + } +} + +func (m *StatusManager) Start() { + defer m.ticker.Stop() + + m.update() + for { + select { + case <-m.ticker.C: + m.update() + case <-m.quitCh: + return + } + } +} + +func (m *StatusManager) update() { + status := m.collectStatus() + statusJSON, err := json.Marshal(status) + if err != nil { + log.Println("[HTTPDNS_NODE][status]marshal status failed:", err.Error()) + return + } + + rpcClient, err := rpc.SharedRPC() + if err != nil { + log.Println("[HTTPDNS_NODE][status]rpc unavailable:", err.Error()) + return + } + + config, err := configs.SharedAPIConfig() + if err != nil { + log.Println("[HTTPDNS_NODE][status]load config failed:", err.Error()) + return + } + nodeId, _ := strconv.ParseInt(config.NodeId, 10, 64) + + _, err = rpcClient.HTTPDNSNodeRPC.UpdateHTTPDNSNodeStatus(rpcClient.Context(), &pb.UpdateHTTPDNSNodeStatusRequest{ + NodeId: nodeId, + IsUp: true, + IsInstalled: true, + IsActive: true, + StatusJSON: statusJSON, + }) + + if err != nil { + log.Println("[HTTPDNS_NODE][status]update status failed:", err.Error()) + } +} + +func (m *StatusManager) collectStatus() *nodeconfigs.NodeStatus { + now := time.Now().Unix() + + status := &nodeconfigs.NodeStatus{ + BuildVersion: teaconst.Version, + BuildVersionCode: utils.VersionToLong(teaconst.Version), + ConfigVersion: 0, + OS: runtime.GOOS, + Arch: runtime.GOARCH, + CPULogicalCount: runtime.NumCPU(), + CPUPhysicalCount: runtime.NumCPU(), + IsActive: true, + ConnectionCount: 0, + UpdatedAt: now, + Timestamp: now, + } + + rpcClient, err := rpc.SharedRPC() + if err == nil { + total, failed, avgCostSeconds := rpcClient.GetAndResetMetrics() + if total > 0 { + status.APISuccessPercent = float64(total-failed) * 100.0 / float64(total) + status.APIAvgCostSeconds = avgCostSeconds + } + } + + + hostname, _ := os.Hostname() + status.Hostname = hostname + + exePath, _ := os.Executable() + status.ExePath = exePath + + var memStats runtime.MemStats + runtime.ReadMemStats(&memStats) + status.MemoryTotal = memStats.Sys + if status.MemoryTotal > 0 { + status.MemoryUsage = float64(memStats.Alloc) / float64(status.MemoryTotal) + } + + load1m, load5m, load15m := readLoadAvg() + status.Load1m = load1m + status.Load5m = load5m + status.Load15m = load15m + + return status +} + +func readLoadAvg() (float64, float64, float64) { + data, err := os.ReadFile("/proc/loadavg") + if err != nil { + return 0, 0, 0 + } + + parts := strings.Fields(strings.TrimSpace(string(data))) + if len(parts) < 3 { + return 0, 0, 0 + } + + load1m, _ := strconv.ParseFloat(parts[0], 64) + load5m, _ := strconv.ParseFloat(parts[1], 64) + load15m, _ := strconv.ParseFloat(parts[2], 64) + return load1m, load5m, load15m +} diff --git a/EdgeHttpDNS/internal/nodes/task_manager.go b/EdgeHttpDNS/internal/nodes/task_manager.go new file mode 100644 index 0000000..f11a6af --- /dev/null +++ b/EdgeHttpDNS/internal/nodes/task_manager.go @@ -0,0 +1,131 @@ +package nodes + +import ( + "fmt" + "log" + "time" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + teaconst "github.com/TeaOSLab/EdgeHttpDNS/internal/const" + "github.com/TeaOSLab/EdgeHttpDNS/internal/rpc" +) + +type TaskManager struct { + quitCh <-chan struct{} + ticker *time.Ticker + version int64 + + snapshotManager *SnapshotManager +} + +func NewTaskManager(quitCh <-chan struct{}, snapshotManager *SnapshotManager) *TaskManager { + return &TaskManager{ + quitCh: quitCh, + ticker: time.NewTicker(20 * time.Second), + version: 0, + snapshotManager: snapshotManager, + } +} + +func (m *TaskManager) Start() { + defer m.ticker.Stop() + + m.processTasks() + for { + select { + case <-m.ticker.C: + m.processTasks() + case <-m.quitCh: + return + } + } +} + +func (m *TaskManager) processTasks() { + rpcClient, err := rpc.SharedRPC() + if err != nil { + log.Println("[HTTPDNS_NODE][task]rpc unavailable:", err.Error()) + return + } + + resp, err := rpcClient.NodeTaskRPC.FindNodeTasks(rpcClient.Context(), &pb.FindNodeTasksRequest{ + Version: m.version, + }) + if err != nil { + log.Println("[HTTPDNS_NODE][task]fetch tasks failed:", err.Error()) + return + } + + for _, task := range resp.GetNodeTasks() { + ok, errorMessage := m.handleTask(task) + + _, reportErr := rpcClient.NodeTaskRPC.ReportNodeTaskDone(rpcClient.Context(), &pb.ReportNodeTaskDoneRequest{ + NodeTaskId: task.GetId(), + IsOk: ok, + Error: errorMessage, + }) + if reportErr != nil { + log.Println("[HTTPDNS_NODE][task]report task result failed:", reportErr.Error()) + } + + if task.GetVersion() > m.version { + m.version = task.GetVersion() + } + } +} + +func (m *TaskManager) handleTask(task *pb.NodeTask) (bool, string) { + taskType := task.GetType() + requestID := fmt.Sprintf("task-%d", task.GetId()) + + switch taskType { + case teaconst.TaskTypeHTTPDNSConfigChanged: + if m.snapshotManager != nil { + if err := m.snapshotManager.RefreshNow(taskType); err != nil { + reportRuntimeLog("error", "config", "task-manager", "refresh snapshot failed: "+err.Error(), requestID) + return false, err.Error() + } + } + reportRuntimeLog("info", "config", "task-manager", "HTTPDNS configuration updated", requestID) + return true, "" + case teaconst.TaskTypeHTTPDNSAppChanged: + if m.snapshotManager != nil { + if err := m.snapshotManager.RefreshNow(taskType); err != nil { + reportRuntimeLog("error", "app", "task-manager", "refresh snapshot failed: "+err.Error(), requestID) + return false, err.Error() + } + } + reportRuntimeLog("info", "app", "task-manager", "HTTPDNS app policy updated", requestID) + return true, "" + case teaconst.TaskTypeHTTPDNSDomainChanged: + if m.snapshotManager != nil { + if err := m.snapshotManager.RefreshNow(taskType); err != nil { + reportRuntimeLog("error", "domain", "task-manager", "refresh snapshot failed: "+err.Error(), requestID) + return false, err.Error() + } + } + reportRuntimeLog("info", "domain", "task-manager", "HTTPDNS domain binding updated", requestID) + return true, "" + case teaconst.TaskTypeHTTPDNSRuleChanged: + if m.snapshotManager != nil { + if err := m.snapshotManager.RefreshNow(taskType); err != nil { + reportRuntimeLog("error", "rule", "task-manager", "refresh snapshot failed: "+err.Error(), requestID) + return false, err.Error() + } + } + reportRuntimeLog("info", "rule", "task-manager", "HTTPDNS custom rule updated", requestID) + return true, "" + case teaconst.TaskTypeHTTPDNSTLSChanged: + if m.snapshotManager != nil { + if err := m.snapshotManager.RefreshNow(taskType); err != nil { + reportRuntimeLog("error", "tls", "task-manager", "refresh snapshot failed: "+err.Error(), requestID) + return false, err.Error() + } + } + reportRuntimeLog("info", "tls", "task-manager", "HTTPDNS TLS config updated", requestID) + return true, "" + default: + reportRuntimeLog("warning", "task", "task-manager", "unknown task type: "+taskType, requestID) + return true, "" + } +} diff --git a/EdgeHttpDNS/internal/nodes/upgrade_manager.go b/EdgeHttpDNS/internal/nodes/upgrade_manager.go new file mode 100644 index 0000000..291ac2f --- /dev/null +++ b/EdgeHttpDNS/internal/nodes/upgrade_manager.go @@ -0,0 +1,280 @@ +package nodes + +import ( + "crypto/md5" + "fmt" + "log" + "os" + "os/exec" + "path/filepath" + "runtime" + "time" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + teaconst "github.com/TeaOSLab/EdgeHttpDNS/internal/const" + "github.com/TeaOSLab/EdgeHttpDNS/internal/rpc" + "github.com/TeaOSLab/EdgeHttpDNS/internal/utils" + "github.com/iwind/TeaGo/Tea" + stringutil "github.com/iwind/TeaGo/utils/string" + "github.com/iwind/gosock/pkg/gosock" +) + +// UpgradeManager 节点升级管理器 +type UpgradeManager struct { + isInstalling bool + lastFile string + exe string +} + +// NewUpgradeManager 获取新对象 +func NewUpgradeManager() *UpgradeManager { + return &UpgradeManager{} +} + +// Loop 启动升级检查循环（每1分钟） +func (this *UpgradeManager) Loop() { + rpcClient, err := rpc.SharedRPC() + if err != nil { + log.Println("[UPGRADE_MANAGER]" + err.Error()) + return + } + + var ticker = time.NewTicker(1 * time.Minute) + for range ticker.C { + resp, err := rpcClient.HTTPDNSNodeRPC.CheckHTTPDNSNodeLatestVersion(rpcClient.Context(), &pb.CheckHTTPDNSNodeLatestVersionRequest{ + Os: runtime.GOOS, + Arch: runtime.GOARCH, + CurrentVersion: teaconst.Version, + }) + if err != nil { + log.Println("[UPGRADE_MANAGER]check version failed: " + err.Error()) + continue + } + if resp.HasNewVersion { + this.Start() + } + } +} + +// Start 启动升级 +func (this *UpgradeManager) Start() { + // 必须放在文件解压之前读取可执行文件路径，防止解压之后，当前的可执行文件路径发生改变 + exe, err := os.Executable() + if err != nil { + log.Println("[UPGRADE_MANAGER]can not find current executable file name") + return + } + this.exe = exe + + // 测试环境下不更新 + if Tea.IsTesting() { + return + } + + if this.isInstalling { + return + } + this.isInstalling = true + + // 还原安装状态 + defer func() { + this.isInstalling = false + }() + + log.Println("[UPGRADE_MANAGER]upgrading httpdns node ...") + err = this.install() + if err != nil { + log.Println("[UPGRADE_MANAGER]download failed: " + err.Error()) + return + } + + log.Println("[UPGRADE_MANAGER]upgrade successfully") + + go func() { + err = this.restart() + if err != nil { + log.Println("[UPGRADE_MANAGER]" + err.Error()) + } + }() +} + +func (this *UpgradeManager) install() error { + // 检查是否有已下载但未安装成功的 + if len(this.lastFile) > 0 { + _, err := os.Stat(this.lastFile) + if err == nil { + err = this.unzip(this.lastFile) + if err != nil { + return err + } + this.lastFile = "" + return nil + } + } + + // 创建临时文件 + dir := Tea.Root + "/tmp" + _, err := os.Stat(dir) + if err != nil { + if os.IsNotExist(err) { + err = os.Mkdir(dir, 0777) + if err != nil { + return err + } + } else { + return err + } + } + + log.Println("[UPGRADE_MANAGER]downloading new node ...") + + path := dir + "/" + teaconst.ProcessName + ".tmp" + fp, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0777) + if err != nil { + return err + } + isClosed := false + defer func() { + if !isClosed { + _ = fp.Close() + } + }() + + client, err := rpc.SharedRPC() + if err != nil { + return err + } + + var offset int64 + var h = md5.New() + var sum = "" + var filename = "" + for { + resp, err := client.HTTPDNSNodeRPC.DownloadHTTPDNSNodeInstallationFile(client.Context(), &pb.DownloadHTTPDNSNodeInstallationFileRequest{ + Os: runtime.GOOS, + Arch: runtime.GOARCH, + ChunkOffset: offset, + }) + if err != nil { + return err + } + if len(resp.Sum) == 0 { + return nil + } + sum = resp.Sum + filename = resp.Filename + if stringutil.VersionCompare(resp.Version, teaconst.Version) <= 0 { + return nil + } + if len(resp.ChunkData) == 0 { + break + } + + // 写入文件 + _, err = fp.Write(resp.ChunkData) + if err != nil { + return err + } + _, err = h.Write(resp.ChunkData) + if err != nil { + return err + } + + offset = resp.Offset + } + + if len(filename) == 0 { + return nil + } + + isClosed = true + err = fp.Close() + if err != nil { + return err + } + + if fmt.Sprintf("%x", h.Sum(nil)) != sum { + _ = os.Remove(path) + return nil + } + + // 改成zip + zipPath := dir + "/" + filename + err = os.Rename(path, zipPath) + if err != nil { + return err + } + this.lastFile = zipPath + + // 解压 + err = this.unzip(zipPath) + if err != nil { + return err + } + + return nil +} + +// 解压 +func (this *UpgradeManager) unzip(zipPath string) error { + var isOk = false + defer func() { + if isOk { + // 只有解压并覆盖成功后才会删除 + _ = os.Remove(zipPath) + } + }() + + // 解压 + var target = Tea.Root + if Tea.IsTesting() { + // 测试环境下只解压在tmp目录 + target = Tea.Root + "/tmp" + } + + // 先改先前的可执行文件 + err := os.Rename(target+"/bin/"+teaconst.ProcessName, target+"/bin/."+teaconst.ProcessName+".dist") + hasBackup := err == nil + defer func() { + if !isOk && hasBackup { + // 失败时还原 + _ = os.Rename(target+"/bin/."+teaconst.ProcessName+".dist", target+"/bin/"+teaconst.ProcessName) + } + }() + + unzip := utils.NewUnzip(zipPath, target, teaconst.ProcessName+"/") + err = unzip.Run() + if err != nil { + return err + } + + isOk = true + + return nil +} + +// 重启 +func (this *UpgradeManager) restart() error { + // 关闭当前sock，防止无法重启 + _ = gosock.NewTmpSock(teaconst.ProcessName).Close() + + // 重新启动 + if DaemonIsOn && DaemonPid == os.Getppid() { + os.Exit(0) + } else { + // 启动 + var exe = filepath.Dir(this.exe) + "/" + teaconst.ProcessName + + log.Println("[UPGRADE_MANAGER]restarting ...", exe) + cmd := exec.Command(exe, "start") + err := cmd.Start() + if err != nil { + return err + } + + // 退出当前进程 + time.Sleep(1 * time.Second) + os.Exit(0) + } + return nil +} diff --git a/EdgeHttpDNS/internal/rpc/rpc_client.go b/EdgeHttpDNS/internal/rpc/rpc_client.go new file mode 100644 index 0000000..52d76c1 --- /dev/null +++ b/EdgeHttpDNS/internal/rpc/rpc_client.go @@ -0,0 +1,222 @@ +package rpc + +import ( + "context" + "crypto/tls" + "encoding/base64" + "errors" + "fmt" + "net/url" + "sync" + "time" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeHttpDNS/internal/configs" + teaconst "github.com/TeaOSLab/EdgeHttpDNS/internal/const" + "github.com/TeaOSLab/EdgeHttpDNS/internal/encrypt" + "github.com/iwind/TeaGo/maps" + "github.com/iwind/TeaGo/rands" + "google.golang.org/grpc" + "google.golang.org/grpc/connectivity" + "google.golang.org/grpc/credentials" + "google.golang.org/grpc/credentials/insecure" + "google.golang.org/grpc/encoding/gzip" + "google.golang.org/grpc/keepalive" + "google.golang.org/grpc/metadata" + "sync/atomic" +) + + +type RPCClient struct { + apiConfig *configs.APIConfig + conns []*grpc.ClientConn + locker sync.RWMutex + + NodeTaskRPC pb.NodeTaskServiceClient + HTTPDNSNodeRPC pb.HTTPDNSNodeServiceClient + HTTPDNSClusterRPC pb.HTTPDNSClusterServiceClient + HTTPDNSAppRPC pb.HTTPDNSAppServiceClient + HTTPDNSDomainRPC pb.HTTPDNSDomainServiceClient + HTTPDNSRuleRPC pb.HTTPDNSRuleServiceClient + HTTPDNSRuntimeLogRPC pb.HTTPDNSRuntimeLogServiceClient + HTTPDNSAccessLogRPC pb.HTTPDNSAccessLogServiceClient + HTTPDNSSandboxRPC pb.HTTPDNSSandboxServiceClient + + totalRequests int64 + failedRequests int64 + totalCostMs int64 +} + + +func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) { + if apiConfig == nil { + return nil, errors.New("api config should not be nil") + } + + client := &RPCClient{apiConfig: apiConfig} + client.NodeTaskRPC = pb.NewNodeTaskServiceClient(client) + client.HTTPDNSNodeRPC = pb.NewHTTPDNSNodeServiceClient(client) + client.HTTPDNSClusterRPC = pb.NewHTTPDNSClusterServiceClient(client) + client.HTTPDNSAppRPC = pb.NewHTTPDNSAppServiceClient(client) + client.HTTPDNSDomainRPC = pb.NewHTTPDNSDomainServiceClient(client) + client.HTTPDNSRuleRPC = pb.NewHTTPDNSRuleServiceClient(client) + client.HTTPDNSRuntimeLogRPC = pb.NewHTTPDNSRuntimeLogServiceClient(client) + client.HTTPDNSAccessLogRPC = pb.NewHTTPDNSAccessLogServiceClient(client) + client.HTTPDNSSandboxRPC = pb.NewHTTPDNSSandboxServiceClient(client) + + err := client.init() + if err != nil { + return nil, err + } + return client, nil +} + +func (c *RPCClient) Context() context.Context { + ctx := context.Background() + payload := maps.Map{ + "timestamp": time.Now().Unix(), + "type": "httpdns", + "userId": 0, + } + + method, err := encrypt.NewMethodInstance(teaconst.EncryptMethod, c.apiConfig.Secret, c.apiConfig.NodeId) + if err != nil { + return context.Background() + } + encrypted, err := method.Encrypt(payload.AsJSON()) + if err != nil { + return context.Background() + } + + token := base64.StdEncoding.EncodeToString(encrypted) + return metadata.AppendToOutgoingContext(ctx, "nodeId", c.apiConfig.NodeId, "token", token) +} + +func (c *RPCClient) UpdateConfig(config *configs.APIConfig) error { + c.apiConfig = config + c.locker.Lock() + defer c.locker.Unlock() + return c.init() +} + +func (c *RPCClient) init() error { + conns := []*grpc.ClientConn{} + for _, endpoint := range c.apiConfig.RPCEndpoints { + u, err := url.Parse(endpoint) + if err != nil { + return fmt.Errorf("parse endpoint failed: %w", err) + } + + var conn *grpc.ClientConn + callOptions := grpc.WithDefaultCallOptions( + grpc.MaxCallRecvMsgSize(128<<20), + grpc.MaxCallSendMsgSize(128<<20), + grpc.UseCompressor(gzip.Name), + ) + keepaliveParams := grpc.WithKeepaliveParams(keepalive.ClientParameters{ + Time: 30 * time.Second, + }) + + if u.Scheme == "http" { + conn, err = grpc.Dial(u.Host, grpc.WithTransportCredentials(insecure.NewCredentials()), callOptions, keepaliveParams) + } else if u.Scheme == "https" { + conn, err = grpc.Dial(u.Host, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{ + InsecureSkipVerify: true, + })), callOptions, keepaliveParams) + } else { + return errors.New("invalid endpoint scheme '" + u.Scheme + "'") + } + if err != nil { + return err + } + conns = append(conns, conn) + } + + if len(conns) == 0 { + return errors.New("no available rpc endpoints") + } + + c.conns = conns + return nil +} + +func (c *RPCClient) pickConn() *grpc.ClientConn { + c.locker.RLock() + defer c.locker.RUnlock() + + countConns := len(c.conns) + if countConns == 0 { + return nil + } + if countConns == 1 { + return c.conns[0] + } + + for _, state := range []connectivity.State{ + connectivity.Ready, + connectivity.Idle, + connectivity.Connecting, + connectivity.TransientFailure, + } { + available := []*grpc.ClientConn{} + for _, conn := range c.conns { + if conn.GetState() == state { + available = append(available, conn) + } + } + if len(available) > 0 { + return c.randConn(available) + } + } + + return c.randConn(c.conns) +} + +func (c *RPCClient) randConn(conns []*grpc.ClientConn) *grpc.ClientConn { + l := len(conns) + if l == 0 { + return nil + } + if l == 1 { + return conns[0] + } + return conns[rands.Int(0, l-1)] +} + +func (c *RPCClient) Invoke(ctx context.Context, method string, args interface{}, reply interface{}, opts ...grpc.CallOption) error { + conn := c.pickConn() + if conn == nil { + return errors.New("can not get available grpc connection") + } + + atomic.AddInt64(&c.totalRequests, 1) + start := time.Now() + err := conn.Invoke(ctx, method, args, reply, opts...) + costMs := time.Since(start).Milliseconds() + atomic.AddInt64(&c.totalCostMs, costMs) + + if err != nil { + atomic.AddInt64(&c.failedRequests, 1) + } + return err +} + +func (c *RPCClient) GetAndResetMetrics() (total int64, failed int64, avgCostSeconds float64) { + total = atomic.SwapInt64(&c.totalRequests, 0) + failed = atomic.SwapInt64(&c.failedRequests, 0) + costMs := atomic.SwapInt64(&c.totalCostMs, 0) + + if total > 0 { + avgCostSeconds = float64(costMs) / float64(total) / 1000.0 + } + return +} + + +func (c *RPCClient) NewStream(ctx context.Context, desc *grpc.StreamDesc, method string, opts ...grpc.CallOption) (grpc.ClientStream, error) { + conn := c.pickConn() + if conn == nil { + return nil, errors.New("can not get available grpc connection") + } + return conn.NewStream(ctx, desc, method, opts...) +} diff --git a/EdgeHttpDNS/internal/rpc/shared.go b/EdgeHttpDNS/internal/rpc/shared.go new file mode 100644 index 0000000..bff809e --- /dev/null +++ b/EdgeHttpDNS/internal/rpc/shared.go @@ -0,0 +1,31 @@ +package rpc + +import ( + "sync" + + "github.com/TeaOSLab/EdgeHttpDNS/internal/configs" +) + +var sharedRPCClient *RPCClient +var sharedLocker sync.Mutex + +func SharedRPC() (*RPCClient, error) { + sharedLocker.Lock() + defer sharedLocker.Unlock() + + config, err := configs.SharedAPIConfig() + if err != nil { + return nil, err + } + + if sharedRPCClient == nil { + client, err := NewRPCClient(config) + if err != nil { + return nil, err + } + sharedRPCClient = client + return sharedRPCClient, nil + } + + return sharedRPCClient, nil +} diff --git a/EdgeHttpDNS/internal/utils/exec/cmd.go b/EdgeHttpDNS/internal/utils/exec/cmd.go new file mode 100644 index 0000000..f1a4178 --- /dev/null +++ b/EdgeHttpDNS/internal/utils/exec/cmd.go @@ -0,0 +1,160 @@ +package executils + +import ( + "bytes" + "context" + "os" + "os/exec" + "strings" + "time" +) + +type Cmd struct { + name string + args []string + env []string + dir string + + ctx context.Context + timeout time.Duration + cancelFunc func() + + captureStdout bool + captureStderr bool + + stdout *bytes.Buffer + stderr *bytes.Buffer + + rawCmd *exec.Cmd +} + +func NewCmd(name string, args ...string) *Cmd { + return &Cmd{ + name: name, + args: args, + } +} + +func NewTimeoutCmd(timeout time.Duration, name string, args ...string) *Cmd { + return (&Cmd{ + name: name, + args: args, + }).WithTimeout(timeout) +} + +func (this *Cmd) WithTimeout(timeout time.Duration) *Cmd { + this.timeout = timeout + + ctx, cancelFunc := context.WithTimeout(context.Background(), timeout) + this.ctx = ctx + this.cancelFunc = cancelFunc + + return this +} + +func (this *Cmd) WithStdout() *Cmd { + this.captureStdout = true + return this +} + +func (this *Cmd) WithStderr() *Cmd { + this.captureStderr = true + return this +} + +func (this *Cmd) WithEnv(env []string) *Cmd { + this.env = env + return this +} + +func (this *Cmd) WithDir(dir string) *Cmd { + this.dir = dir + return this +} + +func (this *Cmd) Start() error { + var cmd = this.compose() + return cmd.Start() +} + +func (this *Cmd) Wait() error { + var cmd = this.compose() + return cmd.Wait() +} + +func (this *Cmd) Run() error { + if this.cancelFunc != nil { + defer this.cancelFunc() + } + + var cmd = this.compose() + return cmd.Run() +} + +func (this *Cmd) RawStdout() string { + if this.stdout != nil { + return this.stdout.String() + } + return "" +} + +func (this *Cmd) Stdout() string { + return strings.TrimSpace(this.RawStdout()) +} + +func (this *Cmd) RawStderr() string { + if this.stderr != nil { + return this.stderr.String() + } + return "" +} + +func (this *Cmd) Stderr() string { + return strings.TrimSpace(this.RawStderr()) +} + +func (this *Cmd) String() string { + if this.rawCmd != nil { + return this.rawCmd.String() + } + var newCmd = exec.Command(this.name, this.args...) + return newCmd.String() +} + +func (this *Cmd) Process() *os.Process { + if this.rawCmd != nil { + return this.rawCmd.Process + } + return nil +} + +func (this *Cmd) compose() *exec.Cmd { + if this.rawCmd != nil { + return this.rawCmd + } + + if this.ctx != nil { + this.rawCmd = exec.CommandContext(this.ctx, this.name, this.args...) + } else { + this.rawCmd = exec.Command(this.name, this.args...) + } + + if this.env != nil { + this.rawCmd.Env = this.env + } + + if len(this.dir) > 0 { + this.rawCmd.Dir = this.dir + } + + if this.captureStdout { + this.stdout = &bytes.Buffer{} + this.rawCmd.Stdout = this.stdout + } + if this.captureStderr { + this.stderr = &bytes.Buffer{} + this.rawCmd.Stderr = this.stderr + } + + return this.rawCmd +} diff --git a/EdgeHttpDNS/internal/utils/exec/look_linux.go b/EdgeHttpDNS/internal/utils/exec/look_linux.go new file mode 100644 index 0000000..e65cb42 --- /dev/null +++ b/EdgeHttpDNS/internal/utils/exec/look_linux.go @@ -0,0 +1,57 @@ +//go:build linux + +package executils + +import ( + "golang.org/x/sys/unix" + "io/fs" + "os" + "os/exec" + "syscall" +) + +// LookPath customize our LookPath() function, to work in broken $PATH environment variable +func LookPath(file string) (string, error) { + result, err := exec.LookPath(file) + if err == nil && len(result) > 0 { + return result, nil + } + + // add common dirs contains executable files these may be excluded in $PATH environment variable + var binPaths = []string{ + "/usr/sbin", + "/usr/bin", + "/usr/local/sbin", + "/usr/local/bin", + } + + for _, binPath := range binPaths { + var fullPath = binPath + string(os.PathSeparator) + file + + stat, err := os.Stat(fullPath) + if err != nil { + continue + } + if stat.IsDir() { + return "", syscall.EISDIR + } + + var mode = stat.Mode() + if mode.IsDir() { + return "", syscall.EISDIR + } + err = syscall.Faccessat(unix.AT_FDCWD, fullPath, unix.X_OK, unix.AT_EACCESS) + if err == nil || (err != syscall.ENOSYS && err != syscall.EPERM) { + return fullPath, err + } + if mode&0111 != 0 { + return fullPath, nil + } + return "", fs.ErrPermission + } + + return "", &exec.Error{ + Name: file, + Err: exec.ErrNotFound, + } +} diff --git a/EdgeHttpDNS/internal/utils/exec/look_others.go b/EdgeHttpDNS/internal/utils/exec/look_others.go new file mode 100644 index 0000000..17132a0 --- /dev/null +++ b/EdgeHttpDNS/internal/utils/exec/look_others.go @@ -0,0 +1,9 @@ +//go:build !linux + +package executils + +import "os/exec" + +func LookPath(file string) (string, error) { + return exec.LookPath(file) +} diff --git a/EdgeHttpDNS/internal/utils/ip.go b/EdgeHttpDNS/internal/utils/ip.go new file mode 100644 index 0000000..88ea3c9 --- /dev/null +++ b/EdgeHttpDNS/internal/utils/ip.go @@ -0,0 +1,18 @@ +package utils + +import ( + "encoding/binary" + "net" +) + +func IP2Long(ip string) uint32 { + s := net.ParseIP(ip) + if s == nil { + return 0 + } + + if len(s) == 16 { + return binary.BigEndian.Uint32(s[12:16]) + } + return binary.BigEndian.Uint32(s) +} diff --git a/EdgeHttpDNS/internal/utils/service.go b/EdgeHttpDNS/internal/utils/service.go new file mode 100644 index 0000000..2435036 --- /dev/null +++ b/EdgeHttpDNS/internal/utils/service.go @@ -0,0 +1,46 @@ +package utils + +import ( + "os" + "path/filepath" + "sync" + + "github.com/iwind/TeaGo/Tea" +) + +type ServiceManager struct { + Name string + Description string + + onceLocker sync.Once +} + +func NewServiceManager(name, description string) *ServiceManager { + manager := &ServiceManager{ + Name: name, + Description: description, + } + manager.resetRoot() + return manager +} + +func (m *ServiceManager) setup() { + m.onceLocker.Do(func() {}) +} + +func (m *ServiceManager) resetRoot() { + if !Tea.IsTesting() { + exePath, err := os.Executable() + if err != nil { + exePath = os.Args[0] + } + link, err := filepath.EvalSymlinks(exePath) + if err == nil { + exePath = link + } + fullPath, err := filepath.Abs(exePath) + if err == nil { + Tea.UpdateRoot(filepath.Dir(filepath.Dir(fullPath))) + } + } +} diff --git a/EdgeHttpDNS/internal/utils/service_linux.go b/EdgeHttpDNS/internal/utils/service_linux.go new file mode 100644 index 0000000..3a392a4 --- /dev/null +++ b/EdgeHttpDNS/internal/utils/service_linux.go @@ -0,0 +1,215 @@ +//go:build linux +// +build linux + +package utils + +import ( + "errors" + "os" + "time" + + teaconst "github.com/TeaOSLab/EdgeHttpDNS/internal/const" + executils "github.com/TeaOSLab/EdgeHttpDNS/internal/utils/exec" + "github.com/iwind/TeaGo/Tea" +) + +var systemdServiceFile = "/etc/systemd/system/" + teaconst.SystemdServiceName + ".service" +var initServiceFile = "/etc/init.d/" + teaconst.SystemdServiceName + +// Install 安装系统服务 +func (m *ServiceManager) Install(exePath string, args []string) error { + if os.Getgid() != 0 { + return errors.New("only root users can install the service") + } + + systemd, err := executils.LookPath("systemctl") + if err != nil { + // systemd 不可用，降级到 init.d + return m.installInitService(exePath, args) + } + + return m.installSystemdService(systemd, exePath, args) +} + +// Start 启动服务 +func (m *ServiceManager) Start() error { + if os.Getgid() != 0 { + return errors.New("only root users can start the service") + } + + // 优先检查 systemd + if fileExists(systemdServiceFile) { + systemd, err := executils.LookPath("systemctl") + if err != nil { + return err + } + return executils.NewTimeoutCmd(10*time.Second, systemd, "start", teaconst.SystemdServiceName+".service").Start() + } + + // 降级到 init.d + if fileExists(initServiceFile) { + return executils.NewTimeoutCmd(10*time.Second, "service", teaconst.ProcessName, "start").Start() + } + + return errors.New("no service file found, please install the service first") +} + +// Uninstall 删除服务 +func (m *ServiceManager) Uninstall() error { + if os.Getgid() != 0 { + return errors.New("only root users can uninstall the service") + } + + // systemd + if fileExists(systemdServiceFile) { + systemd, err := executils.LookPath("systemctl") + if err == nil { + _ = executils.NewTimeoutCmd(10*time.Second, systemd, "stop", teaconst.SystemdServiceName+".service").Run() + _ = executils.NewTimeoutCmd(10*time.Second, systemd, "disable", teaconst.SystemdServiceName+".service").Run() + _ = executils.NewTimeoutCmd(10*time.Second, systemd, "daemon-reload").Run() + } + return os.Remove(systemdServiceFile) + } + + // init.d + if fileExists(initServiceFile) { + _ = executils.NewTimeoutCmd(10*time.Second, "service", teaconst.ProcessName, "stop").Run() + chkCmd, err := executils.LookPath("chkconfig") + if err == nil { + _ = executils.NewTimeoutCmd(10*time.Second, chkCmd, "--del", teaconst.ProcessName).Run() + } + return os.Remove(initServiceFile) + } + + return nil +} + +// installSystemdService 安装 systemd 服务 +func (m *ServiceManager) installSystemdService(systemd, exePath string, args []string) error { + shortName := teaconst.SystemdServiceName + longName := "GoEdge HTTPDNS" + + // 用 bash 包装启动命令，兼容路径含空格的场景 + var startCmd = exePath + " daemon" + bashPath, _ := executils.LookPath("bash") + if len(bashPath) > 0 { + startCmd = bashPath + " -c \"" + startCmd + "\"" + } + + desc := `### BEGIN INIT INFO +# Provides: ` + shortName + ` +# Required-Start: $all +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: +# Short-Description: ` + longName + ` Service +### END INIT INFO + +[Unit] +Description=` + longName + ` Node Service +Before=shutdown.target +After=network-online.target + +[Service] +Type=simple +Restart=always +RestartSec=1s +ExecStart=` + startCmd + ` +ExecStop=` + exePath + ` stop +ExecReload=` + exePath + ` restart + +[Install] +WantedBy=multi-user.target` + + // 权限 0644，systemd 单元文件不需要执行权限 + err := os.WriteFile(systemdServiceFile, []byte(desc), 0644) + if err != nil { + return err + } + + // 停止已有服务 + _ = executils.NewTimeoutCmd(10*time.Second, systemd, "stop", shortName+".service").Run() + + // 重新加载 + _ = executils.NewTimeoutCmd(10*time.Second, systemd, "daemon-reload").Run() + + // 启用开机自启 + return executils.NewTimeoutCmd(10*time.Second, systemd, "enable", shortName+".service").Run() +} + +// installInitService 安装 init.d 服务（降级方案，适用于无 systemd 的旧系统） +func (m *ServiceManager) installInitService(exePath string, args []string) error { + shortName := teaconst.SystemdServiceName + longName := "GoEdge HTTPDNS" + + // 生成 init.d 脚本 + script := `#!/bin/bash +### BEGIN INIT INFO +# Provides: ` + shortName + ` +# Required-Start: $all +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ` + longName + ` Service +### END INIT INFO + +INSTALL_DIR=` + Tea.Root + ` + +case "$1" in +start) + cd "${INSTALL_DIR}" + ` + exePath + ` daemon & + echo "` + longName + ` started" + ;; +stop) + cd "${INSTALL_DIR}" + ` + exePath + ` stop + echo "` + longName + ` stopped" + ;; +restart) + cd "${INSTALL_DIR}" + ` + exePath + ` stop + sleep 1 + ` + exePath + ` daemon & + echo "` + longName + ` restarted" + ;; +status) + cd "${INSTALL_DIR}" + ` + exePath + ` status + ;; +*) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac +exit 0 +` + + // init.d 脚本需要执行权限 + err := os.WriteFile(initServiceFile, []byte(script), 0755) + if err != nil { + return err + } + + // 尝试用 chkconfig 注册（CentOS/RHEL） + chkCmd, err := executils.LookPath("chkconfig") + if err == nil { + _ = executils.NewTimeoutCmd(10*time.Second, chkCmd, "--add", teaconst.ProcessName).Run() + return nil + } + + // 尝试用 update-rc.d 注册（Debian/Ubuntu） + updateRcCmd, err := executils.LookPath("update-rc.d") + if err == nil { + _ = executils.NewTimeoutCmd(10*time.Second, updateRcCmd, teaconst.ProcessName, "defaults").Run() + return nil + } + + return nil +} + +// fileExists 检查文件是否存在 +func fileExists(path string) bool { + _, err := os.Stat(path) + return err == nil +} diff --git a/EdgeHttpDNS/internal/utils/service_others.go b/EdgeHttpDNS/internal/utils/service_others.go new file mode 100644 index 0000000..e42b43c --- /dev/null +++ b/EdgeHttpDNS/internal/utils/service_others.go @@ -0,0 +1,14 @@ +//go:build !linux +// +build !linux + +package utils + +import "errors" + +func (m *ServiceManager) Install(exePath string, args []string) error { + return errors.New("service install is only supported on linux in this version") +} + +func (m *ServiceManager) Uninstall() error { + return errors.New("service uninstall is only supported on linux in this version") +} diff --git a/EdgeHttpDNS/internal/utils/unzip.go b/EdgeHttpDNS/internal/utils/unzip.go new file mode 100644 index 0000000..95e4bdb --- /dev/null +++ b/EdgeHttpDNS/internal/utils/unzip.go @@ -0,0 +1,98 @@ +package utils + +import ( + "archive/zip" + "errors" + "io" + "os" + "strings" +) + +type Unzip struct { + zipFile string + targetDir string + stripPrefix string +} + +func NewUnzip(zipFile string, targetDir string, stripPrefix string) *Unzip { + return &Unzip{ + zipFile: zipFile, + targetDir: targetDir, + stripPrefix: stripPrefix, + } +} + +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() + filename := file.Name + if len(this.stripPrefix) > 0 { + filename = strings.TrimPrefix(filename, this.stripPrefix) + } + target := this.targetDir + "/" + filename + + // 目录 + 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 +} diff --git a/EdgeHttpDNS/internal/utils/version.go b/EdgeHttpDNS/internal/utils/version.go new file mode 100644 index 0000000..0e28897 --- /dev/null +++ b/EdgeHttpDNS/internal/utils/version.go @@ -0,0 +1,15 @@ +package utils + +import "strings" + +func VersionToLong(version string) uint32 { + countDots := strings.Count(version, ".") + if countDots == 2 { + version += ".0" + } else if countDots == 1 { + version += ".0.0" + } else if countDots == 0 { + version += ".0.0.0" + } + return IP2Long(version) +} diff --git a/EdgeNode/internal/const/const.go b/EdgeNode/internal/const/const.go index 73081fb..ae07326 100644 --- a/EdgeNode/internal/const/const.go +++ b/EdgeNode/internal/const/const.go @@ -1,7 +1,7 @@ package teaconst const ( - Version = "1.4.7" //1.3.8.2 + Version = "1.4.9" //1.3.8.2 ProductName = "Edge Node" ProcessName = "edge-node" diff --git a/EdgePlus/pkg/utils/edition.go b/EdgePlus/pkg/utils/edition.go index c3e540a..30a2819 100644 --- a/EdgePlus/pkg/utils/edition.go +++ b/EdgePlus/pkg/utils/edition.go @@ -17,7 +17,7 @@ func FindAllEditions() []*EditionDefinition { MaxNodes: 20, }, { - Name: "专业版", + Name: "商业版", Code: EditionPro, MaxNodes: 100, }, diff --git a/EdgeUser/internal/const/const.go b/EdgeUser/internal/const/const.go index 9adfbef..d085702 100644 --- a/EdgeUser/internal/const/const.go +++ b/EdgeUser/internal/const/const.go @@ -1,7 +1,7 @@ package teaconst const ( - Version = "1.4.7" //1.3.8.2 + Version = "1.4.9" //1.3.8.2 ProductName = "Edge User" ProcessName = "edge-user" diff --git a/EdgeUser/internal/rpc/rpc_client.go b/EdgeUser/internal/rpc/rpc_client.go index 2dfbdb4..028eea2 100644 --- a/EdgeUser/internal/rpc/rpc_client.go +++ b/EdgeUser/internal/rpc/rpc_client.go @@ -420,6 +420,34 @@ func (this *RPCClient) NSPlanRPC() pb.NSPlanServiceClient { return pb.NewNSPlanServiceClient(this.pickConn()) } +func (this *RPCClient) HTTPDNSClusterRPC() pb.HTTPDNSClusterServiceClient { + return pb.NewHTTPDNSClusterServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSNodeRPC() pb.HTTPDNSNodeServiceClient { + return pb.NewHTTPDNSNodeServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSAppRPC() pb.HTTPDNSAppServiceClient { + return pb.NewHTTPDNSAppServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSDomainRPC() pb.HTTPDNSDomainServiceClient { + return pb.NewHTTPDNSDomainServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSRuleRPC() pb.HTTPDNSRuleServiceClient { + return pb.NewHTTPDNSRuleServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSAccessLogRPC() pb.HTTPDNSAccessLogServiceClient { + return pb.NewHTTPDNSAccessLogServiceClient(this.pickConn()) +} + +func (this *RPCClient) HTTPDNSSandboxRPC() pb.HTTPDNSSandboxServiceClient { + return pb.NewHTTPDNSSandboxServiceClient(this.pickConn()) +} + func (this *RPCClient) ServerBandwidthStatRPC() pb.ServerBandwidthStatServiceClient { return pb.NewServerBandwidthStatServiceClient(this.pickConn()) } diff --git a/EdgeUser/internal/web/actions/default/httpdns/addPortPopup.go b/EdgeUser/internal/web/actions/default/httpdns/addPortPopup.go new file mode 100644 index 0000000..c533db3 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/addPortPopup.go @@ -0,0 +1,123 @@ +package httpdns + +import ( + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" + "github.com/iwind/TeaGo/types" + "regexp" + "strings" +) + +type AddPortPopupAction struct { + actionutils.ParentAction +} + +func (this *AddPortPopupAction) Init() { + this.Nav("", "", "") +} + +func (this *AddPortPopupAction) RunGet(params struct { + Protocol string + From string + SupportRange bool +}) { + this.Data["from"] = params.From + + var protocols = serverconfigs.FindAllServerProtocols() + if len(params.Protocol) > 0 { + result := []maps.Map{} + for _, p := range protocols { + if p.GetString("code") == params.Protocol { + result = append(result, p) + } + } + protocols = result + } + this.Data["protocols"] = protocols + + this.Data["supportRange"] = params.SupportRange + + this.Show() +} + +func (this *AddPortPopupAction) RunPost(params struct { + SupportRange bool + + Protocol string + Address string + + Must *actions.Must +}) { + // 鏍￠獙鍦板潃 + var addr = maps.Map{ + "protocol": params.Protocol, + "host": "", + "portRange": "", + "minPort": 0, + "maxPort": 0, + } + + var portRegexp = regexp.MustCompile(`^\d+$`) + if portRegexp.MatchString(params.Address) { // 鍗曚釜绔彛 + addr["portRange"] = this.checkPort(params.Address) + } else if params.SupportRange && regexp.MustCompile(`^\d+\s*-\s*\d+$`).MatchString(params.Address) { // Port1-Port2 + addr["portRange"], addr["minPort"], addr["maxPort"] = this.checkPortRange(params.Address) + } else if strings.Contains(params.Address, ":") { // IP:Port + index := strings.LastIndex(params.Address, ":") + addr["host"] = strings.TrimSpace(params.Address[:index]) + port := strings.TrimSpace(params.Address[index+1:]) + if portRegexp.MatchString(port) { + addr["portRange"] = this.checkPort(port) + } else if params.SupportRange && regexp.MustCompile(`^\d+\s*-\s*\d+$`).MatchString(port) { // Port1-Port2 + addr["portRange"], addr["minPort"], addr["maxPort"] = this.checkPortRange(port) + } else { + this.FailField("address", "璇疯緭鍏ユ纭殑绔彛鎴栬€呯綉缁滃湴鍧€") + } + } else { + this.FailField("address", "璇疯緭鍏ユ纭殑绔彛鎴栬€呯綉缁滃湴鍧€") + } + + this.Data["address"] = addr + this.Success() +} + +func (this *AddPortPopupAction) checkPort(port string) (portRange string) { + var intPort = types.Int(port) + if intPort < 1 { + this.FailField("address", "绔彛鍙蜂笉鑳藉皬浜?") + } + if intPort > 65535 { + this.FailField("address", "绔彛鍙蜂笉鑳藉ぇ浜?5535") + } + return port +} + +func (this *AddPortPopupAction) checkPortRange(port string) (portRange string, minPort int, maxPort int) { + var pieces = strings.Split(port, "-") + var piece1 = strings.TrimSpace(pieces[0]) + var piece2 = strings.TrimSpace(pieces[1]) + var port1 = types.Int(piece1) + var port2 = types.Int(piece2) + + if port1 < 1 { + this.FailField("address", "绔彛鍙蜂笉鑳藉皬浜?") + } + if port1 > 65535 { + this.FailField("address", "绔彛鍙蜂笉鑳藉ぇ浜?5535") + } + + if port2 < 1 { + this.FailField("address", "绔彛鍙蜂笉鑳藉皬浜?") + } + if port2 > 65535 { + this.FailField("address", "绔彛鍙蜂笉鑳藉ぇ浜?5535") + } + + if port1 > port2 { + port1, port2 = port2, port1 + } + + return types.String(port1) + "-" + types.String(port2), port1, port2 +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/app.go b/EdgeUser/internal/web/actions/default/httpdns/apps/app.go new file mode 100644 index 0000000..86bc071 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/app.go @@ -0,0 +1,26 @@ +package apps + +import ( + "strconv" + + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" +) + +type AppAction struct { + actionutils.ParentAction +} + +func (this *AppAction) Init() { + this.Nav("httpdns", "app", "") +} + +func (this *AppAction) RunGet(params struct { + AppId int64 +}) { + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + this.RedirectURL("/httpdns/apps/domains?appId=" + strconv.FormatInt(app.GetInt64("id"), 10)) +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/appSettings.go b/EdgeUser/internal/web/actions/default/httpdns/apps/appSettings.go new file mode 100644 index 0000000..3e30df7 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/appSettings.go @@ -0,0 +1,156 @@ +package apps +import ( + "encoding/json" + "strconv" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" +) + +type AppSettingsAction struct { + actionutils.ParentAction +} + +func (this *AppSettingsAction) Init() { + this.Nav("httpdns", "app", "settings") +} + +func (this *AppSettingsAction) RunGet(params struct { + AppId int64 + Section string +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + + httpdnsutils.AddAppTabbar(this.Parent(), app.GetString("name"), app.GetInt64("id"), "settings") + + section := params.Section + if len(section) == 0 { + section = "basic" + } + this.Data["activeSection"] = section + + appIDStr := strconv.FormatInt(app.GetInt64("id"), 10) + this.Data["leftMenuItems"] = []maps.Map{ + { + "name": "基础配置", + "url": "/httpdns/apps/app/settings?appId=" + appIDStr + "§ion=basic", + "isActive": section == "basic", + }, + { + "name": "认证与密钥", + "url": "/httpdns/apps/app/settings?appId=" + appIDStr + "§ion=auth", + "isActive": section == "auth", + }, + } + + clusterResp, err := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.UserContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + clusterApiAddressMap := map[int64]string{} + clusterNameMap := map[int64]string{} + for _, cluster := range clusterResp.GetClusters() { + port := "443" + if rawTLS := cluster.GetTlsPolicyJSON(); len(rawTLS) > 0 { + var tlsConfig map[string]interface{} + if err := json.Unmarshal(rawTLS, &tlsConfig); err == nil { + if listenRaw, ok := tlsConfig["listen"]; ok && listenRaw != nil { + if data, err := json.Marshal(listenRaw); err == nil { + var listenAddresses []map[string]interface{} + if err := json.Unmarshal(data, &listenAddresses); err == nil { + if len(listenAddresses) > 0 { + if portRange, ok := listenAddresses[0]["portRange"].(string); ok && len(portRange) > 0 { + port = portRange + } + } + } + } + } + } + } + apiAddress := "https://" + cluster.GetServiceDomain() + ":" + port + clusterApiAddressMap[cluster.GetId()] = apiAddress + clusterNameMap[cluster.GetId()] = cluster.GetName() + } + + // 读取应用绑定的集群列表 + var clusterIds []int64 + if raw := app.Get("clusterIds"); raw != nil { + if ids, ok := raw.([]int64); ok { + clusterIds = ids + } + } + + // 构建服务地址列表 + serviceAddresses := make([]maps.Map, 0) + for _, cid := range clusterIds { + addr := clusterApiAddressMap[cid] + name := clusterNameMap[cid] + if len(addr) > 0 { + serviceAddresses = append(serviceAddresses, maps.Map{ + "address": addr, + "clusterName": name, + }) + } + } + + settings := maps.Map{ + "appId": app.GetString("appId"), + "appStatus": app.GetBool("isOn"), + "serviceAddresses": serviceAddresses, + "signEnabled": app.GetBool("signEnabled"), + "signSecretPlain": app.GetString("signSecretPlain"), + "signSecretMasked": app.GetString("signSecretMasked"), + "signSecretUpdatedAt": app.GetString("signSecretUpdated"), + } + this.Data["app"] = app + this.Data["settings"] = settings + this.Show() +} + +func (this *AppSettingsAction) RunPost(params struct { + AppId int64 + + AppStatus bool + + Must *actions.Must + CSRF *actionutils.CSRF +}) { + params.Must.Field("appId", params.AppId).Gt(0, "请选择应用") + + appResp, err := this.RPC().HTTPDNSAppRPC().FindHTTPDNSApp(this.UserContext(), &pb.FindHTTPDNSAppRequest{ + AppDbId: params.AppId, + }) + if err != nil { + this.ErrorPage(err) + return + } + if appResp.GetApp() == nil { + this.Fail("找不到对应的应用") + return + } + + _, err = this.RPC().HTTPDNSAppRPC().UpdateHTTPDNSApp(this.UserContext(), &pb.UpdateHTTPDNSAppRequest{ + AppDbId: params.AppId, + Name: appResp.GetApp().GetName(), + ClusterIdsJSON: appResp.GetApp().GetClusterIdsJSON(), + IsOn: params.AppStatus, + UserId: appResp.GetApp().GetUserId(), + }) + if err != nil { + this.ErrorPage(err) + return + } + + this.Success() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/appSettingsResetSignSecret.go b/EdgeUser/internal/web/actions/default/httpdns/apps/appSettingsResetSignSecret.go new file mode 100644 index 0000000..c8eade0 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/appSettingsResetSignSecret.go @@ -0,0 +1,29 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/iwind/TeaGo/actions" +) + +type AppSettingsResetSignSecretAction struct { + actionutils.ParentAction +} + +func (this *AppSettingsResetSignSecretAction) RunPost(params struct { + AppId int64 + + Must *actions.Must +}) { + params.Must.Field("appId", params.AppId).Gt(0, "请选择应用") + + _, err := this.RPC().HTTPDNSAppRPC().ResetHTTPDNSAppSignSecret(this.UserContext(), &pb.ResetHTTPDNSAppSignSecretRequest{ + AppDbId: params.AppId, + }) + if err != nil { + this.ErrorPage(err) + return + } + + this.Success() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/appSettingsToggleSignEnabled.go b/EdgeUser/internal/web/actions/default/httpdns/apps/appSettingsToggleSignEnabled.go new file mode 100644 index 0000000..89cdbcb --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/appSettingsToggleSignEnabled.go @@ -0,0 +1,31 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/iwind/TeaGo/actions" +) + +type AppSettingsToggleSignEnabledAction struct { + actionutils.ParentAction +} + +func (this *AppSettingsToggleSignEnabledAction) RunPost(params struct { + AppId int64 + IsOn int + + Must *actions.Must +}) { + params.Must.Field("appId", params.AppId).Gt(0, "请选择应用") + + _, err := this.RPC().HTTPDNSAppRPC().UpdateHTTPDNSAppSignEnabled(this.UserContext(), &pb.UpdateHTTPDNSAppSignEnabledRequest{ + AppDbId: params.AppId, + SignEnabled: params.IsOn == 1, + }) + if err != nil { + this.ErrorPage(err) + return + } + + this.Success() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/create.go b/EdgeUser/internal/web/actions/default/httpdns/apps/create.go new file mode 100644 index 0000000..5dfee04 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/create.go @@ -0,0 +1,45 @@ +package apps + +import ( + "strconv" + "time" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/iwind/TeaGo/actions" +) + +type CreateAction struct { + actionutils.ParentAction +} + +func (this *CreateAction) Init() { + this.Nav("", "", "create") +} + +func (this *CreateAction) RunGet(params struct{}) { + this.Show() +} + +func (this *CreateAction) RunPost(params struct { + Name string + + Must *actions.Must + CSRF *actionutils.CSRF +}) { + params.Must.Field("name", params.Name).Require("请输入应用名称") + + createResp, err := this.RPC().HTTPDNSAppRPC().CreateHTTPDNSApp(this.UserContext(), &pb.CreateHTTPDNSAppRequest{ + Name: params.Name, + AppId: "app" + strconv.FormatInt(time.Now().UnixNano()%1_000_000_000_000, 36), + IsOn: true, + SignEnabled: true, + }) + if err != nil { + this.ErrorPage(err) + return + } + + this.Data["appId"] = createResp.GetAppDbId() + this.Success() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/customRecords.go b/EdgeUser/internal/web/actions/default/httpdns/apps/customRecords.go new file mode 100644 index 0000000..e9a5d67 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/customRecords.go @@ -0,0 +1,55 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/iwind/TeaGo/maps" +) + +type CustomRecordsAction struct { + actionutils.ParentAction +} + +func (this *CustomRecordsAction) Init() { + this.Nav("httpdns", "app", "") +} + +func (this *CustomRecordsAction) RunGet(params struct { + AppId int64 + DomainId int64 +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + httpdnsutils.AddAppTabbar(this.Parent(), app.GetString("name"), app.GetInt64("id"), "domains") + + domains, err := listDomainMaps(this.Parent(), app.GetInt64("id"), "") + if err != nil { + this.ErrorPage(err) + return + } + domain := findDomainMap(domains, params.DomainId) + + records := make([]maps.Map, 0) + if domain.GetInt64("id") > 0 { + records, err = listCustomRuleMaps(this.Parent(), domain.GetInt64("id")) + if err != nil { + this.ErrorPage(err) + return + } + for _, record := range records { + record["domain"] = domain.GetString("name") + record["lineText"] = buildLineText(record) + record["recordValueText"] = buildRecordValueText(record) + } + } + + this.Data["app"] = app + this.Data["domain"] = domain + this.Data["records"] = records + this.Show() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/customRecordsCreatePopup.go b/EdgeUser/internal/web/actions/default/httpdns/apps/customRecordsCreatePopup.go new file mode 100644 index 0000000..07fa372 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/customRecordsCreatePopup.go @@ -0,0 +1,263 @@ +package apps + +import ( + "encoding/json" + "fmt" + "strings" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" +) + +type CustomRecordsCreatePopupAction struct { + actionutils.ParentAction +} + +func (this *CustomRecordsCreatePopupAction) Init() { + this.Nav("", "", "") +} + +func (this *CustomRecordsCreatePopupAction) RunGet(params struct { + AppId int64 + DomainId int64 + RecordId int64 +}) { + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + + domains, err := listDomainMaps(this.Parent(), app.GetInt64("id"), "") + if err != nil { + this.ErrorPage(err) + return + } + domain := findDomainMap(domains, params.DomainId) + + record := maps.Map{ + "id": int64(0), + "domain": domain.GetString("name"), + "lineScope": "china", + "lineCarrier": "默认", + "lineRegion": "默认", + "lineProvince": "默认", + "lineContinent": "默认", + "lineCountry": "默认", + "ruleName": "", + "weightEnabled": false, + "ttl": 60, + "isOn": true, + "recordItemsJson": `[{"type":"A","value":"","weight":100}]`, + } + + if params.RecordId > 0 && domain.GetInt64("id") > 0 { + rules, err := listCustomRuleMaps(this.Parent(), domain.GetInt64("id")) + if err != nil { + this.ErrorPage(err) + return + } + for _, rule := range rules { + if rule.GetInt64("id") != params.RecordId { + continue + } + record["id"] = rule.GetInt64("id") + record["domain"] = domain.GetString("name") + record["lineScope"] = rule.GetString("lineScope") + record["lineCarrier"] = defaultLineField(rule.GetString("lineCarrier")) + record["lineRegion"] = defaultLineField(rule.GetString("lineRegion")) + record["lineProvince"] = defaultLineField(rule.GetString("lineProvince")) + record["lineContinent"] = defaultLineField(rule.GetString("lineContinent")) + record["lineCountry"] = defaultLineField(rule.GetString("lineCountry")) + record["ruleName"] = rule.GetString("ruleName") + record["weightEnabled"] = rule.GetBool("weightEnabled") + record["ttl"] = rule.GetInt("ttl") + record["isOn"] = rule.GetBool("isOn") + record["recordItemsJson"] = marshalJSON(rule["recordValues"], "[]") + break + } + } + + this.Data["app"] = app + this.Data["domain"] = domain + this.Data["record"] = record + this.Data["isEditing"] = params.RecordId > 0 + this.Show() +} + +func (this *CustomRecordsCreatePopupAction) RunPost(params struct { + AppId int64 + DomainId int64 + + RecordId int64 + Domain string + LineScope string + + LineCarrier string + LineRegion string + LineProvince string + LineContinent string + LineCountry string + + RuleName string + RecordItemsJSON string + WeightEnabled bool + Ttl int + IsOn bool + + Must *actions.Must + CSRF *actionutils.CSRF +}) { + params.Must.Field("appId", params.AppId).Gt(0, "请选择应用") + params.Must.Field("domainId", params.DomainId).Gt(0, "请选择所属域名") + + params.LineScope = strings.ToLower(strings.TrimSpace(params.LineScope)) + if params.LineScope != "china" && params.LineScope != "overseas" { + params.LineScope = "china" + } + params.RuleName = strings.TrimSpace(params.RuleName) + if len(params.RuleName) == 0 { + this.Fail("请输入规则名称") + return + } + if params.Ttl <= 0 || params.Ttl > 86400 { + this.Fail("TTL值必须在 1-86400 范围内") + return + } + + recordValues, err := parseRecordItemsJSON(params.RecordItemsJSON, params.WeightEnabled) + if err != nil { + this.Fail(err.Error()) + return + } + if len(recordValues) == 0 { + this.Fail("请输入解析记录值") + return + } + if len(recordValues) > 10 { + this.Fail("单个规则最多只能添加 10 条解析记录") + return + } + + lineCarrier := strings.TrimSpace(params.LineCarrier) + lineRegion := strings.TrimSpace(params.LineRegion) + lineProvince := strings.TrimSpace(params.LineProvince) + lineContinent := strings.TrimSpace(params.LineContinent) + lineCountry := strings.TrimSpace(params.LineCountry) + if len(lineCarrier) == 0 { + lineCarrier = "默认" + } + if len(lineRegion) == 0 { + lineRegion = "默认" + } + if len(lineProvince) == 0 { + lineProvince = "默认" + } + if len(lineContinent) == 0 { + lineContinent = "默认" + } + if len(lineCountry) == 0 { + lineCountry = "默认" + } + if params.LineScope == "overseas" { + lineCarrier = "" + lineRegion = "" + lineProvince = "" + } else { + lineContinent = "" + lineCountry = "" + } + + records := make([]*pb.HTTPDNSRuleRecord, 0, len(recordValues)) + for i, item := range recordValues { + records = append(records, &pb.HTTPDNSRuleRecord{ + Id: 0, + RuleId: 0, + RecordType: item.GetString("type"), + RecordValue: item.GetString("value"), + Weight: int32(item.GetInt("weight")), + Sort: int32(i + 1), + }) + } + + rule := &pb.HTTPDNSCustomRule{ + Id: params.RecordId, + AppId: params.AppId, + DomainId: params.DomainId, + RuleName: params.RuleName, + LineScope: params.LineScope, + LineCarrier: lineCarrier, + LineRegion: lineRegion, + LineProvince: lineProvince, + LineContinent: lineContinent, + LineCountry: lineCountry, + Ttl: int32(params.Ttl), + IsOn: params.IsOn, + Priority: 100, + Records: records, + } + + if params.RecordId > 0 { + err = updateCustomRule(this.Parent(), rule) + } else { + _, err = createCustomRule(this.Parent(), rule) + } + if err != nil { + this.ErrorPage(err) + return + } + + this.Success() +} + +func parseRecordItemsJSON(raw string, weightEnabled bool) ([]maps.Map, error) { + raw = strings.TrimSpace(raw) + if len(raw) == 0 { + return []maps.Map{}, nil + } + + list := []maps.Map{} + if err := json.Unmarshal([]byte(raw), &list); err != nil { + return nil, fmt.Errorf("解析记录格式不正确") + } + + result := make([]maps.Map, 0, len(list)) + for _, item := range list { + recordType := strings.ToUpper(strings.TrimSpace(item.GetString("type"))) + recordValue := strings.TrimSpace(item.GetString("value")) + if len(recordType) == 0 && len(recordValue) == 0 { + continue + } + if recordType != "A" && recordType != "AAAA" { + return nil, fmt.Errorf("记录类型只能是 A 或 AAAA") + } + if len(recordValue) == 0 { + return nil, fmt.Errorf("记录值不能为空") + } + + weight := item.GetInt("weight") + if !weightEnabled { + weight = 100 + } + if weight < 1 || weight > 100 { + return nil, fmt.Errorf("权重值必须在 1-100 之间") + } + + result = append(result, maps.Map{ + "type": recordType, + "value": recordValue, + "weight": weight, + }) + } + return result, nil +} + +func marshalJSON(v interface{}, fallback string) string { + b, err := json.Marshal(v) + if err != nil { + return fallback + } + return string(b) +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/customRecordsDelete.go b/EdgeUser/internal/web/actions/default/httpdns/apps/customRecordsDelete.go new file mode 100644 index 0000000..0673a1a --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/customRecordsDelete.go @@ -0,0 +1,21 @@ +package apps + +import "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + +type CustomRecordsDeleteAction struct { + actionutils.ParentAction +} + +func (this *CustomRecordsDeleteAction) RunPost(params struct { + AppId int64 + RecordId int64 +}) { + if params.RecordId > 0 { + err := deleteCustomRule(this.Parent(), params.RecordId) + if err != nil { + this.ErrorPage(err) + return + } + } + this.Success() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/customRecordsToggle.go b/EdgeUser/internal/web/actions/default/httpdns/apps/customRecordsToggle.go new file mode 100644 index 0000000..c55a70f --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/customRecordsToggle.go @@ -0,0 +1,22 @@ +package apps + +import "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + +type CustomRecordsToggleAction struct { + actionutils.ParentAction +} + +func (this *CustomRecordsToggleAction) RunPost(params struct { + AppId int64 + RecordId int64 + IsOn bool +}) { + if params.RecordId > 0 { + err := toggleCustomRule(this.Parent(), params.RecordId, params.IsOn) + if err != nil { + this.ErrorPage(err) + return + } + } + this.Success() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/delete.go b/EdgeUser/internal/web/actions/default/httpdns/apps/delete.go new file mode 100644 index 0000000..001af1e --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/delete.go @@ -0,0 +1,48 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/httpdns/httpdnsutils" +) + +type DeleteAction struct { + actionutils.ParentAction +} + +func (this *DeleteAction) Init() { + this.Nav("httpdns", "app", "delete") +} + +func (this *DeleteAction) RunGet(params struct { + AppId int64 +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + httpdnsutils.AddAppTabbar(this.Parent(), app.GetString("name"), app.GetInt64("id"), "delete") + this.Data["app"] = app + domains, err := listDomainMaps(this.Parent(), app.GetInt64("id"), "") + if err != nil { + this.ErrorPage(err) + return + } + this.Data["domainCount"] = len(domains) + this.Show() +} + +func (this *DeleteAction) RunPost(params struct { + AppId int64 +}) { + if params.AppId > 0 { + err := deleteAppByID(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + } + + this.Success() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/domains.go b/EdgeUser/internal/web/actions/default/httpdns/apps/domains.go new file mode 100644 index 0000000..0894b2e --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/domains.go @@ -0,0 +1,38 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/httpdns/httpdnsutils" +) + +type DomainsAction struct { + actionutils.ParentAction +} + +func (this *DomainsAction) Init() { + this.Nav("httpdns", "app", "domains") +} + +func (this *DomainsAction) RunGet(params struct { + AppId int64 +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + + httpdnsutils.AddAppTabbar(this.Parent(), app.GetString("name"), params.AppId, "domains") + + domains, err := listDomainMaps(this.Parent(), app.GetInt64("id"), "") + if err != nil { + this.ErrorPage(err) + return + } + + this.Data["app"] = app + this.Data["domains"] = domains + this.Data["keyword"] = "" + this.Show() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/domainsCreatePopup.go b/EdgeUser/internal/web/actions/default/httpdns/apps/domainsCreatePopup.go new file mode 100644 index 0000000..189bc87 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/domainsCreatePopup.go @@ -0,0 +1,44 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/iwind/TeaGo/actions" +) + +type DomainsCreatePopupAction struct { + actionutils.ParentAction +} + +func (this *DomainsCreatePopupAction) Init() { + this.Nav("", "", "") +} + +func (this *DomainsCreatePopupAction) RunGet(params struct { + AppId int64 +}) { + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + this.Data["app"] = app + this.Show() +} + +func (this *DomainsCreatePopupAction) RunPost(params struct { + AppId int64 + Domain string + + Must *actions.Must + CSRF *actionutils.CSRF +}) { + params.Must.Field("appId", params.AppId).Gt(0, "请选择应用") + params.Must.Field("domain", params.Domain).Require("请输入域名") + + err := createDomain(this.Parent(), params.AppId, params.Domain) + if err != nil { + this.ErrorPage(err) + return + } + this.Success() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/domainsDelete.go b/EdgeUser/internal/web/actions/default/httpdns/apps/domainsDelete.go new file mode 100644 index 0000000..1cad958 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/domainsDelete.go @@ -0,0 +1,20 @@ +package apps + +import "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + +type DomainsDeleteAction struct { + actionutils.ParentAction +} + +func (this *DomainsDeleteAction) RunPost(params struct { + DomainId int64 +}) { + if params.DomainId > 0 { + err := deleteDomain(this.Parent(), params.DomainId) + if err != nil { + this.ErrorPage(err) + return + } + } + this.Success() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/formatters.go b/EdgeUser/internal/web/actions/default/httpdns/apps/formatters.go new file mode 100644 index 0000000..5c52256 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/formatters.go @@ -0,0 +1,92 @@ +package apps + +import ( + "strconv" + "strings" + + "github.com/iwind/TeaGo/maps" +) + +func maskSecret(secret string) string { + secret = strings.TrimSpace(secret) + if len(secret) < 4 { + return "******" + } + + prefix := "" + for i := 0; i < len(secret); i++ { + if secret[i] == '_' { + prefix = secret[:i+1] + break + } + } + if len(prefix) == 0 { + prefix = secret[:2] + } + + if len(secret) <= 8 { + return prefix + "xxxx" + } + return prefix + "xxxxxxxx" + secret[len(secret)-4:] +} + +func buildLineText(record maps.Map) string { + parts := []string{} + if strings.TrimSpace(record.GetString("lineScope")) == "overseas" { + parts = append(parts, + strings.TrimSpace(record.GetString("lineContinent")), + strings.TrimSpace(record.GetString("lineCountry")), + ) + } else { + parts = append(parts, + strings.TrimSpace(record.GetString("lineCarrier")), + strings.TrimSpace(record.GetString("lineRegion")), + strings.TrimSpace(record.GetString("lineProvince")), + ) + } + + finalParts := make([]string, 0, len(parts)) + for _, part := range parts { + if len(part) == 0 || part == "默认" { + continue + } + finalParts = append(finalParts, part) + } + if len(finalParts) == 0 { + return "默认" + } + return strings.Join(finalParts, " / ") +} + +func buildRecordValueText(record maps.Map) string { + values, ok := record["recordValues"].([]maps.Map) + if !ok || len(values) == 0 { + return "-" + } + + weightEnabled := record.GetBool("weightEnabled") + defaultType := strings.ToUpper(strings.TrimSpace(record.GetString("recordType"))) + parts := make([]string, 0, len(values)) + for _, item := range values { + value := strings.TrimSpace(item.GetString("value")) + if len(value) == 0 { + continue + } + recordType := strings.ToUpper(strings.TrimSpace(item.GetString("type"))) + if len(recordType) == 0 { + recordType = defaultType + } + if recordType != "A" && recordType != "AAAA" { + recordType = "A" + } + part := recordType + " " + value + if weightEnabled { + part += "(" + strconv.Itoa(item.GetInt("weight")) + ")" + } + parts = append(parts, part) + } + if len(parts) == 0 { + return "-" + } + return strings.Join(parts, ", ") +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/index.go b/EdgeUser/internal/web/actions/default/httpdns/apps/index.go new file mode 100644 index 0000000..aabd719 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/index.go @@ -0,0 +1,28 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/httpdns/httpdnsutils" +) + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) Init() { + this.Nav("httpdns", "app", "") +} + +func (this *IndexAction) RunGet(params struct { + Keyword string +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + this.Data["keyword"] = params.Keyword + apps, err := listAppMaps(this.Parent(), params.Keyword) + if err != nil { + this.ErrorPage(err) + return + } + this.Data["apps"] = apps + this.Show() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/init.go b/EdgeUser/internal/web/actions/default/httpdns/apps/init.go new file mode 100644 index 0000000..e900b4f --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/init.go @@ -0,0 +1,35 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeUser/internal/web/helpers" + "github.com/iwind/TeaGo" +) + +func init() { + TeaGo.BeforeStart(func(server *TeaGo.Server) { + server. + Helper(helpers.NewUserMustAuth("")). + Data("teaMenu", "httpdns"). + Data("teaSubMenu", "app"). + Prefix("/httpdns/apps"). + Get("", new(IndexAction)). + Get("/app", new(AppAction)). + Get("/sdk", new(SdkAction)). + Get("/sdk/check", new(SdkCheckAction)). + Get("/sdk/download", new(SdkDownloadAction)). + Get("/sdk/doc", new(SdkDocAction)). + GetPost("/app/settings", new(AppSettingsAction)). + Post("/app/settings/toggleSignEnabled", new(AppSettingsToggleSignEnabledAction)). + Post("/app/settings/resetSignSecret", new(AppSettingsResetSignSecretAction)). + Get("/domains", new(DomainsAction)). + Get("/customRecords", new(CustomRecordsAction)). + GetPost("/create", new(CreateAction)). + GetPost("/delete", new(DeleteAction)). + GetPost("/domains/createPopup", new(DomainsCreatePopupAction)). + Post("/domains/delete", new(DomainsDeleteAction)). + GetPost("/customRecords/createPopup", new(CustomRecordsCreatePopupAction)). + Post("/customRecords/delete", new(CustomRecordsDeleteAction)). + Post("/customRecords/toggle", new(CustomRecordsToggleAction)). + EndAll() + }) +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/rpc_helpers.go b/EdgeUser/internal/web/actions/default/httpdns/apps/rpc_helpers.go new file mode 100644 index 0000000..d356644 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/rpc_helpers.go @@ -0,0 +1,302 @@ +package apps + +import ( + "encoding/json" + "errors" + "strconv" + "strings" + "time" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/iwind/TeaGo/maps" + timeutil "github.com/iwind/TeaGo/utils/time" +) + +func listAppMaps(parent *actionutils.ParentAction, keyword string) ([]maps.Map, error) { + resp, err := parent.RPC().HTTPDNSAppRPC().ListHTTPDNSApps(parent.UserContext(), &pb.ListHTTPDNSAppsRequest{ + Offset: 0, + Size: 10_000, + Keyword: strings.TrimSpace(keyword), + }) + if err != nil { + return nil, err + } + + result := make([]maps.Map, 0, len(resp.GetApps())) + for _, app := range resp.GetApps() { + domainResp, err := parent.RPC().HTTPDNSDomainRPC().ListHTTPDNSDomainsWithAppId(parent.UserContext(), &pb.ListHTTPDNSDomainsWithAppIdRequest{ + AppDbId: app.GetId(), + }) + if err != nil { + return nil, err + } + + result = append(result, appPBToMap(app, int64(len(domainResp.GetDomains())))) + } + + return result, nil +} + +func findAppMap(parent *actionutils.ParentAction, appDbId int64) (maps.Map, error) { + if appDbId > 0 { + resp, err := parent.RPC().HTTPDNSAppRPC().FindHTTPDNSApp(parent.UserContext(), &pb.FindHTTPDNSAppRequest{ + AppDbId: appDbId, + }) + if err != nil { + return nil, err + } + if resp.GetApp() != nil { + domainResp, err := parent.RPC().HTTPDNSDomainRPC().ListHTTPDNSDomainsWithAppId(parent.UserContext(), &pb.ListHTTPDNSDomainsWithAppIdRequest{ + AppDbId: appDbId, + }) + if err != nil { + return nil, err + } + return appPBToMap(resp.GetApp(), int64(len(domainResp.GetDomains()))), nil + } + + return nil, errors.New("应用不存在或无权限访问") + } + + apps, err := listAppMaps(parent, "") + if err != nil { + return nil, err + } + if len(apps) == 0 { + return maps.Map{ + "id": int64(0), + "name": "", + "appId": "", + }, nil + } + return apps[0], nil +} + +func createApp(parent *actionutils.ParentAction, name string, clusterIdsJSON []byte) (int64, error) { + newAppId := "app" + strconv.FormatInt(time.Now().UnixNano()%1_000_000_000_000, 36) + resp, err := parent.RPC().HTTPDNSAppRPC().CreateHTTPDNSApp(parent.UserContext(), &pb.CreateHTTPDNSAppRequest{ + Name: strings.TrimSpace(name), + AppId: newAppId, + ClusterIdsJSON: clusterIdsJSON, + IsOn: true, + SignEnabled: true, + }) + if err != nil { + return 0, err + } + return resp.GetAppDbId(), nil +} + +func deleteAppByID(parent *actionutils.ParentAction, appDbId int64) error { + _, err := parent.RPC().HTTPDNSAppRPC().DeleteHTTPDNSApp(parent.UserContext(), &pb.DeleteHTTPDNSAppRequest{ + AppDbId: appDbId, + }) + return err +} + +func updateAppSettings(parent *actionutils.ParentAction, appDbId int64, name string, clusterIdsJSON []byte, isOn bool, userId int64) error { + _, err := parent.RPC().HTTPDNSAppRPC().UpdateHTTPDNSApp(parent.UserContext(), &pb.UpdateHTTPDNSAppRequest{ + AppDbId: appDbId, + Name: strings.TrimSpace(name), + ClusterIdsJSON: clusterIdsJSON, + IsOn: isOn, + UserId: userId, + }) + return err +} + +func updateAppSignEnabled(parent *actionutils.ParentAction, appDbId int64, signEnabled bool) error { + _, err := parent.RPC().HTTPDNSAppRPC().UpdateHTTPDNSAppSignEnabled(parent.UserContext(), &pb.UpdateHTTPDNSAppSignEnabledRequest{ + AppDbId: appDbId, + SignEnabled: signEnabled, + }) + return err +} + +func resetAppSignSecret(parent *actionutils.ParentAction, appDbId int64) (*pb.ResetHTTPDNSAppSignSecretResponse, error) { + return parent.RPC().HTTPDNSAppRPC().ResetHTTPDNSAppSignSecret(parent.UserContext(), &pb.ResetHTTPDNSAppSignSecretRequest{ + AppDbId: appDbId, + }) +} + +func listDomainMaps(parent *actionutils.ParentAction, appDbId int64, keyword string) ([]maps.Map, error) { + resp, err := parent.RPC().HTTPDNSDomainRPC().ListHTTPDNSDomainsWithAppId(parent.UserContext(), &pb.ListHTTPDNSDomainsWithAppIdRequest{ + AppDbId: appDbId, + Keyword: strings.TrimSpace(keyword), + }) + if err != nil { + return nil, err + } + + result := make([]maps.Map, 0, len(resp.GetDomains())) + for _, domain := range resp.GetDomains() { + result = append(result, maps.Map{ + "id": domain.GetId(), + "name": domain.GetDomain(), + "isOn": domain.GetIsOn(), + "customRecordCount": domain.GetRuleCount(), + }) + } + return result, nil +} + +func createDomain(parent *actionutils.ParentAction, appDbId int64, domain string) error { + _, err := parent.RPC().HTTPDNSDomainRPC().CreateHTTPDNSDomain(parent.UserContext(), &pb.CreateHTTPDNSDomainRequest{ + AppDbId: appDbId, + Domain: strings.TrimSpace(domain), + IsOn: true, + }) + return err +} + +func deleteDomain(parent *actionutils.ParentAction, domainId int64) error { + _, err := parent.RPC().HTTPDNSDomainRPC().DeleteHTTPDNSDomain(parent.UserContext(), &pb.DeleteHTTPDNSDomainRequest{ + DomainId: domainId, + }) + return err +} + +func findDomainMap(domains []maps.Map, domainID int64) maps.Map { + if len(domains) == 0 { + return maps.Map{} + } + if domainID <= 0 { + return domains[0] + } + for _, domain := range domains { + if domain.GetInt64("id") == domainID { + return domain + } + } + return domains[0] +} + +func listCustomRuleMaps(parent *actionutils.ParentAction, domainId int64) ([]maps.Map, error) { + resp, err := parent.RPC().HTTPDNSRuleRPC().ListHTTPDNSCustomRulesWithDomainId(parent.UserContext(), &pb.ListHTTPDNSCustomRulesWithDomainIdRequest{ + DomainId: domainId, + }) + if err != nil { + return nil, err + } + + result := make([]maps.Map, 0, len(resp.GetRules())) + for _, rule := range resp.GetRules() { + recordValues := make([]maps.Map, 0, len(rule.GetRecords())) + recordType := "A" + weightEnabled := false + for _, record := range rule.GetRecords() { + if len(recordType) == 0 { + recordType = strings.ToUpper(strings.TrimSpace(record.GetRecordType())) + } + if record.GetWeight() > 0 && record.GetWeight() != 100 { + weightEnabled = true + } + recordValues = append(recordValues, maps.Map{ + "type": strings.ToUpper(strings.TrimSpace(record.GetRecordType())), + "value": record.GetRecordValue(), + "weight": record.GetWeight(), + }) + } + if len(recordValues) == 0 { + recordValues = append(recordValues, maps.Map{ + "type": "A", + "value": "", + "weight": 100, + }) + } + + item := maps.Map{ + "id": rule.GetId(), + "lineScope": rule.GetLineScope(), + "lineCarrier": defaultLineField(rule.GetLineCarrier()), + "lineRegion": defaultLineField(rule.GetLineRegion()), + "lineProvince": defaultLineField(rule.GetLineProvince()), + "lineContinent": defaultLineField(rule.GetLineContinent()), + "lineCountry": defaultLineField(rule.GetLineCountry()), + "ruleName": rule.GetRuleName(), + "recordType": recordType, + "recordValues": recordValues, + "weightEnabled": weightEnabled, + "ttl": rule.GetTtl(), + "isOn": rule.GetIsOn(), + "updatedAt": formatDateTime(rule.GetUpdatedAt()), + } + item["lineText"] = buildLineText(item) + item["recordValueText"] = buildRecordValueText(item) + result = append(result, item) + } + return result, nil +} + +func createCustomRule(parent *actionutils.ParentAction, rule *pb.HTTPDNSCustomRule) (int64, error) { + resp, err := parent.RPC().HTTPDNSRuleRPC().CreateHTTPDNSCustomRule(parent.UserContext(), &pb.CreateHTTPDNSCustomRuleRequest{ + Rule: rule, + }) + if err != nil { + return 0, err + } + return resp.GetRuleId(), nil +} + +func updateCustomRule(parent *actionutils.ParentAction, rule *pb.HTTPDNSCustomRule) error { + _, err := parent.RPC().HTTPDNSRuleRPC().UpdateHTTPDNSCustomRule(parent.UserContext(), &pb.UpdateHTTPDNSCustomRuleRequest{ + Rule: rule, + }) + return err +} + +func deleteCustomRule(parent *actionutils.ParentAction, ruleId int64) error { + _, err := parent.RPC().HTTPDNSRuleRPC().DeleteHTTPDNSCustomRule(parent.UserContext(), &pb.DeleteHTTPDNSCustomRuleRequest{ + RuleId: ruleId, + }) + return err +} + +func toggleCustomRule(parent *actionutils.ParentAction, ruleId int64, isOn bool) error { + _, err := parent.RPC().HTTPDNSRuleRPC().UpdateHTTPDNSCustomRuleStatus(parent.UserContext(), &pb.UpdateHTTPDNSCustomRuleStatusRequest{ + RuleId: ruleId, + IsOn: isOn, + }) + return err +} + +func appPBToMap(app *pb.HTTPDNSApp, domainCount int64) maps.Map { + signSecret := app.GetSignSecret() + + // 读取集群 ID 列表 + var clusterIds []int64 + if len(app.GetClusterIdsJSON()) > 0 { + _ = json.Unmarshal(app.GetClusterIdsJSON(), &clusterIds) + } + + return maps.Map{ + "id": app.GetId(), + "name": app.GetName(), + "appId": app.GetAppId(), + "clusterIds": clusterIds, + "userId": app.GetUserId(), + "isOn": app.GetIsOn(), + "domainCount": domainCount, + "sniPolicyText": "隐匿 SNI", + "signEnabled": app.GetSignEnabled(), + "signSecretPlain": signSecret, + "signSecretMasked": maskSecret(signSecret), + "signSecretUpdated": formatDateTime(app.GetSignUpdatedAt()), + } +} + +func defaultLineField(value string) string { + value = strings.TrimSpace(value) + if len(value) == 0 { + return "默认" + } + return value +} + +func formatDateTime(ts int64) string { + if ts <= 0 { + return "" + } + return timeutil.FormatTime("Y-m-d H:i:s", ts) +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/sdk.go b/EdgeUser/internal/web/actions/default/httpdns/apps/sdk.go new file mode 100644 index 0000000..969cf2c --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/sdk.go @@ -0,0 +1,30 @@ +package apps + +import ( + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/httpdns/httpdnsutils" +) + +type SdkAction struct { + actionutils.ParentAction +} + +func (this *SdkAction) Init() { + this.Nav("httpdns", "app", "sdk") +} + +func (this *SdkAction) RunGet(params struct { + AppId int64 +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + app, err := findAppMap(this.Parent(), params.AppId) + if err != nil { + this.ErrorPage(err) + return + } + + httpdnsutils.AddAppTabbar(this.Parent(), app.GetString("name"), params.AppId, "sdk") + this.Data["app"] = app + this.Show() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/sdk_check.go b/EdgeUser/internal/web/actions/default/httpdns/apps/sdk_check.go new file mode 100644 index 0000000..09156d8 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/sdk_check.go @@ -0,0 +1,68 @@ +package apps + +import ( + "net/url" + "strings" + + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" +) + +type SdkCheckAction struct { + actionutils.ParentAction +} + +func (this *SdkCheckAction) Init() { + this.Nav("", "", "") +} + +func (this *SdkCheckAction) RunGet(params struct { + Platform string + Version string + Type string +}) { + platform, _, _, filename, err := resolveSDKPlatform(params.Platform) + if err != nil { + this.Data["exists"] = false + this.Data["message"] = err.Error() + this.Success() + return + } + + version := strings.TrimSpace(params.Version) + t := strings.ToLower(strings.TrimSpace(params.Type)) + if t == "doc" { + docPath := findUploadedSDKDocPath(platform, version) + if len(docPath) == 0 { + this.Data["exists"] = false + this.Data["message"] = "当前平台/版本尚未上传集成文档" + this.Success() + return + } + + downloadURL := "/httpdns/apps/sdk/doc?platform=" + url.QueryEscape(platform) + if len(version) > 0 { + downloadURL += "&version=" + url.QueryEscape(version) + } + this.Data["exists"] = true + this.Data["url"] = downloadURL + this.Success() + return + } + + archivePath := findSDKArchivePath(filename, version) + if len(archivePath) == 0 { + this.Data["exists"] = false + this.Data["message"] = "当前平台/版本尚未上传 SDK 安装包" + this.Success() + return + } + + downloadURL := "/httpdns/apps/sdk/download?platform=" + url.QueryEscape(platform) + if len(version) > 0 { + downloadURL += "&version=" + url.QueryEscape(version) + } + downloadURL += "&raw=1" + this.Data["exists"] = true + this.Data["url"] = downloadURL + this.Success() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/sdk_doc.go b/EdgeUser/internal/web/actions/default/httpdns/apps/sdk_doc.go new file mode 100644 index 0000000..f699fab --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/sdk_doc.go @@ -0,0 +1,55 @@ +package apps + +import ( + "net/url" + "os" + "path/filepath" + + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" +) + +type SdkDocAction struct { + actionutils.ParentAction +} + +func (this *SdkDocAction) Init() { + this.Nav("", "", "") +} + +func (this *SdkDocAction) RunGet(params struct { + Platform string + Version string +}) { + platform, _, _, _, err := resolveSDKPlatform(params.Platform) + if err != nil { + this.Data["exists"] = false + this.Data["message"] = err.Error() + this.Success() + return + } + + docPath := findUploadedSDKDocPath(platform, params.Version) + if len(docPath) == 0 { + this.Data["exists"] = false + this.Data["message"] = "当前平台/版本尚未上传集成文档" + this.Success() + return + } + + data, err := os.ReadFile(docPath) + if err != nil || len(data) == 0 { + this.Data["exists"] = false + this.Data["message"] = "读取集成文档失败" + this.Success() + return + } + + downloadName := filepath.Base(docPath) + if len(downloadName) == 0 || downloadName == "." || downloadName == string(filepath.Separator) { + downloadName = "sdk-doc.md" + } + + this.AddHeader("Content-Type", "text/markdown; charset=utf-8") + this.AddHeader("Content-Disposition", "attachment; filename=\"sdk-doc.md\"; filename*=UTF-8''"+url.PathEscape(downloadName)) + _, _ = this.ResponseWriter.Write(data) +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/sdk_download.go b/EdgeUser/internal/web/actions/default/httpdns/apps/sdk_download.go new file mode 100644 index 0000000..0423133 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/sdk_download.go @@ -0,0 +1,66 @@ +package apps + +import ( + "io" + "net/url" + "os" + "path/filepath" + + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" +) + +type SdkDownloadAction struct { + actionutils.ParentAction +} + +func (this *SdkDownloadAction) Init() { + this.Nav("", "", "") +} + +func (this *SdkDownloadAction) RunGet(params struct { + Platform string + Version string + Raw int +}) { + _, _, _, filename, err := resolveSDKPlatform(params.Platform) + if err != nil { + this.Data["exists"] = false + this.Data["message"] = err.Error() + this.Success() + return + } + + archivePath := findSDKArchivePath(filename, params.Version) + if len(archivePath) == 0 { + this.Data["exists"] = false + this.Data["message"] = "当前平台/版本尚未上传 SDK 安装包" + this.Success() + return + } + + fp, err := os.Open(archivePath) + if err != nil { + this.Data["exists"] = false + this.Data["message"] = "打开 SDK 安装包失败: " + err.Error() + this.Success() + return + } + defer func() { + _ = fp.Close() + }() + + downloadName := filepath.Base(archivePath) + if len(downloadName) == 0 || downloadName == "." || downloadName == string(filepath.Separator) { + downloadName = filename + } + + if params.Raw == 1 { + this.AddHeader("Content-Type", "application/octet-stream") + this.AddHeader("X-SDK-Filename", downloadName) + } else { + this.AddHeader("Content-Type", "application/zip") + this.AddHeader("Content-Disposition", "attachment; filename=\"sdk-download\"; filename*=UTF-8''"+url.PathEscape(downloadName)) + } + this.AddHeader("X-Accel-Buffering", "no") + _, _ = io.Copy(this.ResponseWriter, fp) +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/apps/sdk_helpers.go b/EdgeUser/internal/web/actions/default/httpdns/apps/sdk_helpers.go new file mode 100644 index 0000000..236d5c9 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/apps/sdk_helpers.go @@ -0,0 +1,262 @@ +package apps + +import ( + "encoding/json" + "errors" + "os" + "path/filepath" + "strings" + "time" + + "github.com/iwind/TeaGo/Tea" +) + +type sdkUploadMeta struct { + Platform string `json:"platform"` + Version string `json:"version"` + FileType string `json:"fileType"` // sdk | doc + Filename string `json:"filename"` + UpdatedAt int64 `json:"updatedAt"` +} + +type sdkUploadMetaRecord struct { + Meta sdkUploadMeta + Dir string + FilePath string +} + +func sdkUploadMetaFilename(platform string, version string, fileType string) string { + platform = strings.ToLower(strings.TrimSpace(platform)) + version = strings.TrimSpace(version) + fileType = strings.ToLower(strings.TrimSpace(fileType)) + return ".httpdns-sdk-meta-" + platform + "-v" + version + "-" + fileType + ".json" +} + +func isSDKUploadMetaFile(name string) bool { + name = strings.ToLower(strings.TrimSpace(name)) + return strings.HasPrefix(name, ".httpdns-sdk-meta-") && strings.HasSuffix(name, ".json") +} + +func parseSDKPlatformFromDownloadFilename(downloadFilename string) string { + name := strings.ToLower(strings.TrimSpace(downloadFilename)) + if !strings.HasPrefix(name, "httpdns-sdk-") || !strings.HasSuffix(name, ".zip") { + return "" + } + + platform := strings.TrimSuffix(strings.TrimPrefix(name, "httpdns-sdk-"), ".zip") + switch platform { + case "android", "ios", "flutter": + return platform + default: + return "" + } +} + +func listSDKUploadMetaRecords() []sdkUploadMetaRecord { + type wrapped struct { + record sdkUploadMetaRecord + modTime time.Time + } + + byKey := map[string]wrapped{} + for _, dir := range sdkUploadSearchDirs() { + entries, err := os.ReadDir(dir) + if err != nil { + continue + } + + for _, entry := range entries { + if entry.IsDir() { + continue + } + + name := entry.Name() + if !isSDKUploadMetaFile(name) { + continue + } + + metaPath := filepath.Join(dir, name) + data, err := os.ReadFile(metaPath) + if err != nil || len(data) == 0 { + continue + } + + var meta sdkUploadMeta + if err = json.Unmarshal(data, &meta); err != nil { + continue + } + + meta.Platform = strings.ToLower(strings.TrimSpace(meta.Platform)) + meta.Version = strings.TrimSpace(meta.Version) + meta.FileType = strings.ToLower(strings.TrimSpace(meta.FileType)) + meta.Filename = filepath.Base(strings.TrimSpace(meta.Filename)) + if len(meta.Platform) == 0 || len(meta.Version) == 0 || len(meta.Filename) == 0 { + continue + } + if meta.FileType != "sdk" && meta.FileType != "doc" { + continue + } + if strings.Contains(meta.Filename, "..") || strings.Contains(meta.Filename, "/") || strings.Contains(meta.Filename, "\\") { + continue + } + + filePath := filepath.Join(dir, meta.Filename) + fileStat, err := os.Stat(filePath) + if err != nil || fileStat.IsDir() || fileStat.Size() <= 0 { + continue + } + + metaStat, err := os.Stat(metaPath) + if err != nil { + continue + } + if meta.UpdatedAt <= 0 { + meta.UpdatedAt = metaStat.ModTime().Unix() + } + + key := meta.Platform + "|" + meta.Version + "|" + meta.FileType + current := wrapped{ + record: sdkUploadMetaRecord{ + Meta: meta, + Dir: dir, + FilePath: filePath, + }, + modTime: metaStat.ModTime(), + } + old, ok := byKey[key] + if !ok || + current.record.Meta.UpdatedAt > old.record.Meta.UpdatedAt || + (current.record.Meta.UpdatedAt == old.record.Meta.UpdatedAt && current.modTime.After(old.modTime)) || + (current.record.Meta.UpdatedAt == old.record.Meta.UpdatedAt && current.modTime.Equal(old.modTime) && current.record.FilePath > old.record.FilePath) { + byKey[key] = current + } + } + } + + result := make([]sdkUploadMetaRecord, 0, len(byKey)) + for _, item := range byKey { + result = append(result, item.record) + } + return result +} + +func findSDKUploadFileByMeta(platform string, version string, fileType string) string { + platform = strings.ToLower(strings.TrimSpace(platform)) + version = strings.TrimSpace(version) + fileType = strings.ToLower(strings.TrimSpace(fileType)) + if len(platform) == 0 || len(version) == 0 { + return "" + } + + for _, record := range listSDKUploadMetaRecords() { + if record.Meta.Platform == platform && record.Meta.Version == version && record.Meta.FileType == fileType { + return record.FilePath + } + } + return "" +} + +func findNewestSDKUploadFileByMeta(platform string, fileType string) string { + platform = strings.ToLower(strings.TrimSpace(platform)) + fileType = strings.ToLower(strings.TrimSpace(fileType)) + if len(platform) == 0 { + return "" + } + + var foundPath string + var foundUpdatedAt int64 + for _, record := range listSDKUploadMetaRecords() { + if record.Meta.Platform != platform || record.Meta.FileType != fileType { + continue + } + + if len(foundPath) == 0 || record.Meta.UpdatedAt > foundUpdatedAt || (record.Meta.UpdatedAt == foundUpdatedAt && record.FilePath > foundPath) { + foundPath = record.FilePath + foundUpdatedAt = record.Meta.UpdatedAt + } + } + return foundPath +} + +func sdkUploadDir() string { + dirs := sdkUploadDirs() + if len(dirs) > 0 { + return dirs[0] + } + return filepath.Clean(Tea.Root + "/data/httpdns/sdk") +} + +func sdkUploadDirs() []string { + candidates := []string{ + filepath.Clean(Tea.Root + "/../data/httpdns/sdk"), + filepath.Clean(Tea.Root + "/data/httpdns/sdk"), + filepath.Clean(Tea.Root + "/../edge-admin/data/httpdns/sdk"), + filepath.Clean(Tea.Root + "/../edge-user/data/httpdns/sdk"), + filepath.Clean(Tea.Root + "/../../data/httpdns/sdk"), + } + + results := make([]string, 0, len(candidates)) + seen := map[string]bool{} + for _, dir := range candidates { + if len(dir) == 0 || seen[dir] { + continue + } + seen[dir] = true + results = append(results, dir) + } + return results +} + +func sdkUploadSearchDirs() []string { + dirs := sdkUploadDirs() + results := make([]string, 0, len(dirs)) + for _, dir := range dirs { + stat, err := os.Stat(dir) + if err == nil && stat.IsDir() { + results = append(results, dir) + } + } + if len(results) == 0 { + results = append(results, sdkUploadDir()) + } + return results +} + +func resolveSDKPlatform(platform string) (key string, relativeDir string, readmeRelativePath string, downloadFilename string, err error) { + switch strings.ToLower(strings.TrimSpace(platform)) { + case "android": + return "android", "android", "android/README.md", "httpdns-sdk-android.zip", nil + case "ios": + return "ios", "ios", "ios/README.md", "httpdns-sdk-ios.zip", nil + case "flutter": + return "flutter", "flutter/new_httpdns", "flutter/new_httpdns/README.md", "httpdns-sdk-flutter.zip", nil + default: + return "", "", "", "", errors.New("不支持的平台，可选值：android、ios、flutter") + } +} + +func findSDKArchivePath(downloadFilename string, version string) string { + platform := parseSDKPlatformFromDownloadFilename(downloadFilename) + if len(platform) == 0 { + return "" + } + + normalizedVersion := strings.TrimSpace(version) + if len(normalizedVersion) > 0 { + return findSDKUploadFileByMeta(platform, normalizedVersion, "sdk") + } + return findNewestSDKUploadFileByMeta(platform, "sdk") +} + +func findUploadedSDKDocPath(platform string, version string) string { + platform = strings.ToLower(strings.TrimSpace(platform)) + if len(platform) == 0 { + return "" + } + + normalizedVersion := strings.TrimSpace(version) + if len(normalizedVersion) > 0 { + return findSDKUploadFileByMeta(platform, normalizedVersion, "doc") + } + return findNewestSDKUploadFileByMeta(platform, "doc") +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/httpdnsutils/helper.go b/EdgeUser/internal/web/actions/default/httpdns/httpdnsutils/helper.go new file mode 100644 index 0000000..1856e6f --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/httpdnsutils/helper.go @@ -0,0 +1,57 @@ +package httpdnsutils + +import ( + "strconv" + + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/iwind/TeaGo/maps" +) + +func AddLeftMenu(action *actionutils.ParentAction) { + tab := action.Data.GetString("mainTab") + action.Data["teaMenu"] = "httpdns" + action.Data["teaSubMenu"] = tab + action.Data["leftMenuItems"] = []maps.Map{ + { + "name": "\u5e94\u7528\u7ba1\u7406", + "url": "/httpdns/apps", + "isActive": tab == "app", + }, + { + "name": "\u8bbf\u95ee\u65e5\u5fd7", + "url": "/httpdns/resolveLogs", + "isActive": tab == "resolveLogs", + }, + { + "name": "\u89e3\u6790\u6d4b\u8bd5", + "url": "/httpdns/sandbox", + "isActive": tab == "sandbox", + }, + } +} + +// AddClusterTabbar builds the top tabbar on cluster pages. +func AddClusterTabbar(action *actionutils.ParentAction, clusterName string, clusterId int64, selectedTab string) { + cid := strconv.FormatInt(clusterId, 10) + tabbar := actionutils.NewTabbar() + tabbar.Add("", "", "/httpdns/clusters", "arrow left", false) + titleItem := tabbar.Add(clusterName, "", "/httpdns/clusters/cluster?clusterId="+cid, "angle right", true) + titleItem["isTitle"] = true + tabbar.Add("\u8282\u70b9\u5217\u8868", "", "/httpdns/clusters/cluster?clusterId="+cid, "server", selectedTab == "node") + tabbar.Add("\u96c6\u7fa4\u8bbe\u7f6e", "", "/httpdns/clusters/cluster/settings?clusterId="+cid, "setting", selectedTab == "setting") + tabbar.Add("\u5220\u9664\u96c6\u7fa4", "", "/httpdns/clusters/delete?clusterId="+cid, "trash", selectedTab == "delete") + actionutils.SetTabbar(action, tabbar) +} + +// AddAppTabbar builds the top tabbar on app pages. +func AddAppTabbar(action *actionutils.ParentAction, appName string, appId int64, selectedTab string) { + aid := strconv.FormatInt(appId, 10) + tabbar := actionutils.NewTabbar() + tabbar.Add("", "", "/httpdns/apps", "arrow left", false) + titleItem := tabbar.Add(appName, "", "/httpdns/apps/domains?appId="+aid, "angle right", true) + titleItem["isTitle"] = true + tabbar.Add("\u57df\u540d\u5217\u8868", "", "/httpdns/apps/domains?appId="+aid, "list", selectedTab == "domains") + tabbar.Add("\u5e94\u7528\u8bbe\u7f6e", "", "/httpdns/apps/app/settings?appId="+aid, "setting", selectedTab == "settings") + tabbar.Add("\u5220\u9664\u5e94\u7528", "", "/httpdns/apps/delete?appId="+aid, "trash", selectedTab == "delete") + actionutils.SetTabbar(action, tabbar) +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/index.go b/EdgeUser/internal/web/actions/default/httpdns/index.go new file mode 100644 index 0000000..aa12486 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/index.go @@ -0,0 +1,11 @@ +package httpdns + +import "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) RunGet(params struct{}) { + this.RedirectURL("/httpdns/apps") +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/init.go b/EdgeUser/internal/web/actions/default/httpdns/init.go new file mode 100644 index 0000000..7250741 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/init.go @@ -0,0 +1,18 @@ +package httpdns + +import ( + "github.com/TeaOSLab/EdgeUser/internal/web/helpers" + "github.com/iwind/TeaGo" +) + +func init() { + TeaGo.BeforeStart(func(server *TeaGo.Server) { + server. + Helper(helpers.NewUserMustAuth("")). + Data("teaMenu", "httpdns"). + Data("teaSubMenu", "app"). + Prefix("/httpdns"). + Get("", new(IndexAction)). + EndAll() + }) +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/resolveLogs/index.go b/EdgeUser/internal/web/actions/default/httpdns/resolveLogs/index.go new file mode 100644 index 0000000..b61403b --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/resolveLogs/index.go @@ -0,0 +1,145 @@ +package resolveLogs + +import ( + "encoding/json" + "strings" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/httpdns/httpdnsutils" + timeutil "github.com/iwind/TeaGo/utils/time" +) + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) Init() { + this.Nav("httpdns", "resolveLogs", "") +} + +func (this *IndexAction) RunGet(params struct { + ClusterId int64 + AppId string + Domain string + Status string + Keyword string +}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + if params.ClusterId > 0 { + this.Data["clusterId"] = params.ClusterId + } else { + this.Data["clusterId"] = "" + } + this.Data["appId"] = params.AppId + this.Data["domain"] = params.Domain + this.Data["status"] = params.Status + this.Data["keyword"] = params.Keyword + + clusterResp, err := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.UserContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + clusters := make([]map[string]interface{}, 0, len(clusterResp.GetClusters())) + clusterDomainMap := map[int64]string{} + for _, cluster := range clusterResp.GetClusters() { + serviceDomain := strings.TrimSpace(cluster.GetServiceDomain()) + + port := "443" + if rawTLS := cluster.GetTlsPolicyJSON(); len(rawTLS) > 0 { + var tlsConfig map[string]interface{} + if err := json.Unmarshal(rawTLS, &tlsConfig); err == nil { + if listenRaw, ok := tlsConfig["listen"]; ok && listenRaw != nil { + if data, err := json.Marshal(listenRaw); err == nil { + var listenAddresses []map[string]interface{} + if err := json.Unmarshal(data, &listenAddresses); err == nil { + if len(listenAddresses) > 0 { + if portRange, ok := listenAddresses[0]["portRange"].(string); ok && len(portRange) > 0 { + port = portRange + } + } + } + } + } + } + } + apiAddress := "https://" + serviceDomain + ":" + port + + displayName := apiAddress + if len(serviceDomain) == 0 { + displayName = cluster.GetName() + } + + clusters = append(clusters, map[string]interface{}{ + "id": cluster.GetId(), + "name": cluster.GetName(), + "serviceDomain": serviceDomain, + "displayName": displayName, + }) + clusterDomainMap[cluster.GetId()] = apiAddress + } + this.Data["clusters"] = clusters + + logResp, err := this.RPC().HTTPDNSAccessLogRPC().ListHTTPDNSAccessLogs(this.UserContext(), &pb.ListHTTPDNSAccessLogsRequest{ + Day: "", + ClusterId: params.ClusterId, + NodeId: 0, + AppId: strings.TrimSpace(params.AppId), + Domain: strings.TrimSpace(params.Domain), + Status: strings.TrimSpace(params.Status), + Keyword: strings.TrimSpace(params.Keyword), + Offset: 0, + Size: 100, + }) + if err != nil { + this.ErrorPage(err) + return + } + + logs := make([]map[string]interface{}, 0, len(logResp.GetLogs())) + for _, item := range logResp.GetLogs() { + createdTime := "" + if item.GetCreatedAt() > 0 { + createdTime = timeutil.FormatTime("Y-m-d H:i:s", item.GetCreatedAt()) + } + status := item.GetStatus() + if len(status) == 0 { + status = "failed" + } + errorCode := item.GetErrorCode() + if len(errorCode) == 0 { + errorCode = "none" + } + + logs = append(logs, map[string]interface{}{ + "time": createdTime, + "clusterId": item.GetClusterId(), + "serviceDomain": func() string { + serviceDomain := strings.TrimSpace(clusterDomainMap[item.GetClusterId()]) + if len(serviceDomain) > 0 { + return serviceDomain + } + if len(strings.TrimSpace(item.GetClusterName())) > 0 { + return item.GetClusterName() + } + return "-" + }(), + "appName": item.GetAppName(), + "appId": item.GetAppId(), + "domain": item.GetDomain(), + "query": item.GetQtype(), + "clientIp": item.GetClientIP(), + "os": item.GetOs(), + "sdkVersion": item.GetSdkVersion(), + "ips": item.GetResultIPs(), + "status": status, + "errorCode": errorCode, + "costMs": item.GetCostMs(), + }) + } + + this.Data["resolveLogs"] = logs + this.Show() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/resolveLogs/init.go b/EdgeUser/internal/web/actions/default/httpdns/resolveLogs/init.go new file mode 100644 index 0000000..05ce710 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/resolveLogs/init.go @@ -0,0 +1,18 @@ +package resolveLogs + +import ( + "github.com/TeaOSLab/EdgeUser/internal/web/helpers" + "github.com/iwind/TeaGo" +) + +func init() { + TeaGo.BeforeStart(func(server *TeaGo.Server) { + server. + Helper(helpers.NewUserMustAuth("")). + Data("teaMenu", "httpdns"). + Data("teaSubMenu", "resolveLogs"). + Prefix("/httpdns/resolveLogs"). + Get("", new(IndexAction)). + EndAll() + }) +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/sandbox/index.go b/EdgeUser/internal/web/actions/default/httpdns/sandbox/index.go new file mode 100644 index 0000000..316b8cd --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/sandbox/index.go @@ -0,0 +1,100 @@ +package sandbox + +import ( + "encoding/json" + "strings" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/httpdns/httpdnsutils" + "github.com/iwind/TeaGo/maps" +) + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) Init() { + this.Nav("httpdns", "sandbox", "") +} + +func (this *IndexAction) RunGet(params struct{}) { + httpdnsutils.AddLeftMenu(this.Parent()) + + clusterResp, err := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.UserContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + clusters := make([]maps.Map, 0, len(clusterResp.GetClusters())) + for _, cluster := range clusterResp.GetClusters() { + serviceDomain := strings.TrimSpace(cluster.GetServiceDomain()) + + port := "443" + if rawTLS := cluster.GetTlsPolicyJSON(); len(rawTLS) > 0 { + var tlsConfig map[string]interface{} + if err := json.Unmarshal(rawTLS, &tlsConfig); err == nil { + if listenRaw, ok := tlsConfig["listen"]; ok && listenRaw != nil { + if data, err := json.Marshal(listenRaw); err == nil { + var listenAddresses []map[string]interface{} + if err := json.Unmarshal(data, &listenAddresses); err == nil { + if len(listenAddresses) > 0 { + if portRange, ok := listenAddresses[0]["portRange"].(string); ok && len(portRange) > 0 { + port = portRange + } + } + } + } + } + } + } + apiAddress := "https://" + serviceDomain + ":" + port + + displayName := apiAddress + if len(serviceDomain) == 0 { + displayName = cluster.GetName() + } + clusters = append(clusters, maps.Map{ + "id": cluster.GetId(), + "name": cluster.GetName(), + "serviceDomain": serviceDomain, + "displayName": displayName, + }) + } + this.Data["clusters"] = clusters + + appResp, err := this.RPC().HTTPDNSAppRPC().FindAllHTTPDNSApps(this.UserContext(), &pb.FindAllHTTPDNSAppsRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + apps := make([]maps.Map, 0, len(appResp.GetApps())) + for _, app := range appResp.GetApps() { + domainResp, err := this.RPC().HTTPDNSDomainRPC().ListHTTPDNSDomainsWithAppId(this.UserContext(), &pb.ListHTTPDNSDomainsWithAppIdRequest{ + AppDbId: app.GetId(), + }) + if err != nil { + this.ErrorPage(err) + return + } + domains := make([]string, 0, len(domainResp.GetDomains())) + for _, domain := range domainResp.GetDomains() { + domains = append(domains, domain.GetDomain()) + } + // 解析集群ID列表 + var clusterIds []int64 + if len(app.GetClusterIdsJSON()) > 0 { + _ = json.Unmarshal(app.GetClusterIdsJSON(), &clusterIds) + } + + apps = append(apps, maps.Map{ + "id": app.GetId(), + "name": app.GetName(), + "appId": app.GetAppId(), + "clusterIds": clusterIds, + "domains": domains, + }) + } + this.Data["apps"] = apps + this.Show() +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/sandbox/init.go b/EdgeUser/internal/web/actions/default/httpdns/sandbox/init.go new file mode 100644 index 0000000..99545ed --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/sandbox/init.go @@ -0,0 +1,19 @@ +package sandbox + +import ( + "github.com/TeaOSLab/EdgeUser/internal/web/helpers" + "github.com/iwind/TeaGo" +) + +func init() { + TeaGo.BeforeStart(func(server *TeaGo.Server) { + server. + Helper(helpers.NewUserMustAuth("")). + Data("teaMenu", "httpdns"). + Data("teaSubMenu", "sandbox"). + Prefix("/httpdns/sandbox"). + Get("", new(IndexAction)). + Post("/test", new(TestAction)). + EndAll() + }) +} diff --git a/EdgeUser/internal/web/actions/default/httpdns/sandbox/test.go b/EdgeUser/internal/web/actions/default/httpdns/sandbox/test.go new file mode 100644 index 0000000..997ad05 --- /dev/null +++ b/EdgeUser/internal/web/actions/default/httpdns/sandbox/test.go @@ -0,0 +1,173 @@ +package sandbox + +import ( + "crypto/hmac" + "crypto/sha256" + "encoding/json" + "encoding/hex" + "net/url" + "strconv" + "strings" + "time" + + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/login/loginutils" + "github.com/iwind/TeaGo/maps" + "github.com/iwind/TeaGo/rands" +) + +type TestAction struct { + actionutils.ParentAction +} + +func (this *TestAction) RunPost(params struct { + AppId string + ClusterId int64 + Domain string + ClientIp string + Qtype string +}) { + clientIP := strings.TrimSpace(params.ClientIp) + if len(clientIP) == 0 { + clientIP = strings.TrimSpace(loginutils.RemoteIP(&this.ActionObject)) + } + qtype := strings.ToUpper(strings.TrimSpace(params.Qtype)) + if len(qtype) == 0 { + qtype = "A" + } + + resp, err := this.RPC().HTTPDNSSandboxRPC().TestHTTPDNSResolve(this.UserContext(), &pb.TestHTTPDNSResolveRequest{ + ClusterId: params.ClusterId, + AppId: strings.TrimSpace(params.AppId), + Domain: strings.TrimSpace(params.Domain), + Qtype: qtype, + ClientIP: clientIP, + Sid: "", + SdkVersion: "", + Os: "", + }) + if err != nil { + this.ErrorPage(err) + return + } + + clusterDomain := "" + port := "443" + if params.ClusterId > 0 { + clusterResp, findErr := this.RPC().HTTPDNSClusterRPC().FindAllHTTPDNSClusters(this.UserContext(), &pb.FindAllHTTPDNSClustersRequest{}) + if findErr == nil { + for _, cluster := range clusterResp.GetClusters() { + if cluster.GetId() == params.ClusterId { + clusterDomain = strings.TrimSpace(cluster.GetServiceDomain()) + if rawTLS := cluster.GetTlsPolicyJSON(); len(rawTLS) > 0 { + var tlsConfig map[string]interface{} + if err := json.Unmarshal(rawTLS, &tlsConfig); err == nil { + if listenRaw, ok := tlsConfig["listen"]; ok && listenRaw != nil { + if data, err := json.Marshal(listenRaw); err == nil { + var listenAddresses []map[string]interface{} + if err := json.Unmarshal(data, &listenAddresses); err == nil { + if len(listenAddresses) > 0 { + if portRange, ok := listenAddresses[0]["portRange"].(string); ok && len(portRange) > 0 { + port = portRange + } + } + } + } + } + } + } + break + } + } + } + } + if len(clusterDomain) == 0 { + clusterDomain = "httpdns.example.com" + } + query := url.Values{} + query.Set("appId", params.AppId) + query.Set("dn", params.Domain) + query.Set("qtype", qtype) + if len(clientIP) > 0 { + query.Set("cip", clientIP) + } + + signEnabled, signSecret := this.findAppSignConfig(params.AppId) + if signEnabled && len(signSecret) > 0 { + exp := strconv.FormatInt(time.Now().Unix()+300, 10) + nonce := "sandbox-" + rands.HexString(16) + sign := buildSandboxResolveSign(signSecret, params.AppId, params.Domain, qtype, exp, nonce) + query.Set("exp", exp) + query.Set("nonce", nonce) + query.Set("sign", sign) + } + requestURL := "https://" + clusterDomain + ":" + port + "/resolve?" + query.Encode() + + resultCode := 1 + if strings.EqualFold(resp.GetCode(), "SUCCESS") { + resultCode = 0 + } + rows := make([]maps.Map, 0, len(resp.GetRecords())) + ips := make([]string, 0, len(resp.GetRecords())) + lineName := strings.TrimSpace(resp.GetClientCarrier()) + if len(lineName) == 0 { + lineName = "-" + } + for _, record := range resp.GetRecords() { + ips = append(ips, record.GetIp()) + if lineName == "-" && len(record.GetLine()) > 0 { + lineName = record.GetLine() + } + rows = append(rows, maps.Map{ + "domain": resp.GetDomain(), + "type": record.GetType(), + "ip": record.GetIp(), + "ttl": record.GetTtl(), + "region": record.GetRegion(), + "line": record.GetLine(), + }) + } + + this.Data["result"] = maps.Map{ + "code": resultCode, + "message": resp.GetMessage(), + "requestId": resp.GetRequestId(), + "data": maps.Map{ + "request_url": requestURL, + "client_ip": resp.GetClientIP(), + "client_region": resp.GetClientRegion(), + "line_name": lineName, + "ips": ips, + "records": rows, + "ttl": resp.GetTtl(), + }, + } + this.Success() +} + +func (this *TestAction) findAppSignConfig(appId string) (bool, string) { + appId = strings.TrimSpace(appId) + if len(appId) == 0 { + return false, "" + } + + resp, err := this.RPC().HTTPDNSAppRPC().FindAllHTTPDNSApps(this.UserContext(), &pb.FindAllHTTPDNSAppsRequest{}) + if err != nil { + return false, "" + } + + for _, app := range resp.GetApps() { + if strings.EqualFold(strings.TrimSpace(app.GetAppId()), appId) { + return app.GetSignEnabled(), strings.TrimSpace(app.GetSignSecret()) + } + } + return false, "" +} + +func buildSandboxResolveSign(signSecret string, appID string, domain string, qtype string, exp string, nonce string) string { + raw := strings.TrimSpace(appID) + "|" + strings.ToLower(strings.TrimSpace(domain)) + "|" + strings.ToUpper(strings.TrimSpace(qtype)) + "|" + strings.TrimSpace(exp) + "|" + strings.TrimSpace(nonce) + mac := hmac.New(sha256.New, []byte(strings.TrimSpace(signSecret))) + _, _ = mac.Write([]byte(raw)) + return hex.EncodeToString(mac.Sum(nil)) +} diff --git a/EdgeUser/internal/web/helpers/user_must_auth.go b/EdgeUser/internal/web/helpers/user_must_auth.go index 8954213..b9563f3 100644 --- a/EdgeUser/internal/web/helpers/user_must_auth.go +++ b/EdgeUser/internal/web/helpers/user_must_auth.go @@ -426,6 +426,29 @@ func (this *userMustAuth) modules(userId int64, isVerified bool, isIdentified bo },**/ }, }, + { + "code": "httpdns", + "name": "HTTPDNS", + "icon": "shield alternate", + "isOn": registerConfig != nil && registerConfig.HTTPDNSIsOn, + "subItems": []maps.Map{ + { + "name": "应用管理", + "code": "app", + "url": "/httpdns/apps", + }, + { + "name": "访问日志", + "code": "resolveLogs", + "url": "/httpdns/resolveLogs", + }, + { + "name": "解析测试", + "code": "sandbox", + "url": "/httpdns/sandbox", + }, + }, + }, { "code": "finance", "name": "财务管理", diff --git a/EdgeUser/internal/web/import.go b/EdgeUser/internal/web/import.go index 1a415e8..9f0ed26 100644 --- a/EdgeUser/internal/web/import.go +++ b/EdgeUser/internal/web/import.go @@ -106,6 +106,12 @@ import ( _ "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/ns" _ "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/ns/routes" + // httpdns + _ "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/httpdns" + _ "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/httpdns/apps" + _ "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/httpdns/resolveLogs" + _ "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/httpdns/sandbox" + // api _ "github.com/TeaOSLab/EdgeUser/internal/web/actions/default/api" diff --git a/EdgeUser/web/views/@default/@layout.css b/EdgeUser/web/views/@default/@layout.css index 30b7d37..38c8923 100644 --- a/EdgeUser/web/views/@default/@layout.css +++ b/EdgeUser/web/views/@default/@layout.css @@ -7,25 +7,30 @@ overflow-x: hidden; border-right: 1px #ddd solid; } + .left-box .menu { width: 95% !important; } + .left-box .menu .item { line-height: 1.2; position: relative; padding-left: 1em !important; } + .left-box .menu .item .icon { position: absolute; top: 50%; left: 0; margin-top: -0.4em !important; } + .left-box .menu .item .sub-name { font-size: 0.7em; font-style: normal; color: grey; } + .left-box .menu .item.separator { border-bottom: 1px #eee solid !important; padding-top: 0; @@ -33,9 +38,11 @@ margin-top: 0 !important; margin-bottom: 0 !important; } + .left-box .menu .item.on span { border-bottom: 1px #666 dashed; } + .left-box .menu .item.off span var { font-style: normal; background: #db2828; @@ -45,33 +52,42 @@ border-radius: 2px; margin-left: 1em; } + .left-box .menu .item.active { background: rgba(230, 230, 230, 0.35) !important; border-radius: 3px; } + .left-box .menu .header { border-bottom: 1px #ddd solid; padding-left: 0 !important; padding-bottom: 1em !important; } + .left-box::-webkit-scrollbar { width: 4px; } + .left-box.disabled { opacity: 0.1; } + .left-box.tiny { top: 10.5em; } + .left-box.without-tabbar { top: 3em; } + .left-box.with-menu { top: 10em; } + .left-box.without-menu { top: 6em; } + .right-box { position: fixed; top: 7.5em; @@ -82,41 +98,52 @@ padding-bottom: 2em; overflow-y: auto; } + @media screen and (max-width: 512px) { .right-box { left: 13em; padding-right: 1em; } } + body.expanded .right-box { left: 10em; } + .right-box.tiny { top: 10.4em; left: 26.5em; } + .right-box::-webkit-scrollbar { width: 4px; } + .right-box.without-tabbar { top: 3em; } + .right-box.with-menu { top: 10em; } + .right-box.without-menu { top: 6em; } + .main.without-footer .left-box { bottom: 0.2em; } + .narrow-scrollbar::-webkit-scrollbar { width: 4px; } + .grid.counter-chart { margin-top: 1em !important; margin-left: 0.4em !important; } + .grid.counter-chart .column { margin-bottom: 1em; font-size: 0.85em; @@ -125,172 +152,216 @@ body.expanded .right-box { border: 1px rgba(0, 0, 0, 0.1) solid; border-right: 0; } + .grid.counter-chart .column div.value { margin-top: 1.5em; font-weight: normal; } + .grid.counter-chart .column div.value span { font-size: 1.5em; margin-right: 0.2em; } + .grid.counter-chart .column.with-border { border-right: 1px rgba(0, 0, 0, 0.1) solid; } + .grid.counter-chart h4 { color: grey; position: relative; font-size: 1em; text-align: left; } + .grid.counter-chart h4 a { position: absolute; right: 0.1em; font-size: 1.26em; display: none; } + .grid.counter-chart .column:hover { background: rgba(0, 0, 0, 0.03) !important; } + .grid.counter-chart .column:hover a { display: inline; } + /** 通用 **/ * { scrollbar-color: rgba(0, 0, 0, 0.2) transparent; scrollbar-width: thin; } + .clear { clear: both; } + .hidden { display: none; } + pre { white-space: pre-wrap; } + a.disabled, a.disabled:hover, a.disabled:active, span.disabled { color: #ccc !important; } + a.enabled, span.enabled, span.green { color: #21ba45; } + a.grey, span.grey, label.grey, p.grey { color: grey !important; } + p.grey { margin-top: 0.8em; } + span.red, pre.red { color: #db2828; } + span.blue { color: #4183c4; } + span.orange { color: #ff851b; } + pre:not(.CodeMirror-line) { font-family: Lato, 'Helvetica Neue', Arial, Helvetica, sans-serif !important; } + tbody { background: transparent; } + .table.width30 { width: 30em !important; } + .table.width35 { width: 35em !important; } + .table.width40 { width: 40em !important; } + .table th, .table td { font-size: 0.9em !important; } + .table tr.active td { background: rgba(0, 0, 0, 0.01) !important; } + p.comment, div.comment { color: #959da6; padding-top: 0.4em; font-size: 1em; } + p.comment em, div.comment em { font-style: italic !important; } + .truncate { white-space: nowrap; -ms-text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; } + div.margin, p.margin { margin-top: 1em; } + /** 操作按钮容器 **/ .op.one { width: 4em; } + .op.two { width: 7.4em; } + .op.three { width: 9em; } + .op.four { width: 10em; } + /** 主菜单 **/ .main-menu { width: 8em !important; } + .main-menu .ui.menu { width: 100% !important; border-radius: 0 !important; } + .main-menu .ui.menu .item.separator { border-top: 1px rgba(0, 0, 0, 0.2) solid; height: 1px; min-height: 0; padding: 0; } + @media screen and (max-width: 512px) { .main-menu { width: auto !important; } + .main-menu .ui.menu { width: 3.6em !important; } + .main-menu .ui.menu .item.separator { display: none; } + .main-menu .ui.menu .item { padding-top: 2em; padding-bottom: 2.4em; } } + .main-menu .ui.labeled.icon.menu .item { font-size: 0.9em; } + .main-menu .ui.menu { padding-bottom: 3em; } + .main-menu .ui.menu .item .subtitle { display: none; } + .main-menu .ui.menu .item.expend .subtitle { display: block; font-size: 10px; @@ -298,20 +369,24 @@ p.margin { margin-top: 0.5em; color: grey; } + @media screen and (max-width: 512px) { .main-menu .ui.menu .item.expend .subtitle { display: none; } } + .main-menu .ui.menu .sub-items .item { padding-left: 2.8em !important; padding-right: 0.4em !important; } + .main-menu .ui.menu .sub-items .item .icon { position: absolute; left: 1.1em; top: 0.93em; } + .main-menu .ui.menu .sub-items .item .label { margin-left: 0; margin-right: 0; @@ -319,42 +394,53 @@ p.margin { padding-right: 0.4em; min-width: 2em; } + @media screen and (max-width: 512px) { .main-menu .ui.menu .sub-items .item { padding-left: 1em !important; } } + .main-menu .ui.menu .item.active { background: rgba(230, 230, 230, 0.45) !important; } + .main-menu .ui.menu .sub-items .item.active { background: rgba(230, 230, 230, 0.55) !important; } + /** 扩展UI **/ .field.text { padding: 0.5em; } + /** body **/ @keyframes blink { from { opacity: 0.1; } + to { opacity: 0.8; } } + body .ui.menu .item .blink { animation: blink 1s infinite; } + body.expanded .main-menu { display: none; } + body.expanded .sub-menu { display: none; } + body.expanded .main { left: 1em; } + /** 布局相关 */ .top-nav { border-radius: 0 !important; @@ -364,9 +450,11 @@ body.expanded .main { overflow-x: auto; background: #14539A !important; } + .top-nav::-webkit-scrollbar { height: 2px; } + .top-nav img.avatar { width: 1.6em !important; height: 1.6em !important; @@ -375,20 +463,25 @@ body.expanded .main { border-radius: 0.9em; margin-right: 0.5em !important; } + .top-nav em { font-style: normal; font-size: 0.9em; padding-left: 0.2em; } + .top-nav .item.red { color: red !important; } + .top-nav .item .hover-span span { display: none; } + .top-nav .item:hover .hover-span span { display: inline; } + /** 顶部菜单 **/ .top-secondary-menu { position: fixed; @@ -398,23 +491,28 @@ body.expanded .main { z-index: 100; background: white; } + .top-secondary-menu .menu { margin-top: 0 !important; margin-bottom: 0 !important; border-radius: 0 !important; } + .top-secondary-menu .menu var { font-style: normal; } + .top-secondary-menu .divider { margin-top: 0 !important; margin-bottom: 0 !important; } + @media screen and (max-width: 512px) { .top-secondary-menu { left: 4em; } } + /** 右侧主操作区 **/ .main { position: absolute; @@ -424,78 +522,99 @@ body.expanded .main { padding-right: 1em; right: 1em; } + @media screen and (max-width: 512px) { .main { left: 4em; } } + .main.without-menu { left: 9em; } + .main.without-secondary-menu { top: 2.9em; } + @media screen and (max-width: 512px) { .main.without-menu { left: 4em; } } + .main table td.title { width: 10em; } + .main table td.middle-title { width: 14em; } + .main table td { vertical-align: top; } + .main table td.color-border { border-left: 1px #276ac6 solid !important; } + .main table td.vertical-top { vertical-align: top; } + .main table td.vertical-middle { vertical-align: middle; } + .main table td[colspan="2"] a { font-weight: normal; } + .main table td em { font-weight: normal; font-style: normal; font-size: 0.9em; } + .main h3 { font-weight: normal; margin-top: 1em !important; position: relative; } + .main h3 span { font-size: 0.8em; } + .main h3 span.label { color: #6435c9; } + .main h3 a { margin-left: 1em; font-size: 14px !important; right: 1em; } + .main h4 { font-weight: normal; } + .main form h4 { margin-top: 0.6em; } + .main td span.small { font-size: 0.8em; } + .main .button.mini { font-size: 0.8em; padding: 0.2em; margin-left: 1em; } + .main-menu { position: fixed; /**top: 1.05em;**/ @@ -505,37 +624,47 @@ body.expanded .main { background: #14539A !important; z-index: 10; } + .main-menu .menu { background: #14539A !important; } + .main-menu::-webkit-scrollbar { width: 2px; } + .main .tab-menu { margin-top: 1em !important; margin-bottom: 0 !important; overflow-x: auto; overflow-y: hidden; } + .main .tab-menu .item { padding: 1em !important; } + .main .tab-menu .item var { font-style: normal; } + .main .tab-menu .item span { font-size: 0.8em; padding-left: 0.3em; } + .main .tab-menu .item .icon { margin-left: 0.6em; } + .main .tab-menu .item.active { background: #f8f8f9 !important; } + .main .tab-menu::-webkit-scrollbar { height: 4px; } + .main .go-top-btn { position: fixed; right: 2.6em; @@ -546,10 +675,12 @@ body.expanded .main { z-index: 999999; background: white; } + /** 子菜单 **/ .main.without-menu .sub-menu { display: none; } + .sub-menu { position: fixed; left: 8em; @@ -557,6 +688,7 @@ body.expanded .main { top: 3em; bottom: 2.8em; } + .sub-menu .menus-box { overflow-y: auto; position: absolute; @@ -566,14 +698,17 @@ body.expanded .main { left: 0; padding-right: 0.4em !important; } + .sub-menu .menus-box::-webkit-scrollbar { width: 4px; height: 4px; } + .sub-menu .menu { max-width: 12em !important; border-right: 0 !important; } + @media screen and (max-width: 512px) { .sub-menu { position: relative; @@ -581,32 +716,39 @@ body.expanded .main { left: 0; top: 0; } + .sub-menu .menus-box { position: relative !important; } + .sub-menu .menu { width: 100% !important; max-width: 30em !important; } + .sub-menu .menus-box .menu .item { width: 100% !important; max-width: 30em !important; } } + .sub-menu .menu .item.active { font-weight: normal !important; outline: none !important; } + .sub-menu .menu .item:not(.header) { padding-top: 0.7em !important; padding-bottom: 0.7em !important; } + .sub-menu .menu .item:not(.header) span { font-size: 0.8em; display: block; margin-top: 0.6em !important; line-height: 1.5; } + .sub-menu .menu .item:not(.active):hover { background: rgba(0, 0, 0, 0.05) !important; border-top: 1px white solid !important; @@ -614,53 +756,67 @@ body.expanded .main { margin-top: -1px !important; margin-bottom: -1px !important; } + .sub-menu .menu .item.active { background: rgba(0, 0, 0, 0.05) !important; } + .sub-menu .menu .item var { font-style: normal; } + .sub-menu .menu .item:not(.active) var.grey { color: grey; } + .sub-menu .menu .item span:not(.green) { color: grey; } + .sub-menu .menu .item span.red { color: #db2828 !important; } + .sub-menu .menus-box .menu .item.header { padding-right: 0.2em !important; cursor: pointer; } + .sub-menu .menus-box .menu .item.header span { font-weight: normal; color: grey; font-size: 0.8em; } + .sub-menu .menus-box .menu a { display: block; word-break: break-all; line-height: 1.6 !important; } + .sub-menu .menus-box .menu .item .menu { margin-top: 0 !important; } + .sub-menu .fourth-menu { margin-left: 1.2em; } + .sub-menu .fourth-menu .icon, .sub-menu .third-menu .icon { float: left !important; } + /** 右侧文本子菜单 **/ .text.menu { overflow-x: auto; } + .text.menu::-webkit-scrollbar { width: 4px; height: 4px; } + /** 脚部相关样式 **/ #footer { position: fixed; @@ -672,27 +828,34 @@ body.expanded .main { z-index: 10; overflow-x: auto; } + #footer::-webkit-scrollbar { height: 2px; } + #footer a { font-size: 0.9em; } + #footer a form { display: none; } + #footer a:hover span, #footer a:active span { display: none; } + #footer a:hover form, #footer a:active form { display: block; } + #footer form input { padding: 0; margin: 0; } + #footer-outer-box { z-index: 999999; position: fixed; @@ -702,6 +865,7 @@ body.expanded .main { background: rgba(0, 0, 0, 0.8); bottom: 2.6em; } + #footer-outer-box .qrcode { width: 20em; position: absolute; @@ -710,92 +874,115 @@ body.expanded .main { margin-top: -14em; margin-left: -10em; } + #footer-outer-box .qrcode img { width: 100%; } + #footer-outer-box .qrcode a { position: absolute; right: 0.5em; top: 0.5em; } + @media screen and (max-width: 512px) { #footer-outer-box .qrcode { margin-left: 0; left: 3.5em; } } + /** Vue **/ [v-cloak] { display: none !important; } + /** auto complete **/ .autocomplete-box .menu { background: #eee !important; } + .autocomplete-box .menu::-webkit-scrollbar { width: 4px; } + .autocomplete-box .menu .item { border-top: none !important; } + select.auto-width { width: auto !important; } + /** column **/ @media screen and (max-width: 512px) { .column:not(.one) { width: 100% !important; } } + label[for] { cursor: pointer !important; } + label.blue { color: #2185d0 !important; } + /** Menu **/ .first-menu .menu.text { margin-top: 0 !important; margin-bottom: 0 !important; } + .first-menu .divider { margin-top: 0 !important; margin-bottom: 0 !important; } + .second-menu .menu.text { margin-top: 0 !important; margin-bottom: 0 !important; } + .second-menu .menu.text em { font-style: normal; } + .second-menu .divider { margin-top: 0 !important; } + .menu a { outline: none; } + /** var **/ span.olive, var.olive { color: #b5cc18 !important; } + span.dash { border-bottom: 1px dashed grey; } + span.hover:hover { background: #eee; } + /** checkbox **/ .checkbox label a, .checkbox label { font-size: 0.9em !important; } + /** page **/ .page { margin-top: 1em; border-left: 1px solid #ddd; } + .page a { display: inline-block; background: #fafafa; @@ -806,62 +993,78 @@ span.hover:hover { border: 1px solid #ddd; border-left: 0; } + .page a.active { background: #2185d0 !important; color: white; } + .page a:hover { background: #eee; } + .page select { padding-top: 0.3em !important; padding-bottom: 0.3em !important; } + /** popup **/ .swal2-html-container { overflow-x: hidden; } + .swal2-close, .swal2-close:focus { border: 0; } + .swal2-confirm:focus, .swal2-cancel:focus { border: 3px #ddd solid !important; } + .swal2-confirm, .swal2-cancel { border: 3px #fff solid !important; } + .swal2-cancel { margin-left: 2em !important; } + /** 排序 **/ .sortable-ghost { background: #ddd !important; opacity: 0.1; } + .sortable-drag { opacity: 1; } + .icon.handle { cursor: pointer; } + .label.port-label { margin-top: 0.4em !important; margin-bottom: 0.4em !important; display: block; line-height: 1.5; } + .label { word-break: break-all; } + td .label.small { margin-bottom: 0.2em !important; } + td { word-break: break-all; } + .combo-box .menu { max-height: 17em; overflow-y: auto; @@ -870,29 +1073,94 @@ td { border-top: 0; z-index: 100; } + .combo-box .menu::-webkit-scrollbar { width: 4px; } + .methods-box { background: white; } + .methods-box .method-box { margin-bottom: 1em; padding: 0.5em 1em; border: 1px #eee solid; } + .methods-box .method-box.active { border: 1px #eee solid; background: #eee; } + .methods-box .method-box:hover { background: #eee; cursor: pointer; } + .scroll-box { overflow-y: auto; } + .scroll-box::-webkit-scrollbar { width: 4px; } -/*# sourceMappingURL=@layout.css.map */ \ No newline at end of file + +/*# sourceMappingURL=@layout.css.map */ +/* Override Primary Button Color for WAF Platform */ +.ui.primary.button, +.ui.primary.buttons .button { + background-color: #0f2c54 !important; + color: #ffffff !important; +} + +.ui.primary.button:hover, +.ui.primary.buttons .button:hover { + background-color: #0a1f3a !important; +} + +.ui.primary.button:focus, +.ui.primary.buttons .button:focus { + background-color: #08192e !important; +} + +.ui.primary.button:active, +.ui.primary.buttons .button:active, +.ui.primary.active.button { + background-color: #050d18 !important; +} + +.text-primary, +.blue { + color: #0f2c54 !important; +} + +/* Override Semantic UI Default Blue */ +.ui.blue.button, +.ui.blue.buttons .button { + background-color: #0f2c54 !important; + color: #ffffff !important; +} + +.ui.blue.button:hover, +.ui.blue.buttons .button:hover { + background-color: #0a1f3a !important; +} + +.ui.basic.blue.button, +.ui.basic.blue.buttons .button { + box-shadow: 0 0 0 1px #0f2c54 inset !important; + color: #0f2c54 !important; +} + +.ui.basic.blue.button:hover, +.ui.basic.blue.buttons .button:hover { + background: transparent !important; + box-shadow: 0 0 0 1px #0a1f3a inset !important; + color: #0a1f3a !important; +} + +.ui.menu .active.item { + border-color: #2185d0 !important; + color: #2185d0 !important; +} \ No newline at end of file diff --git a/EdgeUser/web/views/@default/@layout.html b/EdgeUser/web/views/@default/@layout.html index b66981f..0344605 100644 --- a/EdgeUser/web/views/@default/@layout.html +++ b/EdgeUser/web/views/@default/@layout.html @@ -18,10 +18,10 @@ {$echo "header"} @@ -80,8 +80,8 @@ class="disabled">消息(0) - - + + {{teaUsername}}
- + :class="{active:teaMenu == module.code && (teaSubMenu || '').length == 0, separator:(module.code || '').length == 0}" + :style="(teaMenu == module.code && (teaSubMenu || '').length == 0) ? 'background: rgba(230, 230, 230, 0.45) !important;' : ''"> + {{module.name}} @@ -131,14 +131,14 @@
-
+
- {{item.name}}({{item.subName}}) + {{item.name}}({{item.subName}})
@@ -149,11 +149,11 @@ + v-if="teaShowPageFooter && (teaPageFooterHTML || '').length > 0" v-html="teaPageFooterHTML" v-cloak>
{$echo "footer"} diff --git a/EdgeUser/web/views/@default/@layout_popup.css b/EdgeUser/web/views/@default/@layout_popup.css index 0fcc986..c98900b 100644 --- a/EdgeUser/web/views/@default/@layout_popup.css +++ b/EdgeUser/web/views/@default/@layout_popup.css @@ -3,57 +3,72 @@ scrollbar-color: rgba(0, 0, 0, 0.2) transparent; scrollbar-width: thin; } + .clear { clear: both; } + .hidden { display: none; } + pre { white-space: pre-wrap; } + a.disabled, a.disabled:hover, a.disabled:active, span.disabled { color: #ccc !important; } + a.enabled, span.enabled, span.green { color: #21ba45; } + span.grey, label.grey, p.grey { color: grey !important; } + p.grey { margin-top: 0.8em; } + span.red, pre.red { color: #db2828; } + pre:not(.CodeMirror-line) { font-family: Lato, 'Helvetica Neue', Arial, Helvetica, sans-serif !important; } + tbody { background: transparent; } + .table.width30 { width: 30em !important; } + .table.width35 { width: 35em !important; } + .table.width40 { width: 40em !important; } + .table th, .table td { font-size: 0.9em !important; } + p.comment, div.comment { color: #959da6; @@ -62,37 +77,46 @@ div.comment { word-break: break-all; line-height: 1.8; } + p.comment em, div.comment em { font-style: italic !important; } + .truncate { white-space: nowrap; -ms-text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; } + div.margin, p.margin { margin-top: 1em; } + /** 操作按钮容器 **/ .op.one { width: 4em; } + .op.two { width: 7.4em; } + .op.three { width: 9em; } + .op.four { width: 10em; } + /** 扩展UI **/ .field.text { padding: 0.5em; } + /** 右侧主操作区 **/ .main { position: absolute; @@ -102,169 +126,214 @@ p.margin { padding-right: 1em; right: 1em; } + @media screen and (max-width: 512px) { .main { left: 4em; } } + .main.without-menu { left: 9em; } + .main.without-secondary-menu { top: 2.9em; } + @media screen and (max-width: 512px) { .main.without-menu { left: 4em; } } + .main table td.title { width: 10em; } + .main table td.middle-title { width: 14em; } + .main table td { vertical-align: top; } + .main table td.color-border { border-left: 1px #276ac6 solid !important; } + .main table td.vertical-top { vertical-align: top; } + .main table td.vertical-middle { vertical-align: middle; } + .main table td[colspan="2"] a { font-weight: normal; } + .main table td em { font-weight: normal; font-style: normal; font-size: 0.9em; } + .main h3 { font-weight: normal; margin-top: 0.5em !important; } + .main h3 span { font-size: 0.8em; } + .main h3 span.label { color: #6435c9; } + .main h3 a { margin-left: 1em; font-size: 14px !important; right: 1em; } + .main h3 a::before { content: "["; } + .main h3 a::after { content: "]"; } + .main h4 { font-weight: normal; } + .main td span.small { font-size: 0.8em; } + .main .button.mini { font-size: 0.8em; padding: 0.2em; margin-left: 1em; } + /** 右侧文本子菜单 **/ .text.menu { overflow-x: auto; } + .text.menu::-webkit-scrollbar { width: 4px; height: 4px; } + /** Vue **/ [v-cloak] { display: none !important; } + /** auto complete **/ .autocomplete-box .menu { background: #eee !important; } + .autocomplete-box .menu::-webkit-scrollbar { width: 4px; } + .autocomplete-box .menu .item { border-top: none !important; } + select.auto-width { width: auto !important; } + /** column **/ @media screen and (max-width: 512px) { .column:not(.one) { width: 100% !important; } } + /** label **/ label[for] { cursor: pointer !important; } + label.blue { color: #2185d0 !important; } + span.blue { color: #4183c4; } + /** Menu **/ .first-menu .menu.text { margin-top: 0 !important; margin-bottom: 0 !important; } + .first-menu .divider { margin-top: 0 !important; margin-bottom: 0 !important; } + .second-menu .menu.text { margin-top: 0 !important; margin-bottom: 0 !important; } + .second-menu .menu.text em { font-style: normal; } + .second-menu .divider { margin-top: 0 !important; } + .menu a { outline: none; } + /** var **/ span.olive, var.olive { color: #b5cc18 !important; } + span.dash { border-bottom: 1px dashed grey; } + span.hover:hover { background: #eee; } + /** Message **/ .message .gopher { width: 30px; margin-right: 10px; } + /** checkbox **/ .checkbox label a, .checkbox label { font-size: 0.8em !important; } + /** page **/ .page { margin-top: 1em; border-left: 1px solid #ddd; } + .page a { display: inline-block; background: #fafafa; @@ -275,30 +344,37 @@ span.hover:hover { border: 1px solid #ddd; border-left: 0; } + .page a.active { background: #2185d0 !important; color: white; } + .page a:hover { background: #eee; } + /** popup **/ .swal2-html-container { overflow-x: hidden; } + .swal2-confirm:focus, .swal2-cancel:focus, .swal2-close:focus { border: 3px #ddd solid !important; } + .swal2-confirm, .swal2-cancel, .swal2-close { border: 3px #fff solid !important; } + .swal2-cancel { margin-left: 2em !important; } + .combo-box .menu { max-height: 17em; overflow-y: auto; @@ -307,9 +383,11 @@ span.hover:hover { border-top: 0; z-index: 100; } + .combo-box .menu::-webkit-scrollbar { width: 4px; } + code-label { background: #fff; border: 1px solid rgba(34, 36, 38, 0.15); @@ -323,4 +401,62 @@ code-label { font-weight: 700; vertical-align: baseline; } -/*# sourceMappingURL=@layout_popup.css.map */ \ No newline at end of file + +/*# sourceMappingURL=@layout_popup.css.map */ +/* Override Primary Button Color for WAF Platform */ +.ui.primary.button, +.ui.primary.buttons .button { + background-color: #0f2c54 !important; + color: #ffffff !important; +} + +.ui.primary.button:hover, +.ui.primary.buttons .button:hover { + background-color: #0a1f3a !important; +} + +.ui.primary.button:focus, +.ui.primary.buttons .button:focus { + background-color: #08192e !important; +} + +.ui.primary.button:active, +.ui.primary.buttons .button:active, +.ui.primary.active.button { + background-color: #050d18 !important; +} + +.text-primary, +.blue { + color: #0f2c54 !important; +} + +/* Override Semantic UI Default Blue */ +.ui.blue.button, +.ui.blue.buttons .button { + background-color: #0f2c54 !important; + color: #ffffff !important; +} + +.ui.blue.button:hover, +.ui.blue.buttons .button:hover { + background-color: #0a1f3a !important; +} + +.ui.basic.blue.button, +.ui.basic.blue.buttons .button { + box-shadow: 0 0 0 1px #0f2c54 inset !important; + color: #0f2c54 !important; +} + +.ui.basic.blue.button:hover, +.ui.basic.blue.buttons .button:hover { + background: transparent !important; + box-shadow: 0 0 0 1px #0a1f3a inset !important; + color: #0a1f3a !important; +} + +.ui.menu .active.item { + border-color: #2185d0 !important; + color: #2185d0 !important; +} \ No newline at end of file diff --git a/EdgeUser/web/views/@default/httpdns/apps/@menu.html b/EdgeUser/web/views/@default/httpdns/apps/@menu.html new file mode 100644 index 0000000..dda96cc --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/@menu.html @@ -0,0 +1,4 @@ + + 应用列表 + [添加应用] + \ No newline at end of file diff --git a/EdgeUser/web/views/@default/httpdns/apps/appSettings.html b/EdgeUser/web/views/@default/httpdns/apps/appSettings.html new file mode 100644 index 0000000..dd3e861 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/appSettings.html @@ -0,0 +1,140 @@ +{$layout} +{$template "menu"} +{$template "/left_menu_with_menu"} + + + +
+
+ + + +
开通CDN服务开通CDN服务

选中表示自动为用户开通CDN服务。

@@ -200,12 +220,14 @@ 暂时还没有开通任何功能。
- {{feature.name}} + + {{feature.name}}

{{feature.description}}

@@ -232,8 +254,9 @@

DDoS高防

- - + @@ -246,9 +269,10 @@

智能DNS服务

开通DDoS高防管理 + 开通DDoS高防管理 +

选中表示自动为用户开通DDoS高防IP使用服务。
- - +
开通智能DNS服务 -

选中表示自动为用户开通智能DNS服务。

+ 		开通智能DNS服务 + +

选中表示自动为用户开通智能DNS服务。使用默认集群资源，如需使用其他集群，请到用户新增和业务设置页面中进行选择。
@@ -256,5 +280,28 @@
+
+

HTTPDNS服务

+ + + + + + + + + +
开通HTTPDNS服务 + +

选中表示自动为用户开通HTTPDNS服务。使用默认集群资源，如需使用其他集群，请到用户新增和业务设置页面中进行选择。

+
默认分配集群 + +

用户新建 HTTPDNS 应用时默认分配的集群。

+
+
+ \ No newline at end of file diff --git a/EdgeAdmin/web/views/@default/users/setting/index.js b/EdgeAdmin/web/views/@default/users/setting/index.js index 607dbaa..92e50ab 100644 --- a/EdgeAdmin/web/views/@default/users/setting/index.js +++ b/EdgeAdmin/web/views/@default/users/setting/index.js @@ -7,7 +7,8 @@ Tea.context(function () { this.mobileVerificationMoreOptions = false this.mobileResetPasswordMoreOptions = false - this.featureOp = "overwrite" + // 默认不影响已有用户功能，避免保存注册设置时误改用户功能绑定 + this.featureOp = "keep" this.featuresVisible = false this.showFeatures = function () { @@ -27,4 +28,4 @@ Tea.context(function () { }) return names.join(" / ") } -}) \ No newline at end of file +}) diff --git a/EdgeAdmin/web/views/@default/users/update.html b/EdgeAdmin/web/views/@default/users/update.html index 61f4b8a..c28f825 100644 --- a/EdgeAdmin/web/views/@default/users/update.html +++ b/EdgeAdmin/web/views/@default/users/update.html @@ -39,12 +39,22 @@
关联集群 *CDN关联集群 *

用户发布的网站会自动部署到此集群，修改此选项会同步修改当前用户下的所有网站，但不影响和套餐绑定的服务。
HTTPDNS关联集群 + +

用户新建 HTTPDNS 应用时默认分配的集群。

+
关联集群CDN关联集群 - {{user.cluster.name}} + {{user.cluster.name}} + 没有设置。 +
HTTPDNS关联集群 + {{user.httpdnsCluster.name}} 没有设置。
认证二维码 - qrcode -

[下载]   可以通过二维码快速添加OTP认证信息到认证App中。

+ qrcode +

[下载]   + 可以通过二维码快速添加OTP认证信息到认证App中。
+ + + + + + + + +
应用启用 + +
SNI 防护配置 + 隐匿 SNI +

当前默认采用隐匿 SNI 策略，避免在 TLS 握手阶段暴露业务域名。

+
+ + + + + + + + + + + + + + + + + + +
App ID + {{settings.appId}} + +
服务地址 +
+
+ {{sa.address}} + +
+
+ 未配置集群 +
请求验签 + {{settings.signEnabled + ? "已开启" : "已关闭"}} + {{settings.signEnabled ? "关闭请求验签" : "开启请求验签"}} +

打开后，服务端会对请求进行签名校验。

+
加签 Secret +
+ {{signSecretVisible ? settings.signSecretPlain : settings.signSecretMasked}} + + + +
+

最近更新：{{settings.signSecretUpdatedAt}}

+

请求验签已关闭，当前不使用加签 Secret。

+

用于生成鉴权接口的安全密钥。

+
+ + + + \ No newline at end of file diff --git a/EdgeUser/web/views/@default/httpdns/apps/appSettings.js b/EdgeUser/web/views/@default/httpdns/apps/appSettings.js new file mode 100644 index 0000000..1f5d8f6 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/appSettings.js @@ -0,0 +1,95 @@ +Tea.context(function () { + this.activeSection = this.activeSection || "basic"; + this.success = NotifyReloadSuccess("保存成功"); + this.signSecretVisible = false; + + this.toggleSignEnabled = function () { + let that = this; + let targetIsOn = !this.settings.signEnabled; + + if (targetIsOn) { + teaweb.confirm("html:开启后，服务端会对解析请求进行签名鉴权，未签名、签名无效或过期的请求都会解析失败，确认开启吗？", function () { + that.$post("/httpdns/apps/app/settings/toggleSignEnabled") + .params({ + appId: that.app.id, + isOn: 1 + }) + .success(function () { + that.settings.signEnabled = true; + teaweb.success("请求验签已开启"); + }); + }); + return; + } + + teaweb.confirm("html:关闭后，服务端不会对解析请求进行签名鉴权，可能存在被刷风险，确认关闭吗？", function () { + that.$post("/httpdns/apps/app/settings/toggleSignEnabled") + .params({ + appId: that.app.id, + isOn: 0 + }) + .success(function () { + that.settings.signEnabled = false; + teaweb.success("请求验签已关闭"); + }); + }); + }; + + this.copySecret = function (text, name) { + if (typeof text != "string" || text.length == 0) { + teaweb.warn("没有可复制的内容"); + return; + } + + if (navigator.clipboard && navigator.clipboard.writeText) { + navigator.clipboard.writeText(text).then(function () { + teaweb.success(name + "已复制"); + }).catch(function () { + this.copyByTextarea(text, name); + }.bind(this)); + return; + } + + this.copyByTextarea(text, name); + }; + + this.copyByTextarea = function (text, name) { + let input = document.createElement("textarea"); + input.value = text; + input.setAttribute("readonly", "readonly"); + input.style.position = "fixed"; + input.style.left = "-10000px"; + input.style.top = "-10000px"; + document.body.appendChild(input); + input.select(); + + let ok = false; + try { + ok = document.execCommand("copy"); + } catch (e) { + ok = false; + } + document.body.removeChild(input); + + if (ok) { + teaweb.success(name + "已复制"); + } else { + teaweb.warn("复制失败，请手动复制"); + } + }; + + this.resetSignSecret = function () { + let that = this; + teaweb.confirm("确定要重置加签 Secret 吗？", function () { + that.$post("/httpdns/apps/app/settings/resetSignSecret") + .params({ + appId: that.app.id + }) + .success(function () { + teaweb.success("加签 Secret 已重置", function () { + teaweb.reload(); + }); + }); + }); + }; +}); diff --git a/EdgeUser/web/views/@default/httpdns/apps/create.html b/EdgeUser/web/views/@default/httpdns/apps/create.html new file mode 100644 index 0000000..7f329f4 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/create.html @@ -0,0 +1,16 @@ +{$layout} +{$template "menu"} + +
+ + + + + + +
应用名称 * + +

为该 HTTPDNS 应用设置一个便于识别的名称。

+
+ +
\ No newline at end of file diff --git a/EdgeUser/web/views/@default/httpdns/apps/create.js b/EdgeUser/web/views/@default/httpdns/apps/create.js new file mode 100644 index 0000000..79b655f Binary files /dev/null and b/EdgeUser/web/views/@default/httpdns/apps/create.js differ diff --git a/EdgeUser/web/views/@default/httpdns/apps/customRecords.html b/EdgeUser/web/views/@default/httpdns/apps/customRecords.html new file mode 100644 index 0000000..9a0763c --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/customRecords.html @@ -0,0 +1,55 @@ +{$layout} + + + + + {{app.name}} + » + 域名列表 + » +
{{domain.name}}
+ 创建规则 + + + + + + + + + + + + + + + + + + + + + + + +
线路规则名称解析记录TTL状态操作
{{record.lineText}}{{record.ruleName}}{{record.recordValueText}}{{record.ttl}}s + 已启用 + 已停用 + + 编辑  |  + {{record.isOn ? "停用" : "启用"}}  |  + 删除 +
+ +当前应用暂无可用域名，请先到域名管理中添加域名。 +当前域名还没有自定义解析规则。 diff --git a/EdgeUser/web/views/@default/httpdns/apps/customRecords.js b/EdgeUser/web/views/@default/httpdns/apps/customRecords.js new file mode 100644 index 0000000..cd65c73 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/customRecords.js @@ -0,0 +1,60 @@ +Tea.context(function () { + if (typeof this.records == "undefined") { + this.records = []; + } + + this.createRecord = function () { + if (!this.domain || !this.domain.id) { + return; + } + teaweb.popup("/httpdns/apps/customRecords/createPopup?appId=" + this.app.id + "&domainId=" + this.domain.id, { + width: "42em", + height: "33em", + title: "新增自定义解析规则", + callback: function () { + teaweb.success("保存成功", function () { + teaweb.reload(); + }); + } + }); + }; + + this.editRecord = function (recordId) { + if (!this.domain || !this.domain.id) { + return; + } + teaweb.popup("/httpdns/apps/customRecords/createPopup?appId=" + this.app.id + "&domainId=" + this.domain.id + "&recordId=" + recordId, { + width: "42em", + height: "33em", + title: "编辑自定义解析规则", + callback: function () { + teaweb.success("保存成功", function () { + teaweb.reload(); + }); + } + }); + }; + + this.deleteRecord = function (recordId) { + let that = this; + teaweb.confirm("确定要删除这条自定义解析规则吗？", function () { + that.$post("/httpdns/apps/customRecords/delete") + .params({ + appId: that.app.id, + recordId: recordId + }) + .refresh(); + }); + }; + + this.toggleRecord = function (record) { + let that = this; + that.$post("/httpdns/apps/customRecords/toggle") + .params({ + appId: that.app.id, + recordId: record.id, + isOn: record.isOn ? 0 : 1 + }) + .refresh(); + }; +}); diff --git a/EdgeUser/web/views/@default/httpdns/apps/customRecordsCreatePopup.html b/EdgeUser/web/views/@default/httpdns/apps/customRecordsCreatePopup.html new file mode 100644 index 0000000..c286ddc --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/customRecordsCreatePopup.html @@ -0,0 +1,160 @@ +{$layout "layout_popup"} + + + +

编辑自定义解析规则

+

新增自定义解析规则

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
域名 *{{record.domain}}
规则名称 * + +

例如：上海电信灰度-v2

+
线路 +
+ + + + + + + +
+
解析记录值 * +
+
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + 添加记录值 + + {{recordItems.length}}/10 +
+
TTL * +
+ + 秒 +
+
状态 +
+ + +
+
+ + +
diff --git a/EdgeUser/web/views/@default/httpdns/apps/customRecordsCreatePopup.js b/EdgeUser/web/views/@default/httpdns/apps/customRecordsCreatePopup.js new file mode 100644 index 0000000..e8bc6a0 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/customRecordsCreatePopup.js @@ -0,0 +1,158 @@ +Tea.context(function () { + var vm = this; + + if (typeof vm.record == "undefined" || vm.record == null) { + vm.record = {}; + } + + vm.chinaCarriers = ["默认", "电信", "联通", "移动", "教育网", "鹏博士", "广电"]; + vm.chinaRegions = ["默认", "东北", "华北", "华东", "华南", "华中", "西北", "西南"]; + vm.chinaRegionProvinces = { + "默认": ["默认"], + "东北": ["默认", "辽宁", "吉林", "黑龙江"], + "华北": ["默认", "北京", "天津", "河北", "山西", "内蒙古"], + "华东": ["默认", "上海", "江苏", "浙江", "安徽", "福建", "江西", "山东"], + "华南": ["默认", "广东", "广西", "海南"], + "华中": ["默认", "河南", "湖北", "湖南"], + "西北": ["默认", "陕西", "甘肃", "青海", "宁夏", "新疆"], + "西南": ["默认", "重庆", "四川", "贵州", "云南", "西藏"] + }; + + vm.continents = ["默认", "亚洲", "欧洲", "北美洲", "南美洲", "非洲", "大洋洲"]; + vm.continentCountries = { + "默认": ["默认"], + "亚洲": ["默认", "中国香港", "中国澳门", "中国台湾", "日本", "韩国", "新加坡", "印度", "泰国", "越南", + "印度尼西亚", "马来西亚", "菲律宾", "柬埔寨", "缅甸", "老挝", "斯里兰卡", "孟加拉国", "巴基斯坦", "尼泊尔", + "阿联酋", "沙特阿拉伯", "土耳其", "以色列", "伊朗", "伊拉克", "卡塔尔", "科威特", "蒙古"], + "欧洲": ["默认", "德国", "英国", "法国", "荷兰", "西班牙", "意大利", "俄罗斯", + "波兰", "瑞典", "瑞士", "挪威", "芬兰", "丹麦", "葡萄牙", "爱尔兰", "比利时", "奥地利", + "乌克兰", "捷克", "罗马尼亚", "匈牙利", "希腊"], + "北美洲": ["默认", "美国", "加拿大", "墨西哥", "巴拿马", "哥斯达黎加", "古巴"], + "南美洲": ["默认", "巴西", "阿根廷", "智利", "哥伦比亚", "秘鲁", "委内瑞拉", "厄瓜多尔"], + "非洲": ["默认", "南非", "埃及", "尼日利亚", "肯尼亚", "摩洛哥", "阿尔及利亚", "坦桑尼亚", "埃塞俄比亚", "加纳", "突尼斯"], + "大洋洲": ["默认", "澳大利亚", "新西兰"] + }; + + vm.parseJSONList = function (raw) { + if (typeof raw == "undefined" || raw == null || raw == "") { + return []; + } + + if (Array.isArray(raw)) { + return raw; + } + + try { + var list = JSON.parse(raw); + if (Array.isArray(list)) { + return list; + } + } catch (e) { + } + + return []; + }; + + vm.normalizeBoolean = function (value, defaultValue) { + if (typeof value == "boolean") { + return value; + } + if (typeof value == "number") { + return value > 0; + } + if (typeof value == "string") { + value = value.toLowerCase(); + return value == "1" || value == "true" || value == "yes" || value == "on"; + } + return defaultValue; + }; + + vm.record.lineScope = vm.record.lineScope == "overseas" ? "overseas" : "china"; + vm.record.lineCarrier = vm.record.lineCarrier || "默认"; + vm.record.lineRegion = vm.record.lineRegion || "默认"; + vm.record.lineProvince = vm.record.lineProvince || "默认"; + vm.record.lineContinent = vm.record.lineContinent || "默认"; + vm.record.lineCountry = vm.record.lineCountry || "默认"; + vm.record.ruleName = vm.record.ruleName || ""; + vm.record.ttl = vm.record.ttl || 30; + vm.record.weightEnabled = vm.normalizeBoolean(vm.record.weightEnabled, false); + vm.record.isOn = vm.normalizeBoolean(vm.record.isOn, true); + + vm.recordItems = vm.parseJSONList(vm.record.recordItemsJson); + if (vm.recordItems.length == 0) { + vm.recordItems.push({type: "A", value: "", weight: 100}); + } else { + for (var i = 0; i < vm.recordItems.length; i++) { + var item = vm.recordItems[i]; + if (item.type != "A" && item.type != "AAAA") { + item.type = "A"; + } + if (typeof item.weight == "undefined" || item.weight == null || item.weight === "") { + item.weight = 100; + } + } + } + + vm.provinceOptions = ["默认"]; + vm.countryOptions = ["默认"]; + + vm.refreshProvinceOptions = function () { + var provinces = vm.chinaRegionProvinces[vm.record.lineRegion]; + if (!Array.isArray(provinces) || provinces.length == 0) { + provinces = ["默认"]; + } + vm.provinceOptions = provinces; + if (vm.provinceOptions.indexOf(vm.record.lineProvince) < 0) { + vm.record.lineProvince = vm.provinceOptions[0]; + } + }; + + vm.refreshCountryOptions = function () { + var countries = vm.continentCountries[vm.record.lineContinent]; + if (!Array.isArray(countries) || countries.length == 0) { + countries = ["默认"]; + } + vm.countryOptions = countries; + if (vm.countryOptions.indexOf(vm.record.lineCountry) < 0) { + vm.record.lineCountry = vm.countryOptions[0]; + } + }; + + vm.onChinaRegionChange = function () { + vm.refreshProvinceOptions(); + }; + + vm.onContinentChange = function () { + vm.refreshCountryOptions(); + }; + + vm.onLineScopeChange = function () { + if (vm.record.lineScope == "overseas") { + vm.record.lineContinent = vm.record.lineContinent || "默认"; + vm.refreshCountryOptions(); + } else { + vm.record.lineCarrier = vm.record.lineCarrier || "默认"; + vm.record.lineRegion = vm.record.lineRegion || "默认"; + vm.refreshProvinceOptions(); + } + }; + + vm.addRecordItem = function () { + if (vm.recordItems.length >= 10) { + return; + } + vm.recordItems.push({type: "A", value: "", weight: 100}); + }; + + vm.removeRecordItem = function (index) { + if (index < 0 || index >= vm.recordItems.length) { + return; + } + vm.recordItems.splice(index, 1); + if (vm.recordItems.length == 0) { + vm.recordItems.push({type: "A", value: "", weight: 100}); + } + }; + + vm.onLineScopeChange(); +}); diff --git a/EdgeUser/web/views/@default/httpdns/apps/delete.html b/EdgeUser/web/views/@default/httpdns/apps/delete.html new file mode 100644 index 0000000..b374ce3 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/delete.html @@ -0,0 +1,12 @@ +{$layout} + + + {{app.name}} + » +
删除应用
+ + +
+ +

包含{{domainCount}}域名

+
diff --git a/EdgeUser/web/views/@default/httpdns/apps/delete.js b/EdgeUser/web/views/@default/httpdns/apps/delete.js new file mode 100644 index 0000000..6c30c8e --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/delete.js @@ -0,0 +1,16 @@ +Tea.context(function () { + this.deleteApp = function (appId) { + let that = this; + teaweb.confirm("确定要删除此应用吗？", function () { + that.$post("/httpdns/apps/delete") + .params({ + appId: appId + }) + .success(function () { + teaweb.success("删除成功", function () { + window.location = "/httpdns/apps"; + }); + }); + }); + }; +}); diff --git a/EdgeUser/web/views/@default/httpdns/apps/docs/android.md b/EdgeUser/web/views/@default/httpdns/apps/docs/android.md new file mode 100644 index 0000000..795d558 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/docs/android.md @@ -0,0 +1,36 @@ +# Android SDK + +## 初始化 + +```java +new InitConfig.Builder() + .setContext(context) + .setPrimaryServiceHost("httpdns-a.example.com") + .setBackupServiceHost("httpdns-b.example.com") + .setServicePort(443) + .setSecretKey("your-sign-secret") + .setEnableHttps(true) + .buildFor("app1f1ndpo9"); +``` + +## 解析 + +```java +HTTPDNSResult result = httpDnsService.getHttpDnsResultForHostSyncNonBlocking( + "api.business.com", + RequestIpType.auto, + null, + null +); +``` + +## 官方业务适配器 + +```java +HttpDnsHttpAdapter adapter = HttpDns.buildHttpClientAdapter(httpDnsService); +HttpDnsAdapterResponse resp = adapter.execute( + new HttpDnsAdapterRequest("GET", "https://api.business.com/v1/ping") +); +``` + +固定策略：IP 直连 + 空 SNI + Host=真实域名，不回退到带 SNI。 diff --git a/EdgeUser/web/views/@default/httpdns/apps/docs/flutter.md b/EdgeUser/web/views/@default/httpdns/apps/docs/flutter.md new file mode 100644 index 0000000..7a1b112 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/docs/flutter.md @@ -0,0 +1,35 @@ +# Flutter SDK + +## 初始化 + +```dart +await AliyunHttpdns.init( + appId: 'app1f1ndpo9', + primaryServiceHost: 'httpdns-a.example.com', + backupServiceHost: 'httpdns-b.example.com', + servicePort: 443, + secretKey: 'your-sign-secret', +); +await AliyunHttpdns.build(); +``` + +## 解析 + +```dart +final result = await AliyunHttpdns.resolveHostSyncNonBlocking( + 'api.business.com', + ipType: 'both', +); +``` + +## 官方业务适配器 + +```dart +final adapter = AliyunHttpdns.createHttpAdapter(); +final resp = await adapter.request( + Uri.parse('https://api.business.com/v1/ping'), + method: 'GET', +); +``` + +固定策略：IP 直连 + 空 SNI + Host=真实域名，不回退到带 SNI。 diff --git a/EdgeUser/web/views/@default/httpdns/apps/docs/ios.md b/EdgeUser/web/views/@default/httpdns/apps/docs/ios.md new file mode 100644 index 0000000..a90381e --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/docs/ios.md @@ -0,0 +1,31 @@ +# iOS SDK + +## 初始化 + +```objc +HttpdnsEdgeService *service = [[HttpdnsEdgeService alloc] + initWithAppId:@"app1f1ndpo9" +primaryServiceHost:@"httpdns-a.example.com" + backupServiceHost:@"httpdns-b.example.com" + servicePort:443 + signSecret:@"your-sign-secret"]; +``` + +## 解析 + +```objc +[service resolveHost:@"api.business.com" queryType:@"A" completion:^(HttpdnsEdgeResolveResult * _Nullable result, NSError * _Nullable error) { + // result.ipv4s / result.ipv6s +}]; +``` + +## 官方业务适配器 + +```objc +NSURL *url = [NSURL URLWithString:@"https://api.business.com/v1/ping"]; +[service requestURL:url method:@"GET" headers:nil body:nil completion:^(NSData * _Nullable data, NSHTTPURLResponse * _Nullable response, NSError * _Nullable error) { + // handle +}]; +``` + +固定策略：IP 直连 + 空 SNI + Host=真实域名，不回退到带 SNI。 diff --git a/EdgeUser/web/views/@default/httpdns/apps/domains.html b/EdgeUser/web/views/@default/httpdns/apps/domains.html new file mode 100644 index 0000000..7baf7a7 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/domains.html @@ -0,0 +1,62 @@ +{$layout} + +
+ + + + {{app.name}} + » +
域名列表
+ 创建域名 + + +
+
+
+ +
+
+ +   + [清除条件] +
+
+
+ + + + + + + + + + + + + + + + + + + + + +
服务域名规则策略操作
+
{{domain.name}}
+ 		+ {{domain.customRecordCount}} + + 自定义解析 +  |  + 解绑 +
+ +当前应用尚未绑定域名。 +没有匹配的域名。 diff --git a/EdgeUser/web/views/@default/httpdns/apps/domains.js b/EdgeUser/web/views/@default/httpdns/apps/domains.js new file mode 100644 index 0000000..cc5678b --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/domains.js @@ -0,0 +1,73 @@ +Tea.context(function () { + var that = this; + + if (typeof this.keywordInput == "undefined" || this.keywordInput == null) { + this.keywordInput = ""; + } + if (typeof this.keyword == "undefined" || this.keyword == null) { + this.keyword = ""; + } + + if (typeof this.domains == "undefined" || this.domains == null) { + this.domains = []; + } + + this.keywordInput = String(this.keyword); + + this.doSearch = function () { + that.keyword = String(that.keywordInput || "").trim(); + }; + + this.clearSearch = function () { + that.keywordInput = ""; + that.keyword = ""; + }; + + this.filteredDomains = function () { + let keyword = (that.keyword || "").trim().toLowerCase(); + if (keyword.length == 0) { + return that.domains || []; + } + return (that.domains || []).filter(function (domain) { + let name = (domain.name || "").toLowerCase(); + return name.indexOf(keyword) >= 0; + }); + }; + + this.bindDomain = function () { + teaweb.popup("/httpdns/apps/domains/createPopup?appId=" + that.app.id, { + height: "12em", + width: "36em", + title: "添加域名", + callback: function () { + teaweb.success("保存成功", function () { + teaweb.reload(); + }); + } + }); + }; + + this.deleteApp = function () { + let that = this; + teaweb.confirm("确定要删除当前应用吗？", function () { + that.$post("/httpdns/apps/delete") + .params({ + appId: that.app.id + }) + .success(function () { + window.location = "/httpdns/apps"; + }); + }); + }; + + this.deleteDomain = function (domainId) { + let that = this; + teaweb.confirm("确定要解绑这个域名吗？", function () { + that.$post("/httpdns/apps/domains/delete") + .params({ + domainId: domainId + }) + .refresh(); + }); + }; +}); diff --git a/EdgeUser/web/views/@default/httpdns/apps/domainsCreatePopup.html b/EdgeUser/web/views/@default/httpdns/apps/domainsCreatePopup.html new file mode 100644 index 0000000..f55fd69 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/domainsCreatePopup.html @@ -0,0 +1,18 @@ +{$layout "layout_popup"} + +

添加域名

+ +
+ + + + + + + +
域名 * + +

请输入完整 FQDN，例如 api.example.com。

+
+ +
diff --git a/EdgeUser/web/views/@default/httpdns/apps/index.html b/EdgeUser/web/views/@default/httpdns/apps/index.html new file mode 100644 index 0000000..0d9bc35 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/index.html @@ -0,0 +1,71 @@ +{$layout} +{$template "menu"} + +
+ + + +
+
+
+
+ +
+
+ + [清除条件] +
+
+
+ +

暂时没有符合条件的 HTTPDNS 应用。

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
应用名称AppID绑定域名数状态操作
+ + + {{app.name}} + + + + {{app.appId}} + + {{app.domainCount}} + + + 域名管理  |  + 应用设置  |  + SDK集成 +
+ +
+
\ No newline at end of file diff --git a/EdgeUser/web/views/@default/httpdns/apps/index.js b/EdgeUser/web/views/@default/httpdns/apps/index.js new file mode 100644 index 0000000..a415a1d --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/index.js @@ -0,0 +1,9 @@ +Tea.context(function () { + if (typeof this.apps == "undefined") { + this.apps = []; + } + + this.createApp = function () { + window.location = "/httpdns/apps/create"; + }; +}); diff --git a/EdgeUser/web/views/@default/httpdns/apps/sdk.html b/EdgeUser/web/views/@default/httpdns/apps/sdk.html new file mode 100644 index 0000000..c4b7e85 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/sdk.html @@ -0,0 +1,79 @@ +{$layout} + + + + + {{app.name}} + » +
SDK 集成
+ + +
+
+
+
Android SDK
+
Java / Kotlin
+
适用于 Android 客户端接入。
+
+
+
+ 下载 SDK + 下载文档 +
+
+
+ +
+
+
iOS SDK
+
Objective-C / Swift
+
适用于 iOS 客户端接入。
+
+
+
+ 下载 SDK + 下载文档 +
+
+
+ +
+
+
Flutter SDK
+
Dart / Plugin
+
适用于 Flutter 跨平台接入。
+
+
+
+ 下载 SDK + 下载文档 +
+
+
+
diff --git a/EdgeUser/web/views/@default/httpdns/apps/sdk.js b/EdgeUser/web/views/@default/httpdns/apps/sdk.js new file mode 100644 index 0000000..fcf5fd4 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/apps/sdk.js @@ -0,0 +1,123 @@ +Tea.context(function () { + this.downloadSDK = function (platform, event) { + this.checkAndDownload(platform, "sdk", event) + } + + this.downloadDoc = function (platform, event) { + this.checkAndDownload(platform, "doc", event) + } + + this.checkAndDownload = function (platform, type, event) { + if (event != null && typeof event.preventDefault == "function") { + event.preventDefault() + } + + this.$get("/httpdns/apps/sdk/check") + .params({ + platform: platform, + type: type + }) + .success(function (resp) { + let data = (resp != null && resp.data != null) ? resp.data : {} + if (!data.exists) { + teaweb.warn(data.message || "当前暂无可下载文件") + return + } + if (typeof data.url == "string" && data.url.length > 0) { + this.downloadByBlob(data.url, platform, type) + return + } + teaweb.warn("下载地址生成失败，请稍后重试") + }.bind(this)) + } + + this.downloadByBlob = function (url, platform, type) { + let defaultFileName = "httpdns-sdk-" + platform + (type == "doc" ? ".md" : ".zip") + + let xhr = new XMLHttpRequest() + xhr.open("GET", url, true) + xhr.responseType = "blob" + + xhr.onload = function () { + if (xhr.status < 200 || xhr.status >= 300) { + teaweb.warn("下载失败（HTTP " + xhr.status + "）") + return + } + if (xhr.status == 204) { + teaweb.warn("下载被浏览器扩展或下载工具拦截，请暂时关闭相关扩展后重试") + return + } + + let contentType = (xhr.getResponseHeader("Content-Type") || "").toLowerCase() + if (contentType.indexOf("application/json") >= 0) { + let reader = new FileReader() + reader.onload = function () { + try { + let json = JSON.parse(reader.result) + teaweb.warn((json && json.message) ? json.message : "下载失败，请稍后重试") + } catch (_e) { + teaweb.warn("下载失败，请稍后重试") + } + } + reader.readAsText(xhr.response) + return + } + + let disposition = xhr.getResponseHeader("Content-Disposition") || "" + let fileName = xhr.getResponseHeader("X-SDK-Filename") || this.parseFileName(disposition) || defaultFileName + if (xhr.response == null || xhr.response.size <= 0) { + teaweb.warn("下载文件为空，请检查已上传 SDK 包是否完整") + return + } + this.saveBlob(xhr.response, fileName) + }.bind(this) + + xhr.onerror = function () { + teaweb.warn("下载失败，请检查网络后重试") + } + + xhr.send() + } + + this.parseFileName = function (disposition) { + if (typeof disposition != "string" || disposition.length == 0) { + return "" + } + + let utf8Match = disposition.match(/filename\*=UTF-8''([^;]+)/i) + if (utf8Match != null && utf8Match.length > 1) { + try { + return decodeURIComponent(utf8Match[1]) + } catch (_e) { + } + } + + let plainMatch = disposition.match(/filename="?([^";]+)"?/i) + if (plainMatch != null && plainMatch.length > 1) { + return plainMatch[1] + } + + return "" + } + + this.saveBlob = function (blob, fileName) { + if (window.navigator != null && typeof window.navigator.msSaveOrOpenBlob == "function") { + window.navigator.msSaveOrOpenBlob(blob, fileName) + return + } + + let objectURL = window.URL.createObjectURL(blob) + let a = document.createElement("a") + a.style.display = "none" + a.href = objectURL + a.download = fileName + document.body.appendChild(a) + a.click() + setTimeout(function () { + window.URL.revokeObjectURL(objectURL) + if (a.parentNode != null) { + a.parentNode.removeChild(a) + } + }, 30000) + } +}) diff --git a/EdgeUser/web/views/@default/httpdns/resolveLogs/@menu.html b/EdgeUser/web/views/@default/httpdns/resolveLogs/@menu.html new file mode 100644 index 0000000..72927ed --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/resolveLogs/@menu.html @@ -0,0 +1,3 @@ + + 访问日志 + diff --git a/EdgeUser/web/views/@default/httpdns/resolveLogs/index.html b/EdgeUser/web/views/@default/httpdns/resolveLogs/index.html new file mode 100644 index 0000000..4bfc158 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/resolveLogs/index.html @@ -0,0 +1,94 @@ +{$layout} + +
+ + + +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ [清除条件] +
+
+
+
+ +
+ +暂时还没有访问日志。 + +
+
+ + + + + + + + + + + + + + + + + +
API服务地址域名类型概要
{{log.serviceDomain}}{{log.domain}}{{log.query}} +
+ {{log.time}} + | {{log.appName}} ({{log.appId}}) + | {{log.clientIp}} + | {{log.os}}/{{log.sdkVersion}} + | {{log.query}} {{log.domain}} -> + {{log.ips}} + [无记录] + | + 成功 + 失败 + ({{log.errorCode}}) + | {{log.costMs}}ms +
+
+
+
\ No newline at end of file diff --git a/EdgeUser/web/views/@default/httpdns/sandbox/@menu.html b/EdgeUser/web/views/@default/httpdns/sandbox/@menu.html new file mode 100644 index 0000000..397eae3 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/sandbox/@menu.html @@ -0,0 +1,4 @@ + + + 解析测试 + \ No newline at end of file diff --git a/EdgeUser/web/views/@default/httpdns/sandbox/index.html b/EdgeUser/web/views/@default/httpdns/sandbox/index.html new file mode 100644 index 0000000..ffb8af1 --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/sandbox/index.html @@ -0,0 +1,149 @@ +{$layout} + +
+ +
+
+ +
+
+

解析测试

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +

用于测试 ECS 掩码与区域调度效果。

+
+
+ +
+ + +
+
+ +
+ + + +
+
+
+ + +
+ +
+

请在左侧配置参数后点击「在线解析」。

+
+ + +
+
+
解析中...
+
+
+ + +
+ +
+
+ 解析成功 + 解析失败 ({{response.code}}) +
+

{{response.message}}

+

Request ID: {{response.requestId}}

+
+ + +
+
解析结果
+
+
请求URL
+
+ {{response.data.request_url || '-'}} +
+
+ +
解析结果详情
+
+
+
+
客户端 IP
+
+ {{response.data.client_ip || request.clientIp || '-'}} +
+
+
+
+
+
地区
+
{{response.data.client_region || '-'}}
+
+
+
+
+
线路
+
{{response.data.line_name || '-'}}
+
+
+
+ + +
解析记录
+ + + + + + + + + + + + + + + + + + + + + +
解析域名解析类型IP地址TTL地区线路
{{row.domain || + request.domain}}{{row.type || request.qtype}}{{row.ip}}{{row.ttl}}s{{row.region || '-'}}{{row.line || '-'}}
+
+
+
+
+
\ No newline at end of file diff --git a/EdgeUser/web/views/@default/httpdns/sandbox/index.js b/EdgeUser/web/views/@default/httpdns/sandbox/index.js new file mode 100644 index 0000000..0fb9b6f --- /dev/null +++ b/EdgeUser/web/views/@default/httpdns/sandbox/index.js @@ -0,0 +1,160 @@ +Tea.context(function () { + this.newRequest = function () { + return { + appId: "", + clusterId: "", + domain: "", + clientIp: "", + qtype: "A" + } + } + + this.request = this.newRequest() + + this.response = { + hasResult: false, + code: -1, + message: "", + data: null, + requestId: "", + resultRows: [] + } + + this.isRequesting = false + this.currentDomains = [] + this.currentClusters = [] + + if (typeof this.apps === "undefined" || this.apps == null) { + this.apps = [] + } + if (typeof this.clusters === "undefined" || this.clusters == null) { + this.clusters = [] + } + + this.onAppChanged = function () { + let selectedApp = null + for (let i = 0; i < this.apps.length; i++) { + if (this.apps[i].appId === this.request.appId) { + selectedApp = this.apps[i] + break + } + } + + if (selectedApp == null) { + this.currentDomains = [] + this.currentClusters = [] + this.request.domain = "" + this.request.clusterId = "" + return + } + + this.currentDomains = Array.isArray(selectedApp.domains) ? selectedApp.domains : [] + + if (this.currentDomains.length > 0) { + if (this.currentDomains.indexOf(this.request.domain) < 0) { + this.request.domain = this.currentDomains[0] + } + } else { + this.request.domain = "" + } + + let appClusterIds = Array.isArray(selectedApp.clusterIds) ? selectedApp.clusterIds.map(Number) : [] + + let allowed = [] + for (let i = 0; i < this.clusters.length; i++) { + let cluster = this.clusters[i] + let clusterId = Number(cluster.id) + if (clusterId <= 0) { + continue + } + if (appClusterIds.indexOf(clusterId) >= 0) { + allowed.push(cluster) + } + } + this.currentClusters = allowed + + if (allowed.length > 0) { + if (!allowed.some((c) => String(c.id) === String(this.request.clusterId))) { + this.request.clusterId = String(allowed[0].id) + } + } else { + this.request.clusterId = "" + } + } + + this.normalizeResultRows = function (data) { + if (typeof data === "undefined" || data == null) { + return [] + } + + if (Array.isArray(data.records) && data.records.length > 0) { + return data.records + } + + let rows = [] + let ips = Array.isArray(data.ips) ? data.ips : [] + let domain = this.request.domain + let qtype = this.request.qtype + let ttl = data.ttl || 0 + let region = data.client_region || "-" + let line = data.line_name || "-" + + ips.forEach(function (ip) { + rows.push({ + domain: domain, + type: qtype, + ip: ip, + ttl: ttl, + region: region, + line: line + }) + }) + + return rows + } + + this.sendTestRequest = function () { + if (this.request.appId.length === 0) { + teaweb.warn("请选择目标应用") + return + } + if (this.request.clusterId.length === 0) { + teaweb.warn("当前应用未绑定可用集群，请先在应用设置中配置所属集群") + return + } + if (this.request.domain.length === 0) { + teaweb.warn("请选择要解析的域名") + return + } + + this.isRequesting = true + this.response.hasResult = false + + let payload = Object.assign({}, this.request) + + this.$post("/httpdns/sandbox/test") + .params(payload) + .success(function (resp) { + this.response = resp.data.result + this.response.hasResult = true + this.response.resultRows = this.normalizeResultRows(this.response.data) + }) + .done(function () { + this.isRequesting = false + }) + } + + this.resetForm = function () { + this.request = this.newRequest() + this.currentDomains = [] + this.currentClusters = [] + this.response = { + hasResult: false, + code: -1, + message: "", + data: null, + requestId: "", + resultRows: [] + } + } +}) diff --git a/HttpDNSSDK/.gitignore b/HttpDNSSDK/.gitignore new file mode 100644 index 0000000..115313d --- /dev/null +++ b/HttpDNSSDK/.gitignore @@ -0,0 +1,130 @@ +# ========================================== +# HttpDNSSDK Unified .gitignore +# ========================================== + +# OS generated files +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +Icon? +ehthumbs.db +Thumbs.db +*.swp + +# IDEs and Editors +.idea/ +.vscode/ +.kiro/ +*.iml +*.ipr +*.iws +.classpath +.project +.settings/ +.cursor/ +.claude/ +.AGENTS.md + +# General Build & Gradle +build/ +Build/ +.gradle/ +target/ +gen/ +out/ +bin/ +/gradlew +/gradlew.bat + +# Android +*.apk +*.aab +*.ap_ +*.dex +*.class +captures/ +.externalNativeBuild/ +.cxx/ +local.properties +nohup.out +*.hprof +google-services.json +sdk/android/app/libs/new-android-httpdns-*.aar + +# Keys and Keystores +*.jks +*.keystore +key.properties + +# iOS / Xcode +xcuserdata +*.xccheckout +*.xcworkspace +Products/ +xcodebuild.log +sdk/ios/src/Documentation/* +sdk/ios/src/docs/docset/* +sdk/ios/src/docs/docset-installed.txt +sdk/ios/src/aws-ios-sdk-*.zip +sdk/ios/tmpFileRunSonarSh + +# CocoaPods +Pods/ +Podfile.lock + +# Flutter +.dart_tool/ +.packages +.symlinks/ +.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +Runner/GeneratedPluginRegistrant.* +GeneratedPluginRegistrant.java + +# Patched code / Sonar +*.bak +.sonar/ +infer-out/ +compile_commands.json +oclint.xml +sonar-reports/ + +# Stuff that can't be committed +credentials.json +Documentation +Scripts/build.sh +Scripts/gcovr +Scripts/jenkins.py +Scripts/ocunit2junit + +# specific files +sdk/ios/NewHttpDNSTests/Network/server.pem +ServiceDefinitions.json +profile + +# Flutter Example iOS Exceptions +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ diff --git a/HttpDNSSDK/docs/Flutter SDK集成文档.md b/HttpDNSSDK/docs/Flutter SDK集成文档.md new file mode 100644 index 0000000..0ede62c --- /dev/null +++ b/HttpDNSSDK/docs/Flutter SDK集成文档.md @@ -0,0 +1,133 @@ +# Flutter SDK 集成文档（Edge HTTPDNS） + +## 1. 版本与依赖 + +- SDK 插件：`HttpDNSSDK/sdk/flutter/new_httpdns` +- 环境要求：Flutter 2.15+ / Dart 2.15+ + +在 `pubspec.yaml` 中引用本地插件： + +```yaml +dependencies: + new_httpdns: + path: path/to/sdk/flutter/new_httpdns +``` + +执行 `flutter pub get` 完成安装。 + +## 2. SNI 行为说明（关键） + +1. **/resolve 请求链路**（SDK -> 你的 HTTPDNS 服务域名） +- 走标准 HTTPS，默认携带 SNI（用于路由到边缘控制节点）。 + +2. **业务请求链路**（拿到 CDN IP 后发起业务 HTTPS） +- **IP 直连 + No-SNI**：使用 `TrustAPPHttpdnsHttpAdapter` 进行请求。 +- 逻辑：解析域名 -> 拿到 IP 列表 -> `uri.replace(host: ip)` -> `req.headers.host = uri.host` -> **清空 SNI**。 +- 仅支持 HTTPS URL。 + +## 3. 初始化 SDK（推荐用 TrustAPP 封装） + +### Dart + +```dart +import 'package:new_httpdns/new_httpdns.dart'; + +bool ok = await TrustAPPHttpdns.init( + appId: "your-app-id", + primaryServiceHost: "httpdns.example.com", + backupServiceHost: "httpdns-backup.example.com", + servicePort: 443, + secretKey: "your-sign-secret" // 可选，开启签名校验需传入 +); + +if (ok) { + print("Edge HTTPDNS 初始化成功"); +} +``` + +## 4. 解析域名获取 CDN IP + +### Dart + +```dart +// V1 风格解析接口 +Map result = await TrustAPPHttpdns.resolveHost( + "api.example.com", + qtype: 'A', // 可选 'A' 或 'AAAA' + cip: '1.2.3.4' // 可选，模拟客户端 IP +); + +List ipv4s = result['ipv4']; +int ttl = result['ttl']; +``` + +## 5. 业务请求接入方式 + +使用 `TrustAPPHttpdnsHttpAdapter` 实现“SNI 隐匿”业务请求。 + +### Dart + +```dart +final adapter = TrustAPPHttpdns.createHttpAdapter( + options: const TrustAPPHttpdnsAdapterOptions( + connectTimeoutMs: 3000, + readTimeoutMs: 5000, + ipType: 'auto', // auto/ipv4/ipv6 + ) +); + +try { + final res = await adapter.request( + Uri.parse("https://api.example.com/path?x=1"), + method: 'GET', + headers: {'Custom-Header': 'Value'}, + body: null + ); + + print("Status Code: ${res.statusCode}"); + print("Body Length: ${res.body.length}"); + print("Used IP: ${res.usedIp}"); +} catch (e) { + print("请求失败: $e"); +} +``` + +## 6. 其他常用接口 + +```dart +// 1. 设置预解析域名 +await TrustAPPHttpdns.setPreResolveHosts(["api.example.com", "img.example.com"]); + +// 2. 只有开启缓存时可用 +Map> cacheRes = await TrustAPPHttpdns.resolveHostSyncNonBlocking("api.example.com"); + +// 3. 开启持久化缓存（重启 App 后任然可用） +await TrustAPPHttpdns.setPersistentCacheIPEnabled(true); + +// 4. 控制台日志（建议仅调试开启） +await TrustAPPHttpdns.setLogEnabled(true); +``` + +## 7. 验证建议 + +1. **验证 /resolve** +- 观察控制台日志或抓包工具，解析请求应指向 `https://:/resolve...`。 + +2. **验证业务请求** +- 如果使用 `TrustAPPHttpdnsHttpAdapter`，观察抓包： + - TCP 连接 IP 为 CDN 私有/边缘 IP。 + - HTTP `Host` 为原始域名。 + - TLS ClientHello 中 **无 SNI** 扩展。 + +## 8. 平台配置事项 + +- **Android**: 参照 Android SDK 文档配置混淆。 +- **iOS**: 如果是手动集成 Flutter 插件，请确保 iOS 模块已包含依赖的静态库，并设置 `Allow Arbitrary Loads` (如果启用 HTTP)。 + +## 9. 常见问题 + +1. **Flutter 端报错：NO_IP_AVAILABLE** +- SDK 尚未解析出有效结果，请确认域名是否已在控制台添加并配置规则。 + +2. **请求报错：TLS_EMPTY_SNI_FAILED** +- 仅支持 HTTPS 网站。如果所有 IP 尝试均失败，请检查网络权限及服务端防火墙。 diff --git a/HttpDNSSDK/docs/HTTPDNS SDK 集成文档（Android）.md b/HttpDNSSDK/docs/HTTPDNS SDK 集成文档（Android）.md new file mode 100644 index 0000000..fd75e5b --- /dev/null +++ b/HttpDNSSDK/docs/HTTPDNS SDK 集成文档（Android）.md @@ -0,0 +1,161 @@ +# HTTPDNS SDK 集成文档（Android） + +## 1. 版本与依赖 + +- SDK 模块：`HttpDNSSDK/sdk/android/httpdns-sdk` +- `minSdkVersion`：19 +- `targetSdkVersion`：33 +- `compileSdk`：33 + +将发布包中的 `jar/aar` 放到应用模块 `libs/`，在 `app/build.gradle` 中添加： + +```gradle +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) + implementation 'androidx.appcompat:appcompat:1.6.1' +} +``` + +## 2. SNI 行为说明（关键） + +当前 SDK 行为与代码一致： + +1. `/resolve` 请求链路（SDK -> 你的 HTTPDNS 服务域名） +- 走域名 HTTPS +- 默认 TLS 行为（会带 SNI） + +2. 业务请求链路（拿到 CDN IP 后发起业务 HTTPS） +- 使用 `HttpDnsHttpAdapter`：按 IP 建连，`Host` 保留原域名，并清空 SNI（No-SNI） + +## 3. 初始化 SDK（推荐用 V1 客户端） + +### Kotlin + +```kotlin +import com.newsdk.sdk.android.httpdns.HttpDnsV1Client +import com.newsdk.sdk.android.httpdns.HttpDnsService + +val service: HttpDnsService = HttpDnsV1Client.init( + applicationContext, + "your-app-id", + "https://httpdns.example.com:8445", // serviceUrl，支持填写协议+端口 + "your-sign-secret" // 可传 "" +) +``` + +### Java + +```java +import com.newsdk.sdk.android.httpdns.HttpDnsService; +import com.newsdk.sdk.android.httpdns.HttpDnsV1Client; + +HttpDnsService service = HttpDnsV1Client.init( + getApplicationContext(), + "your-app-id", + "https://httpdns.example.com:8445", // serviceUrl + "your-sign-secret" // 可传 "" +); +``` + +## 4. 解析域名获取 CDN IP + +### Kotlin + +```kotlin +import com.newsdk.sdk.android.httpdns.HTTPDNSResult + +val result: HTTPDNSResult = HttpDnsV1Client.resolveHost( + service = service, + host = "api.example.com", + qtype = "A", // "A" 或 "AAAA" + cip = null // 可选，客户端 IP 透传 +) + +val ips = result.ips ?: emptyArray() +``` + +### Java + +```java +import com.newsdk.sdk.android.httpdns.HTTPDNSResult; + +HTTPDNSResult result = HttpDnsV1Client.resolveHost( + service, + "api.example.com", + "A", + null +); + +String[] ips = result.getIps(); +``` + +## 5. 业务请求接入方式 + +### 使用 `HttpDnsHttpAdapter`（IP 直连 + No-SNI） + +业务请求侧做“隐匿 SNI”。该适配器仅支持 HTTPS URL。 + +```kotlin +import com.newsdk.sdk.android.httpdns.HttpDnsV1Client +import com.newsdk.sdk.android.httpdns.network.HttpDnsAdapterOptions +import com.newsdk.sdk.android.httpdns.network.HttpDnsAdapterRequest + +val adapter = HttpDnsV1Client.buildHttpClientAdapter( + service, + HttpDnsAdapterOptions.Builder() + .setConnectTimeoutMillis(3000) + .setReadTimeoutMillis(5000) + .setRequestIpType(com.newsdk.sdk.android.httpdns.RequestIpType.auto) + .build() +) + +val req = HttpDnsAdapterRequest( + "GET", + "https://api.example.com/path?x=1" +) + +val resp = adapter.execute(req) +val code = resp.statusCode +val bodyBytes = resp.body +val usedIp = resp.usedIp +``` + +## 6. 预解析与常用接口 + +```kotlin +service.setPreResolveHosts(listOf("api.example.com", "img.example.com")) + +val r1 = service.getHttpDnsResultForHostSync("api.example.com", com.newsdk.sdk.android.httpdns.RequestIpType.auto) +val r2 = service.getHttpDnsResultForHostSyncNonBlocking("api.example.com", com.newsdk.sdk.android.httpdns.RequestIpType.auto) +``` + +- `Sync`：允许阻塞等待刷新结果（上限受 timeout 等配置影响） +- `NonBlocking`：快速返回当前可用缓存/结果，不阻塞等待 + +## 7. 验证建议 + +1. 验证 `/resolve` +- 抓包看目标应为 `https:///resolve...`（即初始化时传入的 URL） + +2. 验证业务请求（若使用 `HttpDnsHttpAdapter`） +- 目标地址应是 CDN IP +- HTTP `Host` 应为原域名 +- TLS ClientHello 不应携带 SNI（No-SNI） + +## 8. 混淆配置 + +```proguard +-keep class com.newsdk.sdk.android.** { *; } +``` + +## 9. 常见问题 + +1. HTTPDNS 没生效 +- 检查是否真正使用了 SDK 返回 IP（或用了 `HttpDnsHttpAdapter`） +- 检查失败回退逻辑是否总是直接走了系统 DNS + +2. 使用 `HttpDnsHttpAdapter` 仍失败 +- 只支持 HTTPS URL + +3. 线上不要开启不安全证书 +- `HttpDnsAdapterOptions.Builder#setAllowInsecureCertificatesForDebugOnly(true)` 仅限调试环境 diff --git a/HttpDNSSDK/docs/iOS SDK集成文档.md b/HttpDNSSDK/docs/iOS SDK集成文档.md new file mode 100644 index 0000000..e1797df --- /dev/null +++ b/HttpDNSSDK/docs/iOS SDK集成文档.md @@ -0,0 +1,124 @@ +# iOS SDK 集成文档（Edge HTTPDNS） + +## 1. 版本与依赖 + +- SDK 模块：`HttpDNSSDK/sdk/ios/NewHttpDNS` +- 支持系统：iOS 11.0+ +- 集成方式： + - **CocoaPods**：在 `Podfile` 中添加 `pod 'NewHTTPDNS', :path => 'path/to/sdk/ios'` + - **手动集成**：将 `NewHttpDNS` 源码或编译后的静态库导入项目，并添加依赖的系统库（Foundation, CFNetwork, SystemConfiguration）。 + +## 2. SNI 行为说明（关键） + +1. **/resolve 请求链路**（SDK -> 你的 HTTPDNS 服务域名） +- 使用标准 HTTPS 请求。 +- 默认携带 SNI（用于通过 WAF/CDN 识别服务域名）。 + +2. **业务请求链路**（拿到 CDN IP 后通过 `HttpdnsEdgeService` 发起业务 HTTPS） +- **IP 直连 + No-SNI**：SDK 会建立与 IP 的连接，并将 `NSURLRequest` 的 `URL` 替换为 IP，同时保留 `Host` 头部为原域名。 +- **证书校验**：由于清空了 SNI，常规 SNI 校验会跳过，需确保后端节点支持 Host 匹配证书。 + +## 3. 初始化 SDK（推荐用 EdgeService 封装） + +### Objective-C + +```objective-c +#import + +HttpdnsEdgeService *service = [[HttpdnsEdgeService alloc] initWithAppId:@"your-app-id" + primaryServiceHost:@"httpdns.example.com" + backupServiceHost:@"httpdns-backup.example.com" + servicePort:443 + signSecret:@"your-sign-secret"]; +``` + +### Swift + +```swift +import NewHttpDNS + +let service = HttpdnsEdgeService(appId: "your-app-id", + primaryServiceHost: "httpdns.example.com", + backupServiceHost: "httpdns-backup.example.com", + servicePort: 443, + signSecret: "your-sign-secret") +``` + +## 4. 解析域名获取 CDN IP + +### Objective-C + +```objective-c +[service resolveHost:@"api.example.com" + queryType:@"A" + completion:^(HttpdnsEdgeResolveResult * _Nullable result, NSError * _Nullable error) { + if (result) { + NSLog(@"IPv4s: %@", result.ipv4s); + NSLog(@"TTL: %ld", (long)result.ttl); + } +}]; +``` + +### Swift + +```swift +service.resolveHost("api.example.com", queryType: "A") { result, error in + if let ips = result?.ipv4s { + print("Resolved IPs: \(ips)") + } +} +``` + +## 5. 业务请求接入方式 + +使用 `HttpdnsEdgeService` 提供的 `requestURL` 方法，自动处理 IP 直连与 SNI 隐藏。 + +### Objective-C + +```objective-c +NSURL *url = [NSURL URLWithString:@"https://api.example.com/path?x=1"]; +[service requestURL:url + method:@"GET" + headers:@{@"Custom-Header": @"Value"} + body:nil + completion:^(NSData * _Nullable data, NSHTTPURLResponse * _Nullable response, NSError * _Nullable error) { + if (!error) { + NSLog(@"Status Code: %ld", (long)response.statusCode); + // 处理 data + } +}]; +``` + +### Swift + +```swift +let url = URL(string: "https://api.example.com/path?x=1")! +service.requestURL(url, method: "GET", headers: ["Custom-Header": "Value"], body: nil) { data, response, error in + if let resp = response { + print("Status Code: \(resp.statusCode)") + } +} +``` + +## 6. 验证建议 + +1. **验证 /resolve** +- 观察网络请求，应指向 `https://httpdns.example.com/resolve?appId=...&dn=...`。 +- 确认返回 JSON 包含 `code: "SUCCESS"`。 + +2. **验证业务请求** +- 确认请求握手阶段不携带 SNI 扩展。 +- 确认请求的 TCP 连接目标为解析出的私有 IP/CDN IP。 + +## 7. 常见问题 + +1. **编译报错：找不到头文件** +- 请确认 `Header Search Paths` 包含 SDK 路径。 +- 如果使用 CocoaPods，请确保执行 `pod install` 并打开 `.xcworkspace`。 + +2. **请求返回 403 (Sign Invalid)** +- 确认控制台已开启“签名校验”，且本地传入的 `signSecret` 与控制台一致。 +- 确认系统时间正常（差值超过 30s 可能导致签名失效）。 + +3. **HTTPS 证书验证失败** +- 检查 `HttpdnsEdgeService` 是否能正确匹配证书，通常是在 No-SNI 模式下通过 `Host` 字段匹配。 diff --git a/HttpDNSSDK/sdk/SOURCE_LOCK.md b/HttpDNSSDK/sdk/SOURCE_LOCK.md new file mode 100644 index 0000000..86bf55c --- /dev/null +++ b/HttpDNSSDK/sdk/SOURCE_LOCK.md @@ -0,0 +1,25 @@ +# HttpDNSSDK Source Lock + +This directory vendors upstream SDK source snapshots for HTTPDNS integration. + +Fetched at (UTC): `2026-02-18T09:31:28Z` + +## Android SDK + +- Upstream repository: `https://github.com/TrustAPP/Trustcloud-httpdns-android-sdk` +- Locked commit: `eeb17d677161ec94b5f41a9d6437501ddc24e6d2` +- Local path: `HttpDNSSDK/sdk/android` + +## iOS SDK + +- Upstream repository: `https://github.com/TrustAPP/Trustcloud-httpdns-ios-sdk` +- Locked commit: `19f5bacd1d1399a00ba654bb72ababb3e91d0a3a` +- Local path: `HttpDNSSDK/sdk/ios` + +## Flutter Plugin SDK + +- Upstream repository: `https://github.com/TrustAPP/Trust-flutter-demo` +- Locked commit: `588b807e5480d8592c57d439a6b1c52e8c313569` +- Imported subtree: `httpdns_flutter_demo/packages/new_httpdns` +- Local path: `HttpDNSSDK/sdk/flutter/new_httpdns` + diff --git a/HttpDNSSDK/sdk/THIRD_PARTY_NOTICES.md b/HttpDNSSDK/sdk/THIRD_PARTY_NOTICES.md new file mode 100644 index 0000000..a3d521a --- /dev/null +++ b/HttpDNSSDK/sdk/THIRD_PARTY_NOTICES.md @@ -0,0 +1,31 @@ +# Third-Party Notices for HttpDNSSDK SDK Sources + +This directory includes third-party source snapshots imported from Trust Cloud open-source repositories. + +## 1) Android SDK (`HttpDNSSDK/sdk/android`) + +- Source: `https://github.com/TrustAPP/Trustcloud-httpdns-android-sdk` +- Commit: `eeb17d677161ec94b5f41a9d6437501ddc24e6d2` +- License file in imported source: + - `HttpDNSSDK/sdk/android/LICENSE` +- Observed license: MIT License + +## 2) Flutter plugin (`HttpDNSSDK/sdk/flutter/new_httpdns`) + +- Source: `https://github.com/TrustAPP/Trust-flutter-demo` +- Commit: `588b807e5480d8592c57d439a6b1c52e8c313569` +- Imported subtree: `httpdns_flutter_demo/packages/new_httpdns` +- License file in imported source: + - `HttpDNSSDK/sdk/flutter/new_httpdns/LICENSE` +- Observed license: MIT License + +## 3) iOS SDK (`HttpDNSSDK/sdk/ios`) + +- Source: `https://github.com/TrustAPP/Trustcloud-httpdns-ios-sdk` +- Commit: `19f5bacd1d1399a00ba654bb72ababb3e91d0a3a` +- Current status: + - No standalone top-level `LICENSE` file was found in the upstream repository snapshot imported here. + - Some source headers reference Apache 2.0 notices, but repository-level license declaration is not explicit. +- Action required before merging to protected branch: + - Complete legal/license confirmation for iOS source usage. + diff --git a/HttpDNSSDK/sdk/android/.github/ISSUE_TEMPLATE/bug_report.md b/HttpDNSSDK/sdk/android/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..466bf4b --- /dev/null +++ b/HttpDNSSDK/sdk/android/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Logs** +If applicable, add logcat logs to help explain your problem. + +**Environment (please complete the following information):** + - Device: [e.g. Pixel 3] + - OS: [e.g. Android 10] + - SDK Version [e.g. 2.0.2] + +**Additional context** +Add any other context about the problem here. diff --git a/HttpDNSSDK/sdk/android/LICENSE b/HttpDNSSDK/sdk/android/LICENSE new file mode 100644 index 0000000..c5a4392 --- /dev/null +++ b/HttpDNSSDK/sdk/android/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Alibaba Cloud + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/HttpDNSSDK/sdk/android/README.md b/HttpDNSSDK/sdk/android/README.md new file mode 100644 index 0000000..1e072dc --- /dev/null +++ b/HttpDNSSDK/sdk/android/README.md @@ -0,0 +1,74 @@ +# HTTPDNS Android SDK (SNI Hidden v1.0.0) + +## 1. Init + +```java +import com.newsdk.sdk.android.httpdns.HttpDns; +import com.newsdk.sdk.android.httpdns.HttpDnsService; +import com.newsdk.sdk.android.httpdns.InitConfig; + +String appId = "app1f1ndpo9"; + +new InitConfig.Builder() + .setContext(context) + .setServiceUrl("https://httpdns.example.com:8445") + .setSecretKey("your-sign-secret") // optional if sign is enabled + .buildFor(appId); + +HttpDnsService httpDnsService = HttpDns.getService(appId); +``` + +## 2. Resolve + +```java +HTTPDNSResult result = httpDnsService.getHttpDnsResultForHostSyncNonBlocking( + "api.business.com", + RequestIpType.auto, + null, + null +); +``` + +## 3. Official HTTP Adapter (IP + Empty-SNI + Host) + +```java +import com.newsdk.sdk.android.httpdns.network.HttpDnsAdapterOptions; +import com.newsdk.sdk.android.httpdns.network.HttpDnsAdapterRequest; +import com.newsdk.sdk.android.httpdns.network.HttpDnsAdapterResponse; +import com.newsdk.sdk.android.httpdns.network.HttpDnsHttpAdapter; + +HttpDnsHttpAdapter adapter = HttpDns.buildHttpClientAdapter( + httpDnsService, + new HttpDnsAdapterOptions.Builder() + .setConnectTimeoutMillis(3000) + .setReadTimeoutMillis(5000) + .setRequestIpType(RequestIpType.auto) + .setAllowInsecureCertificatesForDebugOnly(false) + .build() +); + +HttpDnsAdapterResponse response = adapter.execute( + new HttpDnsAdapterRequest("GET", "https://api.business.com/v1/ping") +); +``` + +Behavior is fixed: +- Resolve by `/resolve`. +- Connect to resolved IP over HTTPS. +- Keep `Host` header as business domain. +- No fallback to domain direct request. + +## 4. Public Errors + +- `NO_IP_AVAILABLE` +- `TLS_EMPTY_SNI_FAILED` +- `HOST_ROUTE_REJECTED` +- `RESOLVE_SIGN_INVALID` + +## 5. Removed Public Params + +Do not use legacy public parameters: +- `accountId` +- `serviceDomain` +- `endpoint` +- `aesSecretKey` diff --git a/HttpDNSSDK/sdk/android/app/build.gradle b/HttpDNSSDK/sdk/android/app/build.gradle new file mode 100644 index 0000000..215b031 --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/build.gradle @@ -0,0 +1,85 @@ +plugins { + id 'com.android.application' +} + +android { + namespace 'com.newsdk.ams.httpdns.demo' + compileSdkVersion 34 + buildToolsVersion "30.0.2" + defaultConfig { + applicationId "com.newsdk.ams.httpdns.demo2" + minSdkVersion 19 + targetSdkVersion 34 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + buildConfigField "String", "SERVICE_URL", "\"\"" + } + + + buildTypes { + debug { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + release { + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + forTest { + // 娉ㄦ剰杩欓噷鐨勯厤缃紝骞朵笉鏄渶瑕佺紪璇慺orTest鐨刟pp锛岃€屾槸閬垮厤httpdns-sdk鍦ˋndroidStudio鏀逛负end2end杩愯娴嬭瘯鏃?BuildVariants鎶ラ敊 + initWith release + debuggable true + } + } + + variantFilter { variant -> + def names = variant.flavors*.name + def type = variant.buildType.name + // To check for a certain build type, use variant.buildType.name == "" + if ((names.contains("normal") && type.contains("forTest")) + || (names.contains("intl") && type.contains("forTest")) + || (names.contains("end2end") && type.contains("release")) + || (names.contains("end2end") && type.contains("debug")) + ) { + // Gradle ignores any variants that satisfy the conditions above. + setIgnore(true) + } + } + + testOptions { + unitTests { + all { + jvmArgs '-noverify' + systemProperty 'robolectric.logging.enable', true + } + } + } + + flavorDimensions "version" + + productFlavors { + normal { + + } + + intl { + + } + + end2end { + // 娉ㄦ剰杩欓噷鐨勯厤缃紝骞朵笉鏄渶瑕佺紪璇慹nd2end鐨刟pp锛岃€屾槸閬垮厤httpdns-sdk鍦ˋndroidStudio鏀逛负end2end杩愯娴嬭瘯鏃?BuildVariants鎶ラ敊 + } + } +} + +configurations.all { + resolutionStrategy.cacheChangingModulesFor 0, 'seconds' +} + +dependencies { + + implementation project(':httpdns-sdk') + + implementation("com.squareup.okhttp3:okhttp:3.9.0") +} diff --git a/HttpDNSSDK/sdk/android/app/proguard-rules.pro b/HttpDNSSDK/sdk/android/app/proguard-rules.pro new file mode 100644 index 0000000..b79bbd9 --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/proguard-rules.pro @@ -0,0 +1,30 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/liyazhou/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile +-dontwarn okhttp3.** +-dontwarn okio.** +-dontwarn com.newsdk.sdk.android.httpdns.test.** +-dontwarn com.newsdk.sdk.android.httpdns.net.HttpDnsNetworkDetector +-keep class com.aliyun.ams.ipdetector.Inet64Util{*;} diff --git a/HttpDNSSDK/sdk/android/app/src/main/AndroidManifest.xml b/HttpDNSSDK/sdk/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..d8f2a0c --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/HttpDnsActivity.java b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/HttpDnsActivity.java new file mode 100644 index 0000000..ba55f63 --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/HttpDnsActivity.java @@ -0,0 +1,160 @@ +package com.newsdk.ams.httpdns.demo; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.AutoCompleteTextView; + +import com.newsdk.sdk.android.httpdns.RequestIpType; +import com.newsdk.ams.httpdns.demo.base.BaseActivity; +import com.newsdk.ams.httpdns.demo.http.HttpUrlConnectionRequest; +import com.newsdk.ams.httpdns.demo.okhttp.OkHttpRequest; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +public class HttpDnsActivity extends BaseActivity { + + private static final String SCHEMA_HTTPS = "https://"; + private static final String SCHEMA_HTTP = "http://"; + + private static final String[] HOSTS = new String[] { + "www.taobao.com", + "demo.cloudxdr.com" + }; + + private String schema = SCHEMA_HTTPS; + private String host = HOSTS[0]; + private RequestIpType requestIpType = RequestIpType.v4; + + private HttpUrlConnectionRequest httpUrlConnectionRequest; + private OkHttpRequest okHttpRequest; + private NetworkRequest networkRequest; + + private final ExecutorService worker = Executors.newSingleThreadExecutor(); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + httpUrlConnectionRequest = new HttpUrlConnectionRequest(this); + okHttpRequest = new OkHttpRequest(this); + networkRequest = httpUrlConnectionRequest; + + addFourButton( + "Switch instance", + v -> { + MyApp.getInstance().changeHolder(); + sendLog("Instance switched."); + }, + "Show config", + v -> sendLog(MyApp.getInstance().getCurrentHolder().getCurrentConfig()), + "Clear holder cache", + v -> { + MyApp.getInstance().getCurrentHolder().cleanSp(); + sendLog("Holder cache cleared."); + }, + "Clear log", + v -> cleanLog() + ); + + addAutoCompleteTextViewButton(HOSTS, "Host", "Set host", view -> { + AutoCompleteTextView actv = (AutoCompleteTextView) view; + host = actv.getEditableText().toString(); + sendLog("Host set to: " + host); + }); + + addTwoButton( + "Use HTTPS", + v -> { + schema = SCHEMA_HTTPS; + sendLog("Schema set to HTTPS."); + }, + "Use HTTP", + v -> { + schema = SCHEMA_HTTP; + sendLog("Schema set to HTTP."); + } + ); + + addFourButton( + "IP type v4", + v -> { + requestIpType = RequestIpType.v4; + sendLog("Request IP type: v4"); + }, + "IP type v6", + v -> { + requestIpType = RequestIpType.v6; + sendLog("Request IP type: v6"); + }, + "IP type both", + v -> { + requestIpType = RequestIpType.both; + sendLog("Request IP type: both"); + }, + "IP type auto", + v -> { + requestIpType = RequestIpType.auto; + sendLog("Request IP type: auto"); + } + ); + + addTwoButton( + "HttpUrlConnection", + v -> { + networkRequest = httpUrlConnectionRequest; + sendLog("Network stack: HttpUrlConnection"); + }, + "OkHttp", + v -> { + networkRequest = okHttpRequest; + sendLog("Network stack: OkHttp"); + } + ); + + addTwoButton( + "Resolve sync", + v -> worker.execute(() -> executeResolve(false)), + "Resolve async", + v -> worker.execute(() -> executeResolve(true)) + ); + + addTwoButton( + "Open SDNS page", + v -> startActivity(new Intent(HttpDnsActivity.this, SDNSActivity.class)), + "Open WebView page", + new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivity(new Intent(HttpDnsActivity.this, WebViewActivity.class)); + } + } + ); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + worker.shutdownNow(); + } + + private void executeResolve(boolean async) { + String url = schema + host; + sendLog("Request URL: " + url); + sendLog("Request IP type: " + requestIpType.name()); + sendLog("Async mode: " + async); + sendLog("Stack: " + (networkRequest == httpUrlConnectionRequest ? "HttpUrlConnection" : "OkHttp")); + try { + networkRequest.updateHttpDnsConfig(async, requestIpType); + String response = networkRequest.httpGet(url); + if (response != null && response.length() > 120) { + response = response.substring(0, 120) + "..."; + } + sendLog("Response: " + response); + } catch (Exception e) { + sendLog("Request failed: " + e.getClass().getSimpleName() + " " + e.getMessage()); + } + } +} + diff --git a/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/HttpDnsHolder.java b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/HttpDnsHolder.java new file mode 100644 index 0000000..35f6ac0 --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/HttpDnsHolder.java @@ -0,0 +1,353 @@ +package com.newsdk.ams.httpdns.demo; + +import android.content.Context; +import android.content.SharedPreferences; + +import com.newsdk.sdk.android.httpdns.CacheTtlChanger; +import com.newsdk.sdk.android.httpdns.HttpDns; +import com.newsdk.sdk.android.httpdns.HttpDnsService; +import com.newsdk.sdk.android.httpdns.InitConfig; +import com.newsdk.sdk.android.httpdns.RequestIpType; +import com.newsdk.sdk.android.httpdns.ranking.IPRankingBean; +import com.newsdk.ams.httpdns.demo.utils.SpUtil; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + +/** + * 淇濆瓨Httpdns 鍙?鐩稿叧閰嶇疆锛? + * 鏂逛究淇敼 + */ +public class HttpDnsHolder { + + public static final String SP_PREFIX = "httpdns_config_"; + + public static String getSpName(String accountId) { + return SP_PREFIX + accountId; + } + + public static final String KEY_EXPIRED_IP = "enableExpiredIp"; + public static final String KEY_CACHE_IP = "enableCacheIp"; + public static final String KEY_TIMEOUT = "timeout"; + public static final String KEY_HTTPS = "enableHttps"; + public static final String KEY_IP_RANKING_ITEMS = "ipProbeItems"; + public static final String KEY_REGION = "region"; + public static final String KEY_TTL_CHANGER = "cacheTtlChanger"; + public static final String KEY_HOST_NOT_CHANGE = "hostListWithFixedIp"; + + private HttpDnsService service; + private String accountId; + private String secret; + private String serviceUrl; + private Context context; + + private boolean enableExpiredIp; + private boolean enableCacheIp; + private int timeout; + private boolean enableHttps; + private ArrayList ipRankingList = null; + private String region; + private ArrayList hostListWithFixedIp; + private HashMap ttlCache; + private final CacheTtlChanger cacheTtlChanger = new CacheTtlChanger() { + @Override + public int changeCacheTtl(String host, RequestIpType type, int ttl) { + if (ttlCache != null && ttlCache.get(host) != null) { + return ttlCache.get(host); + } + return ttl; + } + }; + + public HttpDnsHolder(String accountId) { + this.accountId = accountId; + } + + public HttpDnsHolder(String accountId, String secret) { + this.accountId = accountId; + this.secret = secret; + } + + public HttpDnsHolder(String accountId, String secret, String serviceUrl) { + this.accountId = accountId; + this.secret = secret; + this.serviceUrl = serviceUrl; + } + + /** + * 鍒濆鍖杊ttpdns鐨勯厤缃? + * + * @param context + */ + public void init(Context context) { + this.context = context.getApplicationContext(); + SpUtil.readSp(context, getSpName(accountId), new SpUtil.OnGetSp() { + @Override + public void onGetSp(SharedPreferences sp) { + enableExpiredIp = sp.getBoolean(KEY_EXPIRED_IP, true); + enableCacheIp = sp.getBoolean(KEY_CACHE_IP, false); + timeout = sp.getInt(KEY_TIMEOUT, 5 * 1000); + enableHttps = sp.getBoolean(KEY_HTTPS, false); + ipRankingList = convertToProbeList(sp.getString(KEY_IP_RANKING_ITEMS, null)); + region = sp.getString(KEY_REGION, null); + ttlCache = convertToCacheTtlData(sp.getString(KEY_TTL_CHANGER, null)); + hostListWithFixedIp = convertToStringList(sp.getString(KEY_HOST_NOT_CHANGE, null)); + } + }); + + // 鍒濆鍖杊ttpdns 鐨勯厤缃紝姝ゆ楠ら渶瑕佸湪绗竴娆¤幏鍙朒ttpDnsService瀹炰緥涔嬪墠 + InitConfig.Builder builder = new InitConfig.Builder() + .setEnableExpiredIp(enableExpiredIp) + .setEnableCacheIp(enableCacheIp) + .setTimeout(timeout) + .setIPRankingList(ipRankingList) + .configCacheTtlChanger(cacheTtlChanger) + .configHostWithFixedIp(hostListWithFixedIp) + .setEnableHttps(enableHttps) + .setRegion(region); + if (serviceUrl != null && !serviceUrl.trim().isEmpty()) { + builder.setServiceUrl(serviceUrl.trim()); + } + builder.buildFor(accountId); + + getService(); + } + + public HttpDnsService getService() { + if (service == null) { + if (secret != null) { + service = HttpDns.getService(context, accountId, secret); + } else { + service = HttpDns.getService(context, accountId); + } + } + return service; + } + + public String getAccountId() { + return accountId; + } + + public void setEnableExpiredIp(final boolean enableExpiredIp) { + this.enableExpiredIp = enableExpiredIp; + // 娉ㄦ剰锛氭閰嶇疆闇€瑕侀噸鍚簲鐢ㄧ敓鏁堬紝鍥犱负鐜板湪閫氳繃InitConfig璁剧疆 + SpUtil.writeSp(context, getSpName(accountId), new SpUtil.OnGetSpEditor() { + @Override + public void onGetSpEditor(SharedPreferences.Editor editor) { + editor.putBoolean(KEY_EXPIRED_IP, enableExpiredIp); + } + }); + } + + public void setEnableCacheIp(final boolean enableCacheIp) { + this.enableCacheIp = enableCacheIp; + // 娉ㄦ剰锛氭閰嶇疆闇€瑕侀噸鍚簲鐢ㄧ敓鏁堬紝鍥犱负鐜板湪閫氳繃InitConfig璁剧疆 + SpUtil.writeSp(context, getSpName(accountId), new SpUtil.OnGetSpEditor() { + @Override + public void onGetSpEditor(SharedPreferences.Editor editor) { + editor.putBoolean(KEY_CACHE_IP, enableCacheIp); + } + }); + } + + public void setTimeout(final int timeout) { + this.timeout = timeout; + // 娉ㄦ剰锛氭閰嶇疆闇€瑕侀噸鍚簲鐢ㄧ敓鏁堬紝鍥犱负鐜板湪閫氳繃InitConfig璁剧疆 + SpUtil.writeSp(context, getSpName(accountId), new SpUtil.OnGetSpEditor() { + @Override + public void onGetSpEditor(SharedPreferences.Editor editor) { + editor.putInt(KEY_TIMEOUT, timeout); + } + }); + } + + public void setEnableHttps(final boolean enableHttps) { + this.enableHttps = enableHttps; + // 娉ㄦ剰锛氭閰嶇疆闇€瑕侀噸鍚簲鐢ㄧ敓鏁堬紝鍥犱负鐜板湪閫氳繃InitConfig璁剧疆 + SpUtil.writeSp(context, getSpName(accountId), new SpUtil.OnGetSpEditor() { + @Override + public void onGetSpEditor(SharedPreferences.Editor editor) { + editor.putBoolean(KEY_HTTPS, enableHttps); + } + }); + } + + public void setRegion(final String region) { + this.region = region; + getService().setRegion(region); + SpUtil.writeSp(context, getSpName(accountId), new SpUtil.OnGetSpEditor() { + @Override + public void onGetSpEditor(SharedPreferences.Editor editor) { + editor.putString(KEY_REGION, region); + } + }); + } + + public void addHostWithFixedIp(String host) { + if (this.hostListWithFixedIp == null) { + this.hostListWithFixedIp = new ArrayList<>(); + } + this.hostListWithFixedIp.add(host); + // 閲嶅惎鐢熸晥 + SpUtil.writeSp(context, getSpName(accountId), new SpUtil.OnGetSpEditor() { + @Override + public void onGetSpEditor(SharedPreferences.Editor editor) { + editor.putString(KEY_HOST_NOT_CHANGE, convertHostList(hostListWithFixedIp)); + } + }); + } + + public void addIpProbeItem(IPRankingBean ipProbeItem) { + if (this.ipRankingList == null) { + this.ipRankingList = new ArrayList<>(); + } + this.ipRankingList.add(ipProbeItem); + // 娉ㄦ剰锛氭閰嶇疆闇€瑕侀噸鍚簲鐢ㄧ敓鏁堬紝鍥犱负鐜板湪閫氳繃InitConfig璁剧疆 + SpUtil.writeSp(context, getSpName(accountId), new SpUtil.OnGetSpEditor() { + @Override + public void onGetSpEditor(SharedPreferences.Editor editor) { + editor.putString(KEY_IP_RANKING_ITEMS, convertProbeList(ipRankingList)); + } + }); + } + + + public void setHostTtl(String host, int ttl) { + if (ttlCache == null) { + ttlCache = new HashMap<>(); + } + ttlCache.put(host, ttl); + SpUtil.writeSp(context, getSpName(accountId), new SpUtil.OnGetSpEditor() { + @Override + public void onGetSpEditor(SharedPreferences.Editor editor) { + editor.putString(KEY_TTL_CHANGER, convertTtlCache(ttlCache)); + } + }); + } + + public void cleanSp() { + SpUtil.writeSp(context, getSpName(accountId), new SpUtil.OnGetSpEditor() { + @Override + public void onGetSpEditor(SharedPreferences.Editor editor) { + editor.clear(); + } + }); + } + + public String getCurrentConfig() { + StringBuilder sb = new StringBuilder(); + sb.append("褰撳墠閰嶇疆 accountId : ").append(accountId).append("\n") + .append("鏄惁鍏佽杩囨湡IP : ").append(enableExpiredIp).append("\n") + .append("鏄惁寮€鍚湰鍦扮紦瀛?: ").append(enableCacheIp).append("\n") + .append("鏄惁寮€鍚疕TTPS : ").append(enableHttps).append("\n") + .append("褰撳墠region璁剧疆 : ").append(region).append("\n") + .append("褰撳墠瓒呮椂璁剧疆 : ").append(timeout).append("\n") + .append("褰撳墠鎺㈡祴閰嶇疆 : ").append(convertProbeList(ipRankingList)).append("\n") + .append("褰撳墠缂撳瓨閰嶇疆 : ").append(convertTtlCache(ttlCache)).append("\n") + .append("褰撳墠涓荤珯鍩熷悕閰嶇疆 : ").append(convertHostList(hostListWithFixedIp)).append("\n") + ; + return sb.toString(); + } + + + private static String convertHostList(List hostListWithFixedIp) { + if (hostListWithFixedIp == null) { + return null; + } + JSONArray array = new JSONArray(); + for (String host : hostListWithFixedIp) { + array.put(host); + } + return array.toString(); + } + + private static String convertTtlCache(HashMap ttlCache) { + if (ttlCache == null) { + return null; + } + JSONObject jsonObject = new JSONObject(); + for (String host : ttlCache.keySet()) { + try { + jsonObject.put(host, ttlCache.get(host)); + } catch (JSONException e) { + e.printStackTrace(); + } + } + return jsonObject.toString(); + } + + private static String convertProbeList(List ipProbeItems) { + if (ipProbeItems == null) { + return null; + } + JSONObject jsonObject = new JSONObject(); + for (IPRankingBean item : ipProbeItems) { + try { + jsonObject.put(item.getHostName(), item.getPort()); + } catch (JSONException e) { + e.printStackTrace(); + } + } + return jsonObject.toString(); + } + + private static ArrayList convertToProbeList(String json) { + if (json == null) { + return null; + } + try { + JSONObject jsonObject = new JSONObject(json); + ArrayList list = new ArrayList<>(); + for (Iterator it = jsonObject.keys(); it.hasNext(); ) { + String host = it.next(); + list.add(new IPRankingBean(host, jsonObject.getInt(host))); + } + return list; + } catch (JSONException e) { + e.printStackTrace(); + } + return null; + } + + private static HashMap convertToCacheTtlData(String json) { + if (json == null) { + return null; + } + try { + JSONObject jsonObject = new JSONObject(json); + HashMap map = new HashMap<>(); + for (Iterator it = jsonObject.keys(); it.hasNext(); ) { + String host = it.next(); + map.put(host, jsonObject.getInt(host)); + } + return map; + } catch (JSONException e) { + e.printStackTrace(); + } + + return null; + } + + private static ArrayList convertToStringList(String json) { + if (json != null) { + try { + JSONArray array = new JSONArray(json); + ArrayList list = new ArrayList<>(); + for (int i = 0; i < array.length(); i++) { + list.add(array.getString(i)); + } + return list; + } catch (JSONException e) { + e.printStackTrace(); + } + } + return null; + } +} + diff --git a/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/MyApp.java b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/MyApp.java new file mode 100644 index 0000000..525bb1e --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/MyApp.java @@ -0,0 +1,93 @@ +package com.newsdk.ams.httpdns.demo; + +import android.app.Application; +import android.content.SharedPreferences; +import android.util.Log; + +import com.newsdk.sdk.android.httpdns.HttpDnsService; +import com.newsdk.sdk.android.httpdns.ILogger; +import com.newsdk.sdk.android.httpdns.log.HttpDnsLog; +import com.newsdk.ams.httpdns.demo.utils.SpUtil; + +public class MyApp extends Application { + + private static final String SP_NAME = "HTTPDNS_DEMO"; + private static final String KEY_INSTANCE = "KEY_INSTANCE"; + private static final String VALUE_INSTANCE_A = "A"; + private static final String VALUE_INSTANCE_B = "B"; + + public static final String TAG = "HTTPDNS DEMO"; + private static MyApp instance; + + public static MyApp getInstance() { + return instance; + } + + private final HttpDnsHolder holderA = new HttpDnsHolder("replace-with-your-accountId-A", "replace-with-your-secret-A", BuildConfig.SERVICE_URL); + private final HttpDnsHolder holderB = new HttpDnsHolder("replace-with-your-accountId-B", null, BuildConfig.SERVICE_URL); + + private HttpDnsHolder current = holderA; + + @Override + public void onCreate() { + super.onCreate(); + instance = this; + + // Enable logcat output for debugging. + HttpDnsLog.enable(true); + // Hook the SDK logger into app logs. + HttpDnsLog.setLogger(new ILogger() { + @Override + public void log(String msg) { + Log.d("HttpDnsLogger", msg); + } + }); + + // Initialize HTTPDNS configuration. + holderA.init(this); + holderB.init(this); + + SpUtil.readSp(this, SP_NAME, new SpUtil.OnGetSp() { + @Override + public void onGetSp(SharedPreferences sp) { + String flag = sp.getString(KEY_INSTANCE, VALUE_INSTANCE_A); + if (flag.equals(VALUE_INSTANCE_A)) { + current = holderA; + } else { + current = holderB; + } + } + }); + } + + public HttpDnsHolder getCurrentHolder() { + return current; + } + + public HttpDnsHolder changeHolder() { + if (current == holderA) { + current = holderB; + SpUtil.writeSp(instance, SP_NAME, new SpUtil.OnGetSpEditor() { + @Override + public void onGetSpEditor(SharedPreferences.Editor editor) { + editor.putString(KEY_INSTANCE, VALUE_INSTANCE_B); + } + }); + } else { + current = holderA; + SpUtil.writeSp(instance, SP_NAME, new SpUtil.OnGetSpEditor() { + @Override + public void onGetSpEditor(SharedPreferences.Editor editor) { + editor.putString(KEY_INSTANCE, VALUE_INSTANCE_A); + } + }); + } + return current; + } + + public HttpDnsService getService() { + return current.getService(); + } + +} + diff --git a/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/NetworkRequest.java b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/NetworkRequest.java new file mode 100644 index 0000000..b41f0f1 --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/NetworkRequest.java @@ -0,0 +1,21 @@ +package com.newsdk.ams.httpdns.demo; + +import com.newsdk.sdk.android.httpdns.RequestIpType; + +public interface NetworkRequest { + + /** + * 璁剧疆httpdns鐨勯厤缃? + */ + void updateHttpDnsConfig(boolean async, RequestIpType requestIpType); + + /** + * get璇锋眰 + * + * @param url + * @return + */ + String httpGet(String url) throws Exception; + +} + diff --git a/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/SDNSActivity.java b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/SDNSActivity.java new file mode 100644 index 0000000..77c97b5 --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/SDNSActivity.java @@ -0,0 +1,127 @@ +package com.newsdk.ams.httpdns.demo; + +import android.os.Bundle; +import android.view.View; +import android.widget.AutoCompleteTextView; +import android.widget.EditText; + +import com.newsdk.sdk.android.httpdns.HTTPDNSResult; +import com.newsdk.sdk.android.httpdns.RequestIpType; +import com.newsdk.ams.httpdns.demo.base.BaseActivity; + +import java.util.HashMap; + +public class SDNSActivity extends BaseActivity { + + private static final String[] HOSTS = new String[] { + "demo.cloudxdr.com", + "www.taobao.com" + }; + + private final HashMap globalParams = new HashMap<>(); + private String host = HOSTS[0]; + private RequestIpType requestIpType = RequestIpType.v4; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + addEditTextEditTextButton("key", "value", "Add global param", new OnButtonClickMoreView() { + @Override + public void onBtnClick(View[] views) { + EditText keyView = (EditText) views[0]; + EditText valueView = (EditText) views[1]; + String key = keyView.getEditableText().toString(); + String value = valueView.getEditableText().toString(); + globalParams.put(key, value); + sendLog("Global param added: " + key + "=" + value); + } + }); + + addOneButton("Clear global params", new View.OnClickListener() { + @Override + public void onClick(View v) { + globalParams.clear(); + sendLog("Global params cleared."); + } + }); + + addFourButton( + "IP type v4", + new View.OnClickListener() { + @Override + public void onClick(View v) { + requestIpType = RequestIpType.v4; + sendLog("Request IP type: v4"); + } + }, + "IP type v6", + new View.OnClickListener() { + @Override + public void onClick(View v) { + requestIpType = RequestIpType.v6; + sendLog("Request IP type: v6"); + } + }, + "IP type both", + new View.OnClickListener() { + @Override + public void onClick(View v) { + requestIpType = RequestIpType.both; + sendLog("Request IP type: both"); + } + }, + "IP type auto", + new View.OnClickListener() { + @Override + public void onClick(View v) { + requestIpType = RequestIpType.auto; + sendLog("Request IP type: auto"); + } + } + ); + + addAutoCompleteTextViewButton(HOSTS, "Host", "Set host", new OnButtonClick() { + @Override + public void onBtnClick(View view) { + AutoCompleteTextView hostView = (AutoCompleteTextView) view; + host = hostView.getEditableText().toString(); + sendLog("Host set to: " + host); + } + }); + + addEditTextEditTextButton("key", "value", "Resolve with param", new OnButtonClickMoreView() { + @Override + public void onBtnClick(View[] views) { + EditText keyView = (EditText) views[0]; + EditText valueView = (EditText) views[1]; + HashMap params = new HashMap<>(globalParams); + params.put(keyView.getEditableText().toString(), valueView.getEditableText().toString()); + HTTPDNSResult result = MyApp.getInstance().getService().getIpsByHostAsync( + host, requestIpType, params, "sdns-demo"); + sendLog("SDNS result: " + result); + } + }); + + addTwoButton("Resolve scale1", new View.OnClickListener() { + @Override + public void onClick(View v) { + HashMap params = new HashMap<>(globalParams); + params.put("scale", "scale1"); + HTTPDNSResult result = MyApp.getInstance().getService().getIpsByHostAsync( + host, requestIpType, params, "sdns-demo"); + sendLog("scale1 result: " + result); + } + }, "Resolve scale2", new View.OnClickListener() { + @Override + public void onClick(View v) { + HashMap params = new HashMap<>(globalParams); + params.put("scale", "scale2"); + HTTPDNSResult result = MyApp.getInstance().getService().getIpsByHostAsync( + host, requestIpType, params, "sdns-demo"); + sendLog("scale2 result: " + result); + } + }); + } +} + diff --git a/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/WebViewActivity.java b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/WebViewActivity.java new file mode 100644 index 0000000..9381c5a --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/WebViewActivity.java @@ -0,0 +1,403 @@ +package com.newsdk.ams.httpdns.demo; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.net.SSLCertificateSocketFactory; +import android.os.Build; +import android.os.Bundle; +import android.text.TextUtils; +import android.util.Log; +import android.view.KeyEvent; +import android.view.View; +import android.webkit.WebResourceRequest; +import android.webkit.WebResourceResponse; +import android.webkit.WebView; +import android.webkit.WebViewClient; +import android.widget.TextView; + +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.InetAddress; +import java.net.MalformedURLException; +import java.net.Socket; +import java.net.URL; +import java.net.URLConnection; +import java.net.UnknownHostException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLPeerUnverifiedException; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocket; +import javax.net.ssl.SSLSocketFactory; + +public class WebViewActivity extends Activity { + + private WebView webView; + private static final String targetUrl = "http://www.apple.com"; + + private static final String TAG = MyApp.TAG + "WebView"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_webview); + + initBar(); + initHttpDnsWebView(); + } + + @Override + public boolean + onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_BACK && webView.canGoBack()) { + webView.goBack();//杩斿洖涓婁釜椤甸潰 + return true; + } + return super.onKeyDown(keyCode, event);//閫€鍑篈ctivity + } + + private void initBar() { + findViewById(R.id.bar_img).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + WebViewActivity.this.finish(); + } + }); + + ((TextView) findViewById(R.id.bar_text)).setText("HTTPDNS"); + } + + private void initHttpDnsWebView() { + + webView = (WebView) this.findViewById(R.id.wv_container); + + webView.setWebViewClient(new WebViewClient() { + + @SuppressLint("NewApi") + @Override + public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) { + String scheme = request.getUrl().getScheme().trim(); + String method = request.getMethod(); + Map headerFields = request.getRequestHeaders(); + String url = request.getUrl().toString(); + Log.e(TAG, "url:" + url); + // 鏃犳硶鎷︽埅body锛屾嫤鎴柟妗堝彧鑳芥甯稿鐞嗕笉甯ody鐨勮姹傦紱 + if ((scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https")) + && method.equalsIgnoreCase("get")) { + try { + URLConnection connection = recursiveRequest(url, headerFields, null); + + if (connection == null) { + Log.e(TAG, "connection null"); + return super.shouldInterceptRequest(view, request); + } + + // 娉?锛氬浜嶱OST璇锋眰鐨凚ody鏁版嵁锛學ebResourceRequest鎺ュ彛涓苟娌℃湁鎻愪緵锛岃繖閲屾棤娉曞鐞? + String contentType = connection.getContentType(); + String mime = getMime(contentType); + String charset = getCharset(contentType); + HttpURLConnection httpURLConnection = (HttpURLConnection) connection; + int statusCode = httpURLConnection.getResponseCode(); + String response = httpURLConnection.getResponseMessage(); + Map> headers = httpURLConnection.getHeaderFields(); + Set headerKeySet = headers.keySet(); + Log.e(TAG, "code:" + httpURLConnection.getResponseCode()); + Log.e(TAG, "mime:" + mime + "; charset:" + charset); + + + // 鏃爉ime绫诲瀷鐨勮姹備笉鎷︽埅 + if (TextUtils.isEmpty(mime)) { + Log.e(TAG, "no MIME"); + return super.shouldInterceptRequest(view, request); + } else { + // 浜岃繘鍒惰祫婧愭棤闇€缂栫爜淇℃伅 + if (!TextUtils.isEmpty(charset) || (isBinaryRes(mime))) { + WebResourceResponse resourceResponse = new WebResourceResponse(mime, charset, httpURLConnection.getInputStream()); + resourceResponse.setStatusCodeAndReasonPhrase(statusCode, response); + Map responseHeader = new HashMap(); + for (String key : headerKeySet) { + // HttpUrlConnection鍙兘鍖呭惈key涓簄ull鐨勬姤澶达紝鎸囧悜璇ttp璇锋眰鐘舵€佺爜 + responseHeader.put(key, httpURLConnection.getHeaderField(key)); + } + resourceResponse.setResponseHeaders(responseHeader); + return resourceResponse; + } else { + Log.e(TAG, "non binary resource for " + mime); + return super.shouldInterceptRequest(view, request); + } + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return super.shouldInterceptRequest(view, request); + } + + @Override + public WebResourceResponse shouldInterceptRequest(WebView view, String url) { + // API < 21 鍙兘鎷︽埅URL鍙傛暟 + return super.shouldInterceptRequest(view, url); + } + }); + + + webView.loadUrl(targetUrl); + } + + + /** + * 浠巆ontentType涓幏鍙朚IME绫诲瀷 + * + * @param contentType + * @return + */ + private String getMime(String contentType) { + if (contentType == null) { + return null; + } + return contentType.split(";")[0]; + } + + /** + * 浠巆ontentType涓幏鍙栫紪鐮佷俊鎭? + * + * @param contentType + * @return + */ + private String getCharset(String contentType) { + if (contentType == null) { + return null; + } + + String[] fields = contentType.split(";"); + if (fields.length <= 1) { + return null; + } + + String charset = fields[1]; + if (!charset.contains("=")) { + return null; + } + charset = charset.substring(charset.indexOf("=") + 1); + return charset; + } + + + /** + * 鏄惁鏄簩杩涘埗璧勬簮锛屼簩杩涘埗璧勬簮鍙互涓嶉渶瑕佺紪鐮佷俊鎭? + */ + private boolean isBinaryRes(String mime) { + if (mime.startsWith("image") + || mime.startsWith("audio") + || mime.startsWith("video")) { + return true; + } else { + return false; + } + } + + + public URLConnection recursiveRequest(String path, Map headers, String reffer) { + HttpURLConnection conn; + URL url = null; + try { + url = new URL(path); + // 寮傛鎺ュ彛鑾峰彇IP + String ip = MyApp.getInstance().getService().getIpByHostAsync(url.getHost()); + if (ip != null) { + // 閫氳繃HTTPDNS鑾峰彇IP鎴愬姛锛岃繘琛孶RL鏇挎崲鍜孒OST澶磋缃? + Log.d(TAG, "Get IP: " + ip + " for host: " + url.getHost() + " from HTTPDNS successfully!"); + String newUrl = path.replaceFirst(url.getHost(), ip); + conn = (HttpURLConnection) new URL(newUrl).openConnection(); + + if (headers != null) { + for (Map.Entry field : headers.entrySet()) { + conn.setRequestProperty(field.getKey(), field.getValue()); + } + } + // 璁剧疆HTTP璇锋眰澶碒ost鍩? + conn.setRequestProperty("Host", url.getHost()); + } else { + return null; + } + conn.setConnectTimeout(30000); + conn.setReadTimeout(30000); + conn.setInstanceFollowRedirects(false); + if (conn instanceof HttpsURLConnection) { + final HttpsURLConnection httpsURLConnection = (HttpsURLConnection) conn; + WebviewTlsSniSocketFactory sslSocketFactory = new WebviewTlsSniSocketFactory( + (HttpsURLConnection)conn); + + // sni鍦烘櫙锛屽垱寤篠SLScocket + httpsURLConnection.setSSLSocketFactory(sslSocketFactory); + // https鍦烘櫙锛岃瘉涔︽牎楠? + httpsURLConnection.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String hostname, SSLSession session) { + String host = httpsURLConnection.getRequestProperty("Host"); + if (null == host) { + host = httpsURLConnection.getURL().getHost(); + } + return HttpsURLConnection.getDefaultHostnameVerifier().verify(host, session); + } + }); + } + int code = conn.getResponseCode();// Network block + if (needRedirect(code)) { + // 鍘熸湁鎶ュご涓惈鏈塩ookie锛屾斁寮冩嫤鎴? + if (containCookie(headers)) { + return null; + } + + String location = conn.getHeaderField("Location"); + if (location == null) { + location = conn.getHeaderField("location"); + } + + if (location != null) { + if (!(location.startsWith("http://") || location + .startsWith("https://"))) { + //鏌愪簺鏃跺€欎細鐪佺暐host锛屽彧杩斿洖鍚庨潰鐨刾ath锛屾墍浠ラ渶瑕佽ˉ鍏╱rl + URL originalUrl = new URL(path); + location = originalUrl.getProtocol() + "://" + + originalUrl.getHost() + location; + } + Log.e(TAG, "code: " + code + "; location: " + location + "; path " + path); + return recursiveRequest(location, headers, path); + } else { + // 鏃犳硶鑾峰彇location淇℃伅锛岃娴忚鍣ㄨ幏鍙? + return null; + } + } else { + // redirect finish. + Log.e(TAG, "redirect finish"); + return conn; + } + } catch (MalformedURLException e) { + Log.w(TAG, "recursiveRequest MalformedURLException"); + } catch (IOException e) { + Log.w(TAG, "recursiveRequest IOException"); + } catch (Exception e) { + Log.w(TAG, "unknow exception"); + } + return null; + } + + + private boolean needRedirect(int code) { + return code >= 300 && code < 400; + } + + + /** + * header涓槸鍚﹀惈鏈塩ookie + */ + private boolean containCookie(Map headers) { + for (Map.Entry headerField : headers.entrySet()) { + if (headerField.getKey().contains("Cookie")) { + return true; + } + } + return false; + } + + + static class WebviewTlsSniSocketFactory extends SSLSocketFactory { + private final String TAG = WebviewTlsSniSocketFactory.class.getSimpleName(); + HostnameVerifier hostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier(); + private final HttpsURLConnection conn; + + public WebviewTlsSniSocketFactory(HttpsURLConnection conn) { + this.conn = conn; + } + + @Override + public Socket createSocket() throws IOException { + return null; + } + + @Override + public Socket createSocket(String host, int port) throws IOException, UnknownHostException { + return null; + } + + @Override + public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException, UnknownHostException { + return null; + } + + @Override + public Socket createSocket(InetAddress host, int port) throws IOException { + return null; + } + + @Override + public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException { + return null; + } + + // TLS layer + + @Override + public String[] getDefaultCipherSuites() { + return new String[0]; + } + + @Override + public String[] getSupportedCipherSuites() { + return new String[0]; + } + + @Override + public Socket createSocket(Socket plainSocket, String host, int port, boolean autoClose) throws IOException { + String peerHost = this.conn.getRequestProperty("Host"); + if (peerHost == null) + peerHost = host; + Log.i(TAG, "customized createSocket. host: " + peerHost); + InetAddress address = plainSocket.getInetAddress(); + if (autoClose) { + // we don't need the plainSocket + plainSocket.close(); + } + // create and connect SSL socket, but don't do hostname/certificate verification yet + SSLCertificateSocketFactory sslSocketFactory = (SSLCertificateSocketFactory) SSLCertificateSocketFactory.getDefault(0); + SSLSocket ssl = (SSLSocket) sslSocketFactory.createSocket(address, port); + + // enable TLSv1.1/1.2 if available + ssl.setEnabledProtocols(ssl.getSupportedProtocols()); + + // set up SNI before the handshake + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + Log.i(TAG, "Setting SNI hostname"); + sslSocketFactory.setHostname(ssl, peerHost); + } else { + Log.d(TAG, "No documented SNI support on Android <4.2, trying with reflection"); + try { + java.lang.reflect.Method setHostnameMethod = ssl.getClass().getMethod("setHostname", String.class); + setHostnameMethod.invoke(ssl, peerHost); + } catch (Exception e) { + Log.w(TAG, "SNI not useable", e); + } + } + + // verify hostname and certificate + SSLSession session = ssl.getSession(); + + if (!hostnameVerifier.verify(peerHost, session)) + throw new SSLPeerUnverifiedException("Cannot verify hostname: " + peerHost); + + Log.i(TAG, "Established " + session.getProtocol() + " connection with " + session.getPeerHost() + + " using " + session.getCipherSuite()); + + return ssl; + } + } +} + diff --git a/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/base/BaseActivity.java b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/base/BaseActivity.java new file mode 100644 index 0000000..c30381d --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/base/BaseActivity.java @@ -0,0 +1,264 @@ +package com.newsdk.ams.httpdns.demo.base; + +import android.app.Activity; +import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; +import android.util.Log; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.AutoCompleteTextView; +import android.widget.Button; +import android.widget.EditText; +import android.widget.FrameLayout; +import android.widget.LinearLayout; +import android.widget.ScrollView; +import android.widget.TextView; + +import com.newsdk.ams.httpdns.demo.MyApp; +import com.newsdk.ams.httpdns.demo.R; + +public class BaseActivity extends Activity { + + public static final int MSG_WHAT_LOG = 10000; + + private ScrollView logScrollView; + private TextView logView; + private LinearLayout llContainer; + + private Handler handler; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_base); + + handler = new Handler(Looper.getMainLooper()) { + @Override + public void handleMessage(Message msg) { + super.handleMessage(msg); + switch (msg.what) { + case MSG_WHAT_LOG: + logView.setText(logView.getText() + "\n" + (String) msg.obj); + handler.post(new Runnable() { + @Override + public void run() { + logScrollView.fullScroll(View.FOCUS_DOWN); + } + }); + break; + } + } + }; + + logScrollView = findViewById(R.id.logScrollView); + logView = findViewById(R.id.tvConsoleText); + llContainer = findViewById(R.id.llContainer); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + handler.removeCallbacksAndMessages(null); + handler = null; + } + + /** + * 鍙戦€佹棩蹇楀埌鐣岄潰 + * + * @param log + */ + protected void sendLog(String log) { + Log.d(MyApp.TAG, log); + if (handler != null) { + Message msg = handler.obtainMessage(MSG_WHAT_LOG, log); + handler.sendMessage(msg); + } + } + + protected void cleanLog() { + logView.setText(""); + } + + protected void addView(int layoutId, OnViewCreated created) { + FrameLayout container = new FrameLayout(this); + View.inflate(this, layoutId, container); + llContainer.addView(container, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); + created.onViewCreated(container); + } + + protected void addOneButton( + final String labelOne, final View.OnClickListener clickListenerOne + ) { + addView(R.layout.item_one_button, new OnViewCreated() { + @Override + public void onViewCreated(View view) { + + Button btnOne = view.findViewById(R.id.btnOne); + btnOne.setText(labelOne); + btnOne.setOnClickListener(clickListenerOne); + } + }); + } + + protected void addTwoButton( + final String labelOne, final View.OnClickListener clickListenerOne, + final String labelTwo, final View.OnClickListener clickListenerTwo + ) { + addView(R.layout.item_two_button, new OnViewCreated() { + @Override + public void onViewCreated(View view) { + + Button btnOne = view.findViewById(R.id.btnOne); + btnOne.setText(labelOne); + btnOne.setOnClickListener(clickListenerOne); + + Button btnTwo = view.findViewById(R.id.btnTwo); + btnTwo.setText(labelTwo); + btnTwo.setOnClickListener(clickListenerTwo); + } + }); + } + + protected void addThreeButton( + final String labelOne, final View.OnClickListener clickListenerOne, + final String labelTwo, final View.OnClickListener clickListenerTwo, + final String labelThree, final View.OnClickListener clickListenerThree + ) { + addView(R.layout.item_three_button, new OnViewCreated() { + @Override + public void onViewCreated(View view) { + + Button btnOne = view.findViewById(R.id.btnOne); + btnOne.setText(labelOne); + btnOne.setOnClickListener(clickListenerOne); + + Button btnTwo = view.findViewById(R.id.btnTwo); + btnTwo.setText(labelTwo); + btnTwo.setOnClickListener(clickListenerTwo); + + Button btnThree = view.findViewById(R.id.btnThree); + btnThree.setText(labelThree); + btnThree.setOnClickListener(clickListenerThree); + } + }); + } + + + protected void addFourButton( + final String labelOne, final View.OnClickListener clickListenerOne, + final String labelTwo, final View.OnClickListener clickListenerTwo, + final String labelThree, final View.OnClickListener clickListenerThree, + final String labelFour, final View.OnClickListener clickListenerFour + ) { + addView(R.layout.item_four_button, new OnViewCreated() { + @Override + public void onViewCreated(View view) { + + Button btnOne = view.findViewById(R.id.btnOne); + btnOne.setText(labelOne); + btnOne.setOnClickListener(clickListenerOne); + + Button btnTwo = view.findViewById(R.id.btnTwo); + btnTwo.setText(labelTwo); + btnTwo.setOnClickListener(clickListenerTwo); + + Button btnThree = view.findViewById(R.id.btnThree); + btnThree.setText(labelThree); + btnThree.setOnClickListener(clickListenerThree); + + Button btnFour = view.findViewById(R.id.btnFour); + btnFour.setText(labelFour); + btnFour.setOnClickListener(clickListenerFour); + } + }); + } + + protected void addEditTextButton( + final String hint, + final String labelOne, final OnButtonClick clickListenerOne + ) { + addView(R.layout.item_edit_button, new OnViewCreated() { + @Override + public void onViewCreated(View view) { + + Button btnOne = view.findViewById(R.id.btnOne); + btnOne.setText(labelOne); + final EditText editText = view.findViewById(R.id.etOne); + editText.setHint(hint); + btnOne.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListenerOne.onBtnClick(editText); + } + }); + } + }); + } + + + protected void addEditTextEditTextButton( + final String hintOne, final String hintTwo, + final String labelOne, final OnButtonClickMoreView clickListenerOne + ) { + addView(R.layout.item_edit_edit_button, new OnViewCreated() { + @Override + public void onViewCreated(View view) { + + Button btnOne = view.findViewById(R.id.btnOne); + btnOne.setText(labelOne); + final EditText editTextOne = view.findViewById(R.id.etOne); + editTextOne.setHint(hintOne); + final EditText editTextTwo = view.findViewById(R.id.etTwo); + editTextTwo.setHint(hintTwo); + btnOne.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListenerOne.onBtnClick(new View[]{editTextOne, editTextTwo}); + } + }); + } + }); + } + + protected void addAutoCompleteTextViewButton( + final String[] strings, final String hint, final String labelOne, final OnButtonClick clickListenerOne + ) { + addView(R.layout.item_autocomplete_button, new OnViewCreated() { + @Override + public void onViewCreated(View view) { + + Button btnOne = view.findViewById(R.id.btnOne); + btnOne.setText(labelOne); + + final AutoCompleteTextView actvOne = view.findViewById(R.id.actvOne); + ArrayAdapter adapter = new ArrayAdapter(getApplicationContext(), + android.R.layout.simple_dropdown_item_1line, strings); + actvOne.setAdapter(adapter); + actvOne.setHint(hint); + + btnOne.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListenerOne.onBtnClick(actvOne); + } + }); + } + }); + } + + public interface OnViewCreated { + void onViewCreated(View view); + } + + public interface OnButtonClick { + void onBtnClick(View view); + } + + public interface OnButtonClickMoreView { + void onBtnClick(View[] views); + } +} + diff --git a/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/http/HttpUrlConnectionRequest.java b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/http/HttpUrlConnectionRequest.java new file mode 100644 index 0000000..77f3dc3 --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/http/HttpUrlConnectionRequest.java @@ -0,0 +1,258 @@ +package com.newsdk.ams.httpdns.demo.http; + + +import android.content.Context; +import android.net.SSLCertificateSocketFactory; +import android.os.Build; +import android.util.Log; + +import com.newsdk.sdk.android.httpdns.HTTPDNSResult; +import com.newsdk.sdk.android.httpdns.NetType; +import com.newsdk.sdk.android.httpdns.RequestIpType; +import com.newsdk.sdk.android.httpdns.SyncService; +import com.newsdk.sdk.android.httpdns.net.HttpDnsNetworkDetector; +import com.newsdk.ams.httpdns.demo.MyApp; +import com.newsdk.ams.httpdns.demo.NetworkRequest; +import com.newsdk.ams.httpdns.demo.utils.Util; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.InetAddress; +import java.net.Socket; +import java.net.URL; +import java.net.UnknownHostException; + +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLPeerUnverifiedException; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocket; +import javax.net.ssl.SSLSocketFactory; + +/** + * 浣跨敤HttpUrlConnection 瀹炵幇璇锋眰 + */ +public class HttpUrlConnectionRequest implements NetworkRequest { + + public static final String TAG = MyApp.TAG + "HttpUrl"; + + private final Context context; + private boolean async; + private RequestIpType type; + + public HttpUrlConnectionRequest(Context context) { + this.context = context.getApplicationContext(); + } + + @Override + public void updateHttpDnsConfig(boolean async, RequestIpType requestIpType) { + this.async = async; + this.type = requestIpType; + } + + @Override + public String httpGet(String url) throws Exception { + Log.d(TAG, "浣跨敤httpUrlConnection 璇锋眰" + url + " 寮傛鎺ュ彛 " + async + " ip绫诲瀷 " + type.name()); + + HttpURLConnection conn = getConnection(url); + InputStream in = null; + BufferedReader streamReader = null; + if (conn.getResponseCode() != HttpURLConnection.HTTP_OK) { + in = conn.getErrorStream(); + String errStr = null; + if (in != null) { + streamReader = new BufferedReader(new InputStreamReader(in, "UTF-8")); + errStr = readStringFrom(streamReader).toString(); + } + Log.d(TAG, "璇锋眰澶辫触 " + conn.getResponseCode() + " err " + errStr); + throw new Exception("Status Code : " + conn.getResponseCode() + " Msg : " + errStr); + } else { + in = conn.getInputStream(); + streamReader = new BufferedReader(new InputStreamReader(in, "UTF-8")); + String responseStr = readStringFrom(streamReader).toString(); + Log.d(TAG, "璇锋眰鎴愬姛 " + responseStr); + return responseStr; + } + } + + private HttpURLConnection getConnection(String url) throws IOException { + final String host = new URL(url).getHost(); + HttpURLConnection conn = null; + HTTPDNSResult result; + /* 鍒囨崲涓烘柊鐗堟爣鍑哸pi */ + if (async) { + result = MyApp.getInstance().getService().getHttpDnsResultForHostAsync(host, type); + } else { + result = MyApp.getInstance().getService().getHttpDnsResultForHostSync(host, type); + } + Log.d(TAG, "httpdns 瑙ｆ瀽 " + host + " 缁撴灉涓?" + result + " ttl is " + Util.getTtl(result)); + + // 杩欓噷闇€瑕佹牴鎹疄闄呮儏鍐甸€夋嫨浣跨敤ipv6鍦板潃 杩樻槸 ipv4鍦板潃锛?涓嬮潰绀轰緥鐨勪唬鐮佷紭鍏堜娇鐢ㄤ簡ipv6鍦板潃 + if (result.getIpv6s() != null && result.getIpv6s().length > 0 && HttpDnsNetworkDetector.getInstance().getNetType(context) != NetType.v4) { + String newUrl = url.replace(host, "[" + result.getIpv6s()[0] + "]"); + conn = (HttpURLConnection) new URL(newUrl).openConnection(); + conn.setRequestProperty("Host", host); + Log.d(TAG, "浣跨敤ipv6鍦板潃 " + newUrl); + } else if (result.getIps() != null && result.getIps().length > 0 && HttpDnsNetworkDetector.getInstance().getNetType(context) != NetType.v6) { + String newUrl = url.replace(host, result.getIps()[0]); + conn = (HttpURLConnection) new URL(newUrl).openConnection(); + conn.setRequestProperty("Host", host); + Log.d(TAG, "浣跨敤ipv4鍦板潃 " + newUrl); + } + + if (conn == null) { + Log.d(TAG, "httpdns 鏈繑鍥炶В鏋愮粨鏋滐紝璧發ocaldns"); + conn = (HttpURLConnection) new URL(url).openConnection(); + } + conn.setConnectTimeout(30000); + conn.setReadTimeout(30000); + conn.setInstanceFollowRedirects(false); + if (conn instanceof HttpsURLConnection) { + final HttpsURLConnection httpsURLConnection = (HttpsURLConnection) conn; + WebviewTlsSniSocketFactory sslSocketFactory = new WebviewTlsSniSocketFactory( + (HttpsURLConnection)conn); + + // sni鍦烘櫙锛屽垱寤篠SLSocket + httpsURLConnection.setSSLSocketFactory(sslSocketFactory); + // https鍦烘櫙锛岃瘉涔︽牎楠? + httpsURLConnection.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String hostname, SSLSession session) { + String host = httpsURLConnection.getRequestProperty("Host"); + if (null == host) { + host = httpsURLConnection.getURL().getHost(); + } + return HttpsURLConnection.getDefaultHostnameVerifier().verify(host, session); + } + }); + } + int code = conn.getResponseCode();// Network block + if (needRedirect(code)) { + //涓存椂閲嶅畾鍚戝拰姘镐箙閲嶅畾鍚憀ocation鐨勫ぇ灏忓啓鏈夊尯鍒? + String location = conn.getHeaderField("Location"); + if (location == null) { + location = conn.getHeaderField("location"); + } + if (!(location.startsWith("http://") || location + .startsWith("https://"))) { + //鏌愪簺鏃跺€欎細鐪佺暐host锛屽彧杩斿洖鍚庨潰鐨刾ath锛屾墍浠ラ渶瑕佽ˉ鍏╱rl + URL originalUrl = new URL(url); + location = originalUrl.getProtocol() + "://" + + originalUrl.getHost() + location; + } + return getConnection(location); + } + return conn; + } + + private boolean needRedirect(int code) { + return code >= 300 && code < 400; + } + + static class WebviewTlsSniSocketFactory extends SSLSocketFactory { + private final String TAG = WebviewTlsSniSocketFactory.class.getSimpleName(); + HostnameVerifier hostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier(); + private HttpsURLConnection conn; + + public WebviewTlsSniSocketFactory(HttpsURLConnection conn) { + this.conn = conn; + } + + @Override + public Socket createSocket() throws IOException { + return null; + } + + @Override + public Socket createSocket(String host, int port) throws IOException, UnknownHostException { + return null; + } + + @Override + public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException, UnknownHostException { + return null; + } + + @Override + public Socket createSocket(InetAddress host, int port) throws IOException { + return null; + } + + @Override + public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException { + return null; + } + + // TLS layer + + @Override + public String[] getDefaultCipherSuites() { + return new String[0]; + } + + @Override + public String[] getSupportedCipherSuites() { + return new String[0]; + } + + @Override + public Socket createSocket(Socket plainSocket, String host, int port, boolean autoClose) throws IOException { + String peerHost = this.conn.getRequestProperty("Host"); + if (peerHost == null) + peerHost = host; + Log.i(TAG, "customized createSocket. host: " + peerHost); + InetAddress address = plainSocket.getInetAddress(); + if (autoClose) { + // we don't need the plainSocket + plainSocket.close(); + } + // create and connect SSL socket, but don't do hostname/certificate verification yet + SSLCertificateSocketFactory sslSocketFactory = (SSLCertificateSocketFactory) SSLCertificateSocketFactory.getDefault(0); + SSLSocket ssl = (SSLSocket) sslSocketFactory.createSocket(address, port); + + // enable TLSv1.1/1.2 if available + ssl.setEnabledProtocols(ssl.getSupportedProtocols()); + + // set up SNI before the handshake + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + Log.i(TAG, "Setting SNI hostname"); + sslSocketFactory.setHostname(ssl, peerHost); + } else { + Log.d(TAG, "No documented SNI support on Android <4.2, trying with reflection"); + try { + java.lang.reflect.Method setHostnameMethod = ssl.getClass().getMethod("setHostname", String.class); + setHostnameMethod.invoke(ssl, peerHost); + } catch (Exception e) { + Log.w(TAG, "SNI not useable", e); + } + } + + // verify hostname and certificate + SSLSession session = ssl.getSession(); + + if (!hostnameVerifier.verify(peerHost, session)) + throw new SSLPeerUnverifiedException("Cannot verify hostname: " + peerHost); + + Log.i(TAG, "Established " + session.getProtocol() + " connection with " + session.getPeerHost() + + " using " + session.getCipherSuite()); + + return ssl; + } + } + + /** + * stream to string + */ + public static StringBuilder readStringFrom(BufferedReader streamReader) throws IOException { + StringBuilder sb = new StringBuilder(); + String line; + while ((line = streamReader.readLine()) != null) { + sb.append(line); + } + return sb; + } +} + diff --git a/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/okhttp/OkHttpRequest.java b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/okhttp/OkHttpRequest.java new file mode 100644 index 0000000..f502dc6 --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/okhttp/OkHttpRequest.java @@ -0,0 +1,98 @@ +package com.newsdk.ams.httpdns.demo.okhttp; + +import android.content.Context; +import android.util.Log; + +import com.newsdk.sdk.android.httpdns.HTTPDNSResult; +import com.newsdk.sdk.android.httpdns.NetType; +import com.newsdk.sdk.android.httpdns.RequestIpType; +import com.newsdk.sdk.android.httpdns.SyncService; +import com.newsdk.sdk.android.httpdns.net.HttpDnsNetworkDetector; +import com.newsdk.ams.httpdns.demo.MyApp; +import com.newsdk.ams.httpdns.demo.NetworkRequest; +import com.newsdk.ams.httpdns.demo.utils.Util; + +import java.net.HttpURLConnection; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import okhttp3.ConnectionPool; +import okhttp3.Dns; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; + +/** + * okhttp瀹炵幇缃戠粶璇锋眰 + */ +public class OkHttpRequest implements NetworkRequest { + + public static final String TAG = MyApp.TAG + "Okhttp"; + private final OkHttpClient client; + + private boolean async; + private RequestIpType type; + + public OkHttpRequest(final Context context) { + client = new OkHttpClient.Builder() + // 杩欓噷閰嶇疆杩炴帴姹狅紝鏄负浜嗘柟渚挎祴璇昲ttpdns鑳藉姏锛屾寮忎唬鐮佽涓嶈閰嶇疆 + .connectionPool(new ConnectionPool(0, 10 * 1000, TimeUnit.MICROSECONDS)) + .dns(new Dns() { + @Override + public List lookup(String hostname) throws UnknownHostException { + HTTPDNSResult result; + /* 鍒囨崲涓烘柊鐗堟爣鍑哸pi */ + if (async) { + result = MyApp.getInstance().getService().getHttpDnsResultForHostAsync(hostname, type); + } else { + result = MyApp.getInstance().getService().getHttpDnsResultForHostSync(hostname, type); + } + Log.d(TAG, "httpdns 瑙ｆ瀽 " + hostname + " 缁撴灉涓?" + result + " ttl is " + Util.getTtl(result)); + List inetAddresses = new ArrayList<>(); + // 杩欓噷闇€瑕佹牴鎹疄闄呮儏鍐甸€夋嫨浣跨敤ipv6鍦板潃 杩樻槸 ipv4鍦板潃锛?涓嬮潰绀轰緥鐨勪唬鐮佷紭鍏堜娇鐢ㄤ簡ipv6鍦板潃 + Log.d(TAG, "netType is: " + HttpDnsNetworkDetector.getInstance().getNetType(context)); + if (result.getIpv6s() != null && result.getIpv6s().length > 0 && HttpDnsNetworkDetector.getInstance().getNetType(context) != NetType.v4) { + for (int i = 0; i < result.getIpv6s().length; i++) { + inetAddresses.addAll(Arrays.asList(InetAddress.getAllByName(result.getIpv6s()[i]))); + } + Log.d(TAG, "浣跨敤ipv6鍦板潃" + inetAddresses); + } else if (result.getIps() != null && result.getIps().length > 0 && HttpDnsNetworkDetector.getInstance().getNetType(context) != NetType.v6) { + for (int i = 0; i < result.getIps().length; i++) { + inetAddresses.addAll(Arrays.asList(InetAddress.getAllByName(result.getIps()[i]))); + } + Log.d(TAG, "浣跨敤ipv4鍦板潃" + inetAddresses); + } + if (inetAddresses.size() == 0) { + Log.d(TAG, "httpdns 鏈繑鍥濱P锛岃蛋localdns"); + return Dns.SYSTEM.lookup(hostname); + } + return inetAddresses; + } + }) + .build(); + } + + @Override + public void updateHttpDnsConfig(boolean async, RequestIpType requestIpType) { + this.async = async; + this.type = requestIpType; + } + + @Override + public String httpGet(String url) throws Exception { + Log.d(TAG, "浣跨敤okhttp 璇锋眰" + url + " 寮傛鎺ュ彛 " + async + " ip绫诲瀷 " + type.name()); + Response response = client.newCall(new Request.Builder().url(url).build()).execute(); + int code = response.code(); + String body = response.body().string(); + Log.d(TAG, "浣跨敤okhttp 璇锋眰缁撴灉 code " + code + " body " + body); + if (code != HttpURLConnection.HTTP_OK) { + throw new Exception("璇锋眰澶辫触 code " + code + " body " + body); + } + return body; + } +} + diff --git a/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/utils/SpUtil.java b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/utils/SpUtil.java new file mode 100644 index 0000000..2ab142a --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/utils/SpUtil.java @@ -0,0 +1,28 @@ +package com.newsdk.ams.httpdns.demo.utils; + +import android.content.Context; +import android.content.SharedPreferences; + +public class SpUtil { + + public static void readSp(Context context, String name, OnGetSp onGetSp) { + SharedPreferences sp = context.getSharedPreferences(name, Context.MODE_PRIVATE); + onGetSp.onGetSp(sp); + } + + public static void writeSp(Context context, String name, OnGetSpEditor onGetSpEditor) { + SharedPreferences sp = context.getSharedPreferences(name, Context.MODE_PRIVATE); + SharedPreferences.Editor editor = sp.edit(); + onGetSpEditor.onGetSpEditor(editor); + editor.commit(); + } + + public interface OnGetSp { + void onGetSp(SharedPreferences sp); + } + + public interface OnGetSpEditor { + void onGetSpEditor(SharedPreferences.Editor editor); + } +} + diff --git a/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/utils/ThreadUtil.java b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/utils/ThreadUtil.java new file mode 100644 index 0000000..d7cb983 --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/utils/ThreadUtil.java @@ -0,0 +1,95 @@ +package com.newsdk.ams.httpdns.demo.utils; + +import android.util.Log; + +import com.newsdk.sdk.android.httpdns.HTTPDNSResult; +import com.newsdk.sdk.android.httpdns.RequestIpType; +import com.newsdk.sdk.android.httpdns.SyncService; +import com.newsdk.ams.httpdns.demo.MyApp; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Random; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +public class ThreadUtil { + + public static void multiThreadTest( + final String[] validHosts, + final int hostCount, + final int threadCount, + final int executeTime, + final boolean async, + final RequestIpType type + ) { + new Thread(() -> runMultiThreadTest(validHosts, hostCount, threadCount, executeTime, async, type)).start(); + } + + private static void runMultiThreadTest( + String[] validHosts, + int hostCount, + int threadCount, + int executeTime, + boolean async, + RequestIpType type + ) { + int validCount = Math.min(validHosts.length, hostCount); + Log.d(MyApp.TAG, "Start multiThreadTest, threads=" + threadCount + + ", executeTimeMs=" + executeTime + + ", hostCount=" + hostCount + + ", validHostCount=" + validCount + + ", async=" + async + + ", ipType=" + type.name()); + + ArrayList hosts = new ArrayList<>(hostCount); + for (int i = 0; i < hostCount - validCount; i++) { + hosts.add("test" + i + ".cloudxdr.com"); + } + hosts.addAll(Arrays.asList(validHosts).subList(0, validCount)); + + ExecutorService pool = Executors.newFixedThreadPool(threadCount); + CountDownLatch done = new CountDownLatch(threadCount); + + for (int i = 0; i < threadCount; i++) { + pool.execute(() -> { + Random random = new Random(Thread.currentThread().getId()); + long begin = System.currentTimeMillis(); + int requestCount = 0; + int successCount = 0; + + while (System.currentTimeMillis() - begin < executeTime) { + String host = hosts.get(random.nextInt(hosts.size())); + try { + HTTPDNSResult result; + if (async) { + result = MyApp.getInstance().getService().getIpsByHostAsync(host, type); + } else { + result = ((SyncService) MyApp.getInstance().getService()).getByHost(host, type); + } + if (result != null && result.getIps() != null && result.getIps().length > 0) { + successCount++; + } + } catch (Throwable t) { + Log.w(MyApp.TAG, "multiThreadTest request failed: " + t.getMessage()); + } + requestCount++; + } + + Log.w(MyApp.TAG, "multiThreadTest thread=" + Thread.currentThread().getId() + + ", requestCount=" + requestCount + + ", successCount=" + successCount); + done.countDown(); + }); + } + + try { + done.await(); + } catch (InterruptedException ignored) { + } finally { + pool.shutdownNow(); + } + } +} + diff --git a/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/utils/Util.java b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/utils/Util.java new file mode 100644 index 0000000..65b4281 --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/java/com/newsdk/ams/httpdns/demo/utils/Util.java @@ -0,0 +1,25 @@ +package com.newsdk.ams.httpdns.demo.utils; + +import com.newsdk.sdk.android.httpdns.HTTPDNSResult; + +import java.lang.reflect.Field; + +public class Util { + /** + * 鑾峰彇ttl锛? + * 姝ゆ柟娉曟槸鐢ㄤ簬娴嬭瘯鑷畾涔塼tl鏄惁鐢熸晥 + */ + public static int getTtl(HTTPDNSResult result) { + try { + Field ttlField = HTTPDNSResult.class.getDeclaredField("ttl"); + ttlField.setAccessible(true); + return ttlField.getInt(result); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + return -1; + } +} + diff --git a/HttpDNSSDK/sdk/android/app/src/main/res/drawable/new_bg.9.png b/HttpDNSSDK/sdk/android/app/src/main/res/drawable/new_bg.9.png new file mode 100644 index 0000000..5be6ad4 Binary files /dev/null and b/HttpDNSSDK/sdk/android/app/src/main/res/drawable/new_bg.9.png differ diff --git a/HttpDNSSDK/sdk/android/app/src/main/res/layout/activity_base.xml b/HttpDNSSDK/sdk/android/app/src/main/res/layout/activity_base.xml new file mode 100644 index 0000000..4ec412c --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/res/layout/activity_base.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HttpDNSSDK/sdk/android/app/src/main/res/layout/activity_webview.xml b/HttpDNSSDK/sdk/android/app/src/main/res/layout/activity_webview.xml new file mode 100644 index 0000000..eb9ec73 --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/res/layout/activity_webview.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HttpDNSSDK/sdk/android/app/src/main/res/layout/item_autocomplete_button.xml b/HttpDNSSDK/sdk/android/app/src/main/res/layout/item_autocomplete_button.xml new file mode 100644 index 0000000..2bd73c6 --- /dev/null +++ b/HttpDNSSDK/sdk/android/app/src/main/res/layout/item_autocomplete_button.xml @@ -0,0 +1,17 @@ + + + + + +