Buriburizaemon/V2bX
1
0
Fork 0
mirror of https://github.com/wyx2685/V2bX.git synced 2026-02-04 04:30:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into master

Browse Source
This commit is contained in:
Yuzuki
2023-07-29 19:20:24 +08:00
committed by GitHub
parent 04cbd2e955 6c1ef37f8a
commit 78ee16a505
50 changed files with 1505 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
node/cert.go
View File

@@ -2,20 +2,22 @@ package node
import (
"fmt"
"github.com/Yuzuki616/V2bX/common/file"
"github.com/Yuzuki616/V2bX/node/lego"
"log"
log "github.com/sirupsen/logrus"
)
func (c *Controller) renewCertTask() error {
l, err := lego.New(c.CertConfig)
if err != nil {
log.Print("new lego error: ", err)
log.WithField("tag", c.tag).Info("new lego error: ", err)
return nil
}
err = l.RenewCert()
if err != nil {
log.Print("renew cert error: ", err)
log.WithField("tag", c.tag).Info("renew cert error: ", err)
return nil
}
return nil
}

15
node/controller.go
View File

@@ -27,15 +27,15 @@ type Controller struct {
renewCertPeriodic *task.Task
dynamicSpeedLimitPeriodic *task.Task
onlineIpReportPeriodic *task.Task
*conf.ControllerConfig
*conf.Options
}
// NewController return a Node controller with default parameters.
func NewController(server vCore.Core, api *panel.Client, config *conf.ControllerConfig) *Controller {
func NewController(server vCore.Core, api *panel.Client, config *conf.Options) *Controller {
controller := &Controller{
server: server,
ControllerConfig: config,
apiClient: api,
server: server,
Options: config,
apiClient: api,
}
return controller
}
@@ -72,13 +72,13 @@ func (c *Controller) Start() error {
}
}
// Add new tag
err = c.server.AddNode(c.tag, node, c.ControllerConfig)
err = c.server.AddNode(c.tag, node, c.Options)
if err != nil {
return fmt.Errorf("add new node error: %s", err)
}
added, err := c.server.AddUsers(&vCore.AddUsersParams{
Tag: c.tag,
Config: c.ControllerConfig,
Config: c.Options,
UserInfo: c.userList,
NodeInfo: node,
})
@@ -88,6 +88,7 @@ func (c *Controller) Start() error {
log.WithField("tag", c.tag).Infof("Added %d new users", added)
c.info = node
c.startTasks(node)
c.info = node
return nil
}

3
node/node.go
View File

@@ -2,6 +2,7 @@ package node
import (
"fmt"
"github.com/Yuzuki616/V2bX/api/panel"
"github.com/Yuzuki616/V2bX/conf"
vCore "github.com/Yuzuki616/V2bX/core"
@@ -23,7 +24,7 @@ func (n *Node) Start(nodes []*conf.NodeConfig, core vCore.Core) error {
return err
}
// Register controller service
n.controllers[i] = NewController(core, p, c.ControllerConfig)
n.controllers[i] = NewController(core, p, c.Options)
err = n.controllers[i].Start()
if err != nil {
return fmt.Errorf("start node controller [%s-%s-%d] error: %s",

7
node/task.go
View File

@@ -100,7 +100,7 @@ func (c *Controller) nodeInfoMonitor() (err error) {
}
}
// add new node
err = c.server.AddNode(c.tag, newNodeInfo, c.ControllerConfig)
err = c.server.AddNode(c.tag, newNodeInfo, c.Options)
if err != nil {
log.WithFields(log.Fields{
"tag": c.tag,
@@ -110,7 +110,7 @@ func (c *Controller) nodeInfoMonitor() (err error) {
}
_, err = c.server.AddUsers(&vCore.AddUsersParams{
Tag: c.tag,
Config: c.ControllerConfig,
Config: c.Options,
UserInfo: c.userList,
NodeInfo: newNodeInfo,
})
@@ -169,7 +169,8 @@ func (c *Controller) nodeInfoMonitor() (err error) {
// have added users
_, err = c.server.AddUsers(&vCore.AddUsersParams{
Tag: c.tag,
Config: c.ControllerConfig,
Config: c.Options,
NodeInfo: c.info,
UserInfo: added,
})
if err != nil {