feat(nnr): update support

update support

Signed-off-by: ysicing <i@ysicing.me>

cmd/nnr/nnr.go

@@ -31,18 +31,18 @@ func NewCmdNNR(f factory.Factory) *cobra.Command {
 	}
 	cmd.AddCommand(listServers(f))
 	cmd.AddCommand(listRules(f))
-	cmd.AddCommand(addRule(f))
-	cmd.AddCommand(delRule(f))
-	cmd.AddCommand(updateRule(f))
+	cmd.AddCommand(listRemoteNode(f))
+	// cmd.AddCommand(addRule(f))
+	// cmd.AddCommand(delRule(f))
+	// cmd.AddCommand(updateRule(f))
 	cmd.PersistentFlags().StringVarP(&token, "token", "t", os.Getenv("NNR_TOKEN"), "token")
 	return cmd
 }
 
 func listServers(f factory.Factory) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "nodes",
-		Aliases: []string{"servers"},
-		Short:   "list servers",
+		Use:   "servers",
+		Short: "list servers",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			api := nnr.New(token)
 			s, err := api.ListServers()
@@ -74,6 +74,12 @@ func listRules(f factory.Factory) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "rules",
 		Short: "list rules",
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			if len(token) == 0 {
+				return fmt.Errorf("token is empty")
+			}
+			return nil
+		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			api := nnr.New(token)
 			servers := api.ServersMap()
@@ -114,6 +120,42 @@ func listRules(f factory.Factory) *cobra.Command {
 	return cmd
 }
 
+func listRemoteNode(f factory.Factory) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:     "nodes",
+		Aliases: []string{"remotes"},
+		Short:   "list remote nodes",
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			if len(token) == 0 {
+				return fmt.Errorf("token is empty")
+			}
+			return nil
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			api := nnr.New(token)
+			s, err := api.SortRemoteNode()
+			if err != nil {
+				return err
+			}
+			if len(s) == 0 {
+				f.GetLog().Infof("no nodes found")
+				return nil
+			}
+			f.GetLog().Infof("found %d node", len(s))
+			sort.Slice(s, func(i, j int) bool {
+				return s[i].Traffic >= s[j].Traffic
+			})
+			table := uitable.New()
+			table.AddRow("远程地址", "流量")
+			for _, index := range s {
+				table.AddRow(index.Remote, util.Traffic(index.Traffic))
+			}
+			return output.EncodeTable(os.Stdout, table)
+		},
+	}
+	return cmd
+}
+
 func addRule(f factory.Factory) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "add",

internal/pkg/nnr/nnr.go

@@ -7,6 +7,8 @@
 package nnr
 
 import (
+	"fmt"
+
 	"github.com/cockroachdb/errors"
 	"github.com/imroc/req/v3"
 	"github.com/ysicing/tiga/common"
@@ -63,3 +65,40 @@ func (o *Option) ListRules() ([]Rule, error) {
 	}
 	return rulesResp.Data, nil
 }
+
+func (o *Option) ListRemoteNode() (map[string]Node, error) {
+	var rulesResp RulesResp
+	_, err := o.SetSuccessResult(&rulesResp).Post("https://nnr.moe/api/rules")
+	if err != nil {
+		return nil, err
+	}
+	if rulesResp.Status != 1 {
+		return nil, errors.New("list rules failed")
+	}
+	mapNodes := make(map[string]Node, 60)
+	for _, rule := range rulesResp.Data {
+		key := fmt.Sprintf("%s:%v", rule.Remote, rule.RPort)
+		if _, ok := mapNodes[key]; ok {
+			node := mapNodes[key]
+			node.Traffic = node.Traffic + rule.Traffic
+			mapNodes[key] = node
+		} else {
+			mapNodes[key] = Node{
+				Remote: key,
+			}
+		}
+	}
+	return mapNodes, nil
+}
+
+func (o *Option) SortRemoteNode() ([]Node, error) {
+	rNodes, err := o.ListRemoteNode()
+	if err != nil {
+		return nil, err
+	}
+	var nodes []Node
+	for _, node := range rNodes {
+		nodes = append(nodes, node)
+	}
+	return nodes, nil
+}

internal/pkg/nnr/types.go

@@ -42,3 +42,28 @@ type RulesResp struct {
 	Status int    `json:"status,omitempty"`
 	Data   []Rule `json:"data,omitempty"`
 }
+
+type Node struct {
+	Traffic int64  `json:"traffic,omitempty"`
+	Remote  string `json:"remote,omitempty"`
+}
+
+type AddRule struct {
+	Sid    string `json:"sid"`
+	Remote string `json:"remote"`
+	RPort  int    `json:"rport"`
+	Type   string `json:"type"`
+	Name   string `json:"name,omitempty"`
+}
+
+type UpdateRule struct {
+	Rid    string `json:"rid"`
+	Remote string `json:"remote"`
+	RPort  int    `json:"rport"`
+	Type   string `json:"type"`
+	Name   string `json:"name,omitempty"`
+}
+
+type GetOrDeleteRule struct {
+	Rid string `json:"rid"`
+}