update

initial support for hysteria
update config
update api
change user email format
...

node/cert.go

@@ -0,0 +1,31 @@
+package node
+
+import (
+	"fmt"
+	"github.com/Yuzuki616/V2bX/common/file"
+	"github.com/Yuzuki616/V2bX/node/lego"
+)
+
+func (c *Controller) requestCert() error {
+	if c.CertConfig.CertFile == "" || c.CertConfig.KeyFile == "" {
+		return fmt.Errorf("cert file path or key file path not exist")
+	}
+	switch c.CertConfig.CertMode {
+	case "reality", "none", "":
+		return nil
+	case "dns", "http":
+		if file.IsExist(c.CertConfig.CertFile) && file.IsExist(c.CertConfig.KeyFile) {
+			return nil
+		}
+		l, err := lego.New(c.CertConfig)
+		if err != nil {
+			return fmt.Errorf("create lego object error: %s", err)
+		}
+		err = l.CreateCert()
+		if err != nil {
+			return fmt.Errorf("create cert error: %s", err)
+		}
+		return nil
+	}
+	return fmt.Errorf("unsupported certmode: %s", c.CertConfig.CertMode)
+}

node/controller.go

@@ -44,15 +44,15 @@ func (c *Controller) Start() error {
 	var err error
 	c.nodeInfo, err = c.apiClient.GetNodeInfo()
 	if err != nil {
-		return fmt.Errorf("get node info failed: %s", err)
+		return fmt.Errorf("get node info error: %s", err)
 	}
 	// Update user
 	c.userList, err = c.apiClient.GetUserList()
 	if err != nil {
-		return fmt.Errorf("get user list failed: %s", err)
+		return fmt.Errorf("get user list error: %s", err)
 	}
 	if len(c.userList) == 0 {
-		return errors.New("add users failed: not have any user")
+		return errors.New("add users error: not have any user")
 	}
 	c.Tag = c.buildNodeTag()
 
@@ -61,13 +61,19 @@ func (c *Controller) Start() error {
 	// add rule limiter
 	if !c.DisableGetRule {
 		if err = l.UpdateRule(c.nodeInfo.Rules); err != nil {
-			log.Printf("Update rule filed: %s", err)
+			return fmt.Errorf("update rule error: %s", err)
+		}
+	}
+	if c.nodeInfo.Tls {
+		err = c.requestCert()
+		if err != nil {
+			return fmt.Errorf("request cert error: %s", err)
 		}
 	}
 	// Add new tag
 	err = c.server.AddNode(c.Tag, c.nodeInfo, c.ControllerConfig)
 	if err != nil {
-		return fmt.Errorf("add new tag failed: %s", err)
+		return fmt.Errorf("add new node error: %s", err)
 	}
 	added, err := c.server.AddUsers(&vCore.AddUsersParams{
 		Tag:      c.Tag,
@@ -75,10 +81,10 @@ func (c *Controller) Start() error {
 		UserInfo: c.userList,
 		NodeInfo: c.nodeInfo,
 	})
-	log.Printf("[%s: %d] Added %d new users", c.nodeInfo.NodeType, c.nodeInfo.NodeId, added)
 	if err != nil {
-		return err
+		return fmt.Errorf("add users error: %s", err)
 	}
+	log.Printf("[%s: %d] Added %d new users", c.nodeInfo.Type, c.nodeInfo.Id, added)
 	c.initTask()
 	return nil
 }
@@ -89,36 +95,36 @@ func (c *Controller) Close() error {
 	if c.nodeInfoMonitorPeriodic != nil {
 		err := c.nodeInfoMonitorPeriodic.Close()
 		if err != nil {
-			log.Panicf("node info periodic close failed: %s", err)
+			return fmt.Errorf("node info periodic close error: %s", err)
 		}
 	}
 	if c.nodeInfoMonitorPeriodic != nil {
 		err := c.userReportPeriodic.Close()
 		if err != nil {
-			log.Panicf("user report periodic close failed: %s", err)
+			return fmt.Errorf("user report periodic close error: %s", err)
 		}
 	}
 	if c.renewCertPeriodic != nil {
 		err := c.renewCertPeriodic.Close()
 		if err != nil {
-			log.Panicf("renew cert periodic close failed: %s", err)
+			return fmt.Errorf("renew cert periodic close error: %s", err)
 		}
 	}
 	if c.dynamicSpeedLimitPeriodic != nil {
 		err := c.dynamicSpeedLimitPeriodic.Close()
 		if err != nil {
-			log.Panicf("dynamic speed limit periodic close failed: %s", err)
+			return fmt.Errorf("dynamic speed limit periodic close error: %s", err)
 		}
 	}
 	if c.onlineIpReportPeriodic != nil {
 		err := c.onlineIpReportPeriodic.Close()
 		if err != nil {
-			log.Panicf("online ip report periodic close failed: %s", err)
+			return fmt.Errorf("online ip report periodic close error: %s", err)
 		}
 	}
 	return nil
 }
 
 func (c *Controller) buildNodeTag() string {
-	return fmt.Sprintf("%s_%s_%d", c.nodeInfo.NodeType, c.ListenIP, c.nodeInfo.NodeId)
+	return fmt.Sprintf("%s_%s_%d", c.nodeInfo.Type, c.ListenIP, c.nodeInfo.Id)
 }

node/lego/cert.go

@@ -78,7 +78,7 @@ func (l *Lego) CheckCert(file []byte) (bool, error) {
 	}
 	return true, nil
 }
-func (l *Lego) parseParmas(path string) string {
+func (l *Lego) parseParams(path string) string {
 	r := strings.NewReplacer("{domain}", l.config.CertDomain,
 		"{email}", l.config.Email)
 	return r.Replace(path)
@@ -88,7 +88,7 @@ func (l *Lego) writeCert(certificates *certificate.Resource) error {
 	if err != nil {
 		return fmt.Errorf("check path error: %s", err)
 	}
-	err = os.WriteFile(l.parseParmas(l.config.CertFile), certificates.Certificate, 0644)
+	err = os.WriteFile(l.parseParams(l.config.CertFile), certificates.Certificate, 0644)
 	if err != nil {
 		return err
 	}
@@ -96,7 +96,7 @@ func (l *Lego) writeCert(certificates *certificate.Resource) error {
 	if err != nil {
 		return fmt.Errorf("check path error: %s", err)
 	}
-	err = os.WriteFile(l.parseParmas(l.config.KeyFile), certificates.PrivateKey, 0644)
+	err = os.WriteFile(l.parseParams(l.config.KeyFile), certificates.PrivateKey, 0644)
 	if err != nil {
 		return err
 	}

node/task.go

@@ -4,13 +4,11 @@ import (
 	"fmt"
 	"log"
 	"runtime"
-	"strconv"
 	"time"
 
 	vCore "github.com/Yuzuki616/V2bX/core"
 
 	"github.com/Yuzuki616/V2bX/api/panel"
-	"github.com/Yuzuki616/V2bX/common/builder"
 	"github.com/Yuzuki616/V2bX/limiter"
 	"github.com/Yuzuki616/V2bX/node/lego"
 	"github.com/xtls/xray-core/common/task"
@@ -19,33 +17,33 @@ import (
 func (c *Controller) initTask() {
 	// fetch node info task
 	c.nodeInfoMonitorPeriodic = &task.Periodic{
-		Interval: c.nodeInfo.BaseConfig.PullInterval.(time.Duration),
+		Interval: c.nodeInfo.PullInterval,
 		Execute:  c.nodeInfoMonitor,
 	}
 	// fetch user list task
 	c.userReportPeriodic = &task.Periodic{
-		Interval: c.nodeInfo.BaseConfig.PushInterval.(time.Duration),
+		Interval: c.nodeInfo.PushInterval,
 		Execute:  c.reportUserTraffic,
 	}
-	log.Printf("[%s: %d] Start monitor node status", c.nodeInfo.NodeType, c.nodeInfo.NodeId)
+	log.Printf("[%s: %d] Start monitor node status", c.nodeInfo.Type, c.nodeInfo.Id)
 	// delay to start nodeInfoMonitor
 	go func() {
-		time.Sleep(c.nodeInfo.BaseConfig.PullInterval.(time.Duration))
+		time.Sleep(c.nodeInfo.PullInterval)
 		_ = c.nodeInfoMonitorPeriodic.Start()
 	}()
-	log.Printf("[%s: %d] Start report node status", c.nodeInfo.NodeType, c.nodeInfo.NodeId)
+	log.Printf("[%s: %d] Start report node status", c.nodeInfo.Type, c.nodeInfo.Id)
 	// delay to start userReport
 	go func() {
-		time.Sleep(c.nodeInfo.BaseConfig.PushInterval.(time.Duration))
+		time.Sleep(c.nodeInfo.PullInterval)
 		_ = c.userReportPeriodic.Start()
 	}()
-	if c.nodeInfo.Tls != 0 && c.CertConfig.CertMode != "none" &&
+	if c.nodeInfo.Tls && c.CertConfig.CertMode != "none" &&
 		(c.CertConfig.CertMode == "dns" || c.CertConfig.CertMode == "http") {
 		c.renewCertPeriodic = &task.Periodic{
 			Interval: time.Hour * 24,
 			Execute:  c.reportUserTraffic,
 		}
-		log.Printf("[%s: %d] Start renew cert", c.nodeInfo.NodeType, c.nodeInfo.NodeId)
+		log.Printf("[%s: %d] Start renew cert", c.nodeInfo.Type, c.nodeInfo.Id)
 		// delay to start renewCert
 		go func() {
 			_ = c.renewCertPeriodic.Start()
@@ -80,6 +78,12 @@ func (c *Controller) nodeInfoMonitor() (err error) {
 			log.Print(err)
 			return nil
 		}
+		if newNodeInfo.Tls {
+			err = c.requestCert()
+			if err != nil {
+				return fmt.Errorf("request cert error: %s", err)
+			}
+		}
 		nodeInfoChanged = true
 	}
 	// Update User
@@ -93,8 +97,10 @@ func (c *Controller) nodeInfoMonitor() (err error) {
 		// Add new Limiter
 		l := limiter.AddLimiter(c.Tag, &c.LimitConfig, newUserInfo)
 		_, err = c.server.AddUsers(&vCore.AddUsersParams{
-			Tag:    c.Tag,
-			Config: c.ControllerConfig,
+			Tag:      c.Tag,
+			Config:   c.ControllerConfig,
+			UserInfo: newUserInfo,
+			NodeInfo: newNodeInfo,
 		})
 		if err != nil {
 			log.Print(err)
@@ -105,18 +111,18 @@ func (c *Controller) nodeInfoMonitor() (err error) {
 			log.Printf("Update Rule error: %s", err)
 		}
 		// Check interval
-		if c.nodeInfoMonitorPeriodic.Interval != newNodeInfo.BaseConfig.PullInterval.(time.Duration) &&
-			newNodeInfo.BaseConfig.PullInterval.(time.Duration) != 0 {
-			c.nodeInfoMonitorPeriodic.Interval = newNodeInfo.BaseConfig.PullInterval.(time.Duration)
+		if c.nodeInfoMonitorPeriodic.Interval != newNodeInfo.PullInterval &&
+			newNodeInfo.PullInterval != 0 {
+			c.nodeInfoMonitorPeriodic.Interval = newNodeInfo.PullInterval
 			_ = c.nodeInfoMonitorPeriodic.Close()
 			go func() {
 				time.Sleep(c.nodeInfoMonitorPeriodic.Interval)
 				_ = c.nodeInfoMonitorPeriodic.Start()
 			}()
 		}
-		if c.userReportPeriodic.Interval != newNodeInfo.BaseConfig.PushInterval.(time.Duration) &&
-			newNodeInfo.BaseConfig.PushInterval.(time.Duration) != 0 {
-			c.userReportPeriodic.Interval = newNodeInfo.BaseConfig.PullInterval.(time.Duration)
+		if c.userReportPeriodic.Interval != newNodeInfo.PushInterval &&
+			newNodeInfo.PushInterval != 0 {
+			c.userReportPeriodic.Interval = newNodeInfo.PullInterval
 			_ = c.userReportPeriodic.Close()
 			go func() {
 				time.Sleep(c.userReportPeriodic.Interval)
@@ -156,46 +162,18 @@ func (c *Controller) nodeInfoMonitor() (err error) {
 				log.Print("update limiter:", err)
 			}
 		}
-		log.Printf("[%s: %d] %d user deleted, %d user added", c.nodeInfo.NodeType, c.nodeInfo.NodeId,
+		log.Printf("[%s: %d] %d user deleted, %d user added", c.nodeInfo.Type, c.nodeInfo.Id,
 			len(deleted), len(added))
 		c.userList = newUserInfo
 	}
 	return nil
 }
 
-func compareUserList(old, new []panel.UserInfo) (deleted, added []panel.UserInfo) {
-	tmp := map[string]struct{}{}
-	tmp2 := map[string]struct{}{}
-	for i := range old {
-		tmp[old[i].Uuid+strconv.Itoa(old[i].SpeedLimit)] = struct{}{}
-	}
-	l := len(tmp)
-	for i := range new {
-		e := new[i].Uuid + strconv.Itoa(new[i].SpeedLimit)
-		tmp[e] = struct{}{}
-		tmp2[e] = struct{}{}
-		if l != len(tmp) {
-			added = append(added, new[i])
-			l++
-		}
-	}
-	tmp = nil
-	l = len(tmp2)
-	for i := range old {
-		tmp2[old[i].Uuid+strconv.Itoa(old[i].SpeedLimit)] = struct{}{}
-		if l != len(tmp2) {
-			deleted = append(deleted, old[i])
-			l++
-		}
-	}
-	return deleted, added
-}
-
 func (c *Controller) reportUserTraffic() (err error) {
 	// Get User traffic
 	userTraffic := make([]panel.UserTraffic, 0)
 	for i := range c.userList {
-		up, down := c.server.GetUserTraffic(builder.BuildUserTag(c.Tag, &c.userList[i]), true)
+		up, down := c.server.GetUserTraffic(c.Tag, c.userList[i].Uuid, true)
 		if up > 0 || down > 0 {
 			if c.LimitConfig.EnableDynamicSpeedLimit {
 				c.userList[i].Traffic += up + down
@@ -211,7 +189,7 @@ func (c *Controller) reportUserTraffic() (err error) {
 		if err != nil {
 			log.Printf("Report user traffic faild: %s", err)
 		} else {
-			log.Printf("[%s: %d] Report %d online users", c.nodeInfo.NodeType, c.nodeInfo.NodeId, len(userTraffic))
+			log.Printf("[%s: %d] Report %d online users", c.nodeInfo.Type, c.nodeInfo.Id, len(userTraffic))
 		}
 	}
 	userTraffic = nil
@@ -222,12 +200,12 @@ func (c *Controller) reportUserTraffic() (err error) {
 func (c *Controller) RenewCert() {
 	l, err := lego.New(c.CertConfig)
 	if err != nil {
-		log.Print(err)
+		log.Print("new lego error: ", err)
 		return
 	}
 	err = l.RenewCert()
 	if err != nil {
-		log.Print(err)
+		log.Print("renew cert error: ", err)
 		return
 	}
 }

node/user.go

@@ -0,0 +1,34 @@
+package node
+
+import (
+	"github.com/Yuzuki616/V2bX/api/panel"
+	"strconv"
+)
+
+func compareUserList(old, new []panel.UserInfo) (deleted, added []panel.UserInfo) {
+	tmp := map[string]struct{}{}
+	tmp2 := map[string]struct{}{}
+	for i := range old {
+		tmp[old[i].Uuid+strconv.Itoa(old[i].SpeedLimit)] = struct{}{}
+	}
+	l := len(tmp)
+	for i := range new {
+		e := new[i].Uuid + strconv.Itoa(new[i].SpeedLimit)
+		tmp[e] = struct{}{}
+		tmp2[e] = struct{}{}
+		if l != len(tmp) {
+			added = append(added, new[i])
+			l++
+		}
+	}
+	tmp = nil
+	l = len(tmp2)
+	for i := range old {
+		tmp2[old[i].Uuid+strconv.Itoa(old[i].SpeedLimit)] = struct{}{}
+		if l != len(tmp2) {
+			deleted = append(deleted, old[i])
+			l++
+		}
+	}
+	return deleted, added
+}