add: group

cmd/master.go

@@ -15,6 +15,7 @@ func main() {
 	r.POST("/register", server.Register)
 	r.GET("/secret/random", server.SecretRandom)
 	r.GET("/list", server.List)
+	r.GET("/group", server.Group)
 	r.GET("/secret", server.Secret)
 	r.GET("/health", server.Health)
 

internal/dto/response.go

@@ -61,6 +61,17 @@ type Node struct {
 	Ip           string `json:"ip"`
 	Icon         string `json:"icon"`
 	SecretUrl    string `json:"secretUrl"`
+	Continent    string `json:"continent"`
+}
+
+type GroupResponse struct {
+	Response
+	Data []*Group `json:"data"`
+}
+
+type Group struct {
+	Continent string  `json:"continent"`
+	Nodes     []*Node `json:"nodes"`
 }
 
 type ConfigResponse struct {

internal/server/server.go

@@ -137,6 +137,53 @@ func List(c *gin.Context) {
 	})
 }
 
+func Group(c *gin.Context) {
+	locker.RLock()
+	defer locker.RUnlock()
+
+	nodes := healthNodes()
+	sort.SliceStable(nodes, func(i, j int) bool {
+		return nodes[i].CountryCode > nodes[j].CountryCode
+	})
+
+	countryLabelSeqs := make(map[string]int)
+	dtoNodes := make([]*dto.Node, 0)
+	for _, node := range nodes {
+		seq, ok := countryLabelSeqs[node.CountryCode]
+		if !ok {
+			countryLabelSeqs[node.CountryCode] = 0
+		} else {
+			countryLabelSeqs[node.CountryCode] = seq + 1
+		}
+		dtoNodes = append(dtoNodes, convert2DtoNode(node, countryLabelSeqs[node.CountryCode]))
+	}
+
+	continents := make(map[string]bool)
+	for _, node := range nodes {
+		continents[node.CountryCode] = true
+	}
+
+	// 再遍历出每个 node 对应的 groups
+	groupDtos := make([]*dto.Group, 0)
+	for continent := range continents {
+		groupDto := &dto.Group{
+			Continent: continent,
+			Nodes:     make([]*dto.Node, 0),
+		}
+		for _, dtoNode := range dtoNodes {
+			if dtoNode.Continent == continent {
+				groupDto.Nodes = append(groupDto.Nodes, dtoNode)
+			}
+		}
+		groupDtos = append(groupDtos, groupDto)
+	}
+
+	c.JSON(http.StatusOK, dto.GroupResponse{
+		Response: dto.NewOkResponse(),
+		Data:     groupDtos,
+	})
+}
+
 func SecretRandom(c *gin.Context) {
 	locker.RLock()
 	defer locker.RUnlock()
@@ -240,11 +287,28 @@ func convert2DtoNode(node *model.Node, seq int) *dto.Node {
 		"IN": "India",                //  digitalocean
 		"NL": "Netherlands",          //  digitalocean
 	}
+	countryContinents := map[string]string{
+		"BR": "southam",
+		"DE": "eu",
+		"HK": "asia",
+		"JP": "asia",
+		"US": "northam",
+		"UK": "eu",
+		"GB": "eu",
+		"AU": "oce",
+		"CA": "northam",
+		"KR": "asia",
+		"SA": "asia",
+		"SG": "asia",
+		"VN": "asia",
+		"AE": "asia",
+		"BH": "asia",
+		"FR": "eu",
+		"IN": "asia",
+		"NL": "eu",
+	}
 
 	countryLabel := fmt.Sprintf("%s", countryLabels[node.CountryCode])
-	if node.CountryCode == "US" {
-		countryLabel = fmt.Sprintf("%s - %d", countryLabels[node.CountryCode], seq+1)
-	}
 
 	return &dto.Node{
 		Ip:           node.Ip,
@@ -254,5 +318,6 @@ func convert2DtoNode(node *model.Node, seq int) *dto.Node {
 		CountryLabel: countryLabel,
 		Icon:         icons[node.CountryCode],
 		SecretUrl:    fmt.Sprintf("http://v.starttransfernow.com/secret?ip=%s", node.Ip),
+		Continent:    countryContinents[node.CountryCode],
 	}
 }