archive/revsuit
1
0
Fork 0
mirror of https://github.com/Li4n0/revsuit.git synced 2026-09-26 16:41:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

release revsuit vBeta0.1.0 (#15)

Browse Source 
Co-authored-by: E99p1ant <[email protected]>
This commit is contained in:
Li4n0
2021-05-16 12:11:35 +08:00
committed by GitHub
co-authored by E99p1ant
parent b39ee101f9
commit 5b63e90390
98 changed files with 2357 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/rmi/record.go
+13 -4
View File
@@ -46,12 +46,21 @@ func ListRecords(c *gin.Context) {
res []Record
count int64
order = c.Query("order")
pageSize int
)
if c.Query("pageSize") == "" {
pageSize = 10
} else if n, err := strconv.Atoi(c.Query("pageSize")); err == nil {
if n <= 0 || n > 100 {
pageSize = 10
}
}
if err := c.ShouldBind(&rmiRecord); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"error": err.Error(),
"result": nil,
})
return
@@ -75,7 +84,7 @@ func ListRecords(c *gin.Context) {
if err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"error": err.Error(),
"result": nil,
})
return
@@ -85,10 +94,10 @@ func ListRecords(c *gin.Context) {
order = "desc"
}
if err := db.Order("id" + " " + order).Count(&count).Offset((page - 1) * 10).Limit(10).Find(&res).Error; err != nil {
if err := db.Order("id" + " " + order).Count(&count).Offset((page - 1) * pageSize).Limit(pageSize).Find(&res).Error; err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"error": err.Error(),
"data": nil,
})
return
pkg/rmi/rmi.go
+51 -14
View File
@@ -12,13 +12,15 @@ import (
"github.com/li4n0/revsuit/internal/database"
"github.com/li4n0/revsuit/internal/qqwry"
"github.com/li4n0/revsuit/internal/recycler"
"github.com/pkg/errors"
log "unknwon.dev/clog/v2"
)
type Server struct {
Config
rules []*Rule
rulesLock sync.RWMutex
rules []*Rule
rulesLock sync.RWMutex
livingLock sync.Mutex
}
var (
@@ -28,7 +30,7 @@ var (
func GetServer() *Server {
once.Do(func() {
server = &Server{rulesLock: sync.RWMutex{}}
server = &Server{rulesLock: sync.RWMutex{}, livingLock: sync.Mutex{}}
})
return server
}
@@ -43,7 +45,7 @@ func (s *Server) updateRules() error {
db := database.DB.Model(new(Rule))
defer s.rulesLock.Unlock()
s.rulesLock.Lock()
return db.Order("rank desc").Find(&s.rules).Error
return errors.Wrap(db.Order("rank desc").Find(&s.rules).Error, "RMI update rules error")
}
func (s *Server) handleConnection(conn net.Conn) {
@@ -119,29 +121,53 @@ func (s *Server) handleConnection(conn net.Conn) {
if _rule.PushToClient {
if flagGroup != "" {
var count int64
database.DB.Where("rule_name=? and raw like ?", _rule.Name, "%"+flagGroup+"%").Model(&Record{}).Count(&count)
database.DB.Where("rule_name=? and path like ?", _rule.Name, "%"+flagGroup+"%").Model(&Record{}).Count(&count)
if count <= 1 {
r.PushToClient()
log.Trace("RMI record[id%d] has been put to client message queue", r.ID)
log.Trace("RMI record[id:%d, flagGroup:%s] has been put to client message queue", r.ID, flagGroup)
}
} else {
r.PushToClient()
log.Trace("RMI record[id:%d, flag:%s] has been put to client message queue", r.ID, flag)
}
r.PushToClient()
log.Trace("RMI record[id%d] has been put to client message queue", r.ID)
}
//send notice
if _rule.Notice {
go func() {
r.Notice()
log.Trace("RMI record[id%d] notice has been sent", r.ID)
log.Trace("RMI record[id:%d] notice has been sent", r.ID)
}()
}
}
}
func (s *Server) Stop() {
log.Info("RMI Server is stopping...")
s.Enable = false
s.livingLock.Unlock()
}
func (s *Server) Restart() {
s.Enable = false
time.Sleep(time.Second * 2)
go s.Run()
}
func (s *Server) Run() {
s.Enable = true
s.livingLock.Lock()
defer func() {
if s.Enable {
log.Error("RMI Server exited unexpectedly")
}
s.Enable = false
s.livingLock.Unlock()
}()
if err := s.updateRules(); err != nil {
log.Fatal(err.Error())
log.Error(err.Error())
return
}
// run server
@@ -149,16 +175,27 @@ func (s *Server) Run() {
listener, err := net.Listen("tcp", s.Addr)
if err != nil {
log.Fatal(err.Error())
log.Error(err.Error())
return
}
for {
go func() {
s.livingLock.Lock()
if !s.Enable {
_ = listener.Close()
}
}()
for s.Enable {
tcpConn, err := listener.Accept()
if err != nil {
log.Warn("RMI accept connection error: %v", err)
if !strings.Contains(err.Error(), net.ErrClosed.Error()) {
log.Warn("RMI accept connection error: %v", err)
} else {
break
}
continue
}
go s.handleConnection(tcpConn)
}
}
pkg/rmi/rule.go
+32 -23
View File
@@ -10,16 +10,16 @@ import (
log "unknwon.dev/clog/v2"
)
// RMI rule struct
// Rule RMI rule struct
type Rule struct {
rule.BaseRule
rule.BaseRule `yaml:",inline"`
}
func (Rule) TableName() string {
return "rmi_rules"
}
// New rmi rule struct
// NewRule new rmi rule struct
func NewRule(name, flagFormat string, pushToClient, notice bool) *Rule {
return &Rule{
BaseRule: rule.BaseRule{
@@ -31,7 +31,7 @@ func NewRule(name, flagFormat string, pushToClient, notice bool) *Rule {
}
}
// Create or update the rmi rule in database and ruleSet
// CreateOrUpdate creates or updates the rmi rule in database and ruleSet
func (r *Rule) CreateOrUpdate() (err error) {
db := database.DB.Model(r)
err = db.Clauses(clause.OnConflict{
@@ -53,7 +53,7 @@ func (r *Rule) CreateOrUpdate() (err error) {
return err
}
// Delete the rmi rule in database and ruleSet
// Delete deletes the rmi rule in database and ruleSet
func (r *Rule) Delete() (err error) {
db := database.DB.Model(r)
err = db.Delete(r).Error
@@ -65,19 +65,28 @@ func (r *Rule) Delete() (err error) {
return err
}
// List all rmi rules those satisfy the filter
// ListRules lists all rmi rules those satisfy the filter
func ListRules(c *gin.Context) {
var (
rmiRule Rule
res []Rule
count int64
order = c.Query("order")
rmiRule Rule
res []Rule
count int64
order = c.Query("order")
pageSize int
)
if c.Query("pageSize") == "" {
pageSize = 10
} else if n, err := strconv.Atoi(c.Query("pageSize")); err == nil {
if n <= 0 || n > 100 {
pageSize = 10
}
}
if err := c.ShouldBind(&rmiRule); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"error": err.Error(),
"result": nil,
})
return
@@ -93,7 +102,7 @@ func ListRules(c *gin.Context) {
if err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"error": err.Error(),
"result": nil,
})
return
@@ -103,10 +112,10 @@ func ListRules(c *gin.Context) {
order = "desc"
}
if err := db.Order("rank desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * 10).Limit(10).Find(&res).Error; err != nil {
if err := db.Order("rank desc").Order("id" + " " + order).Count(&count).Offset((page - 1) * pageSize).Limit(pageSize).Find(&res).Error; err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"error": err.Error(),
"data": nil,
})
return
@@ -119,7 +128,7 @@ func ListRules(c *gin.Context) {
})
}
// Create or update rmi rule from user submit
// UpsertRules creates or updates rmi rule from user submit
func UpsertRules(c *gin.Context) {
var (
rmiRule Rule
@@ -129,7 +138,7 @@ func UpsertRules(c *gin.Context) {
if err := c.ShouldBind(&rmiRule); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"error": err.Error(),
"data": nil,
})
return
@@ -142,16 +151,16 @@ func UpsertRules(c *gin.Context) {
if err := rmiRule.CreateOrUpdate(); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"error": err.Error(),
"result": nil,
})
return
}
if update {
log.Trace("RMI rule[id%d] has been updated", rmiRule.ID)
log.Trace("RMI rule[id:%d] has been updated", rmiRule.ID)
} else {
log.Trace("RMI rule[id%d] has been created", rmiRule.ID)
log.Trace("RMI rule[id:%d] has been created", rmiRule.ID)
}
c.JSON(200, gin.H{
@@ -161,14 +170,14 @@ func UpsertRules(c *gin.Context) {
})
}
// Delete rmi rule from user submit
// DeleteRules deletes rmi rule from user submit
func DeleteRules(c *gin.Context) {
var rmiRule Rule
if err := c.ShouldBind(&rmiRule); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"error": err.Error(),
"data": nil,
})
return
@@ -177,13 +186,13 @@ func DeleteRules(c *gin.Context) {
if err := rmiRule.Delete(); err != nil {
c.JSON(400, gin.H{
"status": "failed",
"error": err,
"error": err.Error(),
"data": nil,
})
return
}
log.Trace("RMI rule[id%d] has been deleted", rmiRule.ID)
log.Trace("RMI rule[id:%d] has been deleted", rmiRule.ID)
c.JSON(200, gin.H{
"status": "succeed",