github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

chore: change message type

pull/1604/head
Noah Hsu 2022-08-14 03:05:30 +08:00
parent fe0dee1196
commit 8cd05275f0
4 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/bootstrap/data/dev.go
View File

@ -37,9 +37,9 @@ func initDevData() {
func initDevDo() { func initDevDo() {
if flags.Dev { if flags.Dev {
go func() { go func() {
err := message.GetMessenger().WaitSend(map[string]string{ err := message.GetMessenger().WaitSend(message.Message{
"type": "dev", Type: "string",
"msg": "dev mode", Content: "dev mode",
}, 10) }, 10)
if err != nil { if err != nil {
log.Debugf("%+v", err) log.Debugf("%+v", err)

28
internal/message/post.go → internal/message/http.go
View File

@ -8,16 +8,16 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
type Post struct { type Http struct {
Received chan string // received messages from web Received chan string // received messages from web
ToSend chan interface{} // messages to send to web ToSend chan Message // messages to send to web
} }
type Req struct { type Req struct {
Message string `json:"message" form:"message"` Message string `json:"message" form:"message"`
} }
func (p *Post) GetHandle(c *gin.Context) { func (p *Http) GetHandle(c *gin.Context) {
select { select {
case message := <-p.ToSend: case message := <-p.ToSend:
common.SuccessResp(c, message) common.SuccessResp(c, message)
@ -26,7 +26,7 @@ func (p *Post) GetHandle(c *gin.Context) {
} }
} }
func (p *Post) SendHandle(c *gin.Context) { func (p *Http) SendHandle(c *gin.Context) {
var req Req var req Req
if err := c.ShouldBind(&req); err != nil { if err := c.ShouldBind(&req); err != nil {
common.ErrorResp(c, err, 400) common.ErrorResp(c, err, 400)
@ -36,20 +36,20 @@ func (p *Post) SendHandle(c *gin.Context) {
case p.Received <- req.Message: case p.Received <- req.Message:
common.SuccessResp(c) common.SuccessResp(c)
default: default:
common.ErrorStrResp(c, "send failed", 500) common.ErrorStrResp(c, "nowhere needed", 500)
} }
} }
func (p *Post) Send(data interface{}) error { func (p *Http) Send(message Message) error {
select { select {
case p.ToSend <- data: case p.ToSend <- message:
return nil return nil
default: default:
return errors.New("send failed") return errors.New("send failed")
} }
} }
func (p *Post) Receive() (string, error) { func (p *Http) Receive() (string, error) {
select { select {
case message := <-p.Received: case message := <-p.Received:
return message, nil return message, nil
@ -58,16 +58,16 @@ func (p *Post) Receive() (string, error) {
} }
} }
func (p *Post) WaitSend(data interface{}, d int) error { func (p *Http) WaitSend(message Message, d int) error {
select { select {
case p.ToSend <- data: case p.ToSend <- message:
return nil return nil
case <-time.After(time.Duration(d) * time.Second): case <-time.After(time.Duration(d) * time.Second):
return errors.New("send timeout") return errors.New("send timeout")
} }
} }
func (p *Post) WaitReceive(d int) (string, error) { func (p *Http) WaitReceive(d int) (string, error) {
select { select {
case message := <-p.Received: case message := <-p.Received:
return message, nil return message, nil
@ -76,7 +76,7 @@ func (p *Post) WaitReceive(d int) (string, error) {
} }
} }
var PostInstance = &Post{ var HttpInstance = &Http{
Received: make(chan string), Received: make(chan string),
ToSend: make(chan interface{}), ToSend: make(chan Message),
} }

11
internal/message/message.go
View File

@ -1,12 +1,17 @@
package message package message
type Message struct {
Type string `json:"type"`
Content interface{} `json:"content"`
}
type Messenger interface { type Messenger interface {
Send(interface{}) error Send(Message) error
Receive() (string, error) Receive() (string, error)
WaitSend(interface{}, int) error WaitSend(Message, int) error
WaitReceive(int) (string, error) WaitReceive(int) (string, error)
} }
func GetMessenger() Messenger { func GetMessenger() Messenger {
return PostInstance return HttpInstance
} }

4
server/router.go
View File

@ -101,8 +101,8 @@ func admin(g *gin.RouterGroup) {
task.POST("/copy/clear_done", handles.ClearDoneCopyTasks) task.POST("/copy/clear_done", handles.ClearDoneCopyTasks)
ms := g.Group("/message") ms := g.Group("/message")
ms.GET("/get", message.PostInstance.GetHandle) ms.POST("/get", message.HttpInstance.GetHandle)
ms.POST("/send", message.PostInstance.SendHandle) ms.POST("/send", message.HttpInstance.SendHandle)
} }
func fs(g *gin.RouterGroup) { func fs(g *gin.RouterGroup) {