feat: post messenger

refactor/fs
Noah Hsu 2022-07-01 16:53:01 +08:00
parent a6e5edcf53
commit e3891246b9
6 changed files with 120 additions and 4 deletions

View File

@ -7,5 +7,6 @@ func InitData() {
initSettings()
if args.Dev {
initDevData()
initDevDo()
}
}

View File

@ -2,7 +2,9 @@ package data
import (
"context"
"github.com/alist-org/alist/v3/cmd/args"
"github.com/alist-org/alist/v3/internal/db"
"github.com/alist-org/alist/v3/internal/message"
"github.com/alist-org/alist/v3/internal/model"
"github.com/alist-org/alist/v3/internal/operations"
log "github.com/sirupsen/logrus"
@ -30,3 +32,23 @@ func initDevData() {
log.Fatalf("failed to create user: %+v", err)
}
}
func initDevDo() {
if args.Dev {
go func() {
err := message.GetMessenger().WaitSend(map[string]string{
"type": "dev",
"msg": "dev mode",
}, 10)
if err != nil {
log.Debugf("%+v", err)
}
m, err := message.GetMessenger().WaitReceive(10)
if err != nil {
log.Debugf("%+v", err)
} else {
log.Debugf("received: %+v", m)
}
}()
}
}

View File

@ -1,8 +1,12 @@
package message
type Messenger interface {
Send(string, interface{}) error
WaitSend(string, interface{}) error
Receive(string) (string, error)
WaitReceive(string) (string, error)
Send(interface{}) error
Receive() (string, error)
WaitSend(interface{}, int) error
WaitReceive(int) (string, error)
}
func GetMessenger() Messenger {
return PostInstance
}

81
internal/message/post.go Normal file
View File

@ -0,0 +1,81 @@
package message
import (
"github.com/alist-org/alist/v3/server/common"
"github.com/gin-gonic/gin"
"github.com/pkg/errors"
"time"
)
type Post struct {
Received chan string // received messages from web
ToSend chan interface{} // messages to send to web
}
type Req struct {
Message string `json:"message" form:"message"`
}
func (p *Post) GetHandle(c *gin.Context) {
select {
case message := <-p.ToSend:
common.SuccessResp(c, message)
default:
common.ErrorStrResp(c, "no message", 404)
}
}
func (p *Post) SendHandle(c *gin.Context) {
var req Req
if err := c.ShouldBind(&req); err != nil {
common.ErrorResp(c, err, 400)
return
}
select {
case p.Received <- req.Message:
common.SuccessResp(c)
default:
common.ErrorStrResp(c, "send failed", 500)
}
}
func (p *Post) Send(data interface{}) error {
select {
case p.ToSend <- data:
return nil
default:
return errors.New("send failed")
}
}
func (p *Post) Receive() (string, error) {
select {
case message := <-p.Received:
return message, nil
default:
return "", errors.New("receive failed")
}
}
func (p *Post) WaitSend(data interface{}, d int) error {
select {
case p.ToSend <- data:
return nil
case <-time.After(time.Duration(d) * time.Second):
return errors.New("send timeout")
}
}
func (p *Post) WaitReceive(d int) (string, error) {
select {
case message := <-p.Received:
return message, nil
case <-time.After(time.Duration(d) * time.Second):
return "", errors.New("receive timeout")
}
}
var PostInstance = &Post{
Received: make(chan string),
ToSend: make(chan interface{}),
}

3
internal/message/ws.go Normal file
View File

@ -0,0 +1,3 @@
package message
// TODO websocket implementation

View File

@ -2,6 +2,7 @@ package server
import (
"github.com/alist-org/alist/v3/internal/conf"
"github.com/alist-org/alist/v3/internal/message"
"github.com/alist-org/alist/v3/server/common"
"github.com/alist-org/alist/v3/server/controllers"
"github.com/alist-org/alist/v3/server/middlewares"
@ -68,6 +69,10 @@ func Init(r *gin.Engine) {
task.GET("/copy/done", controllers.DoneCopyTask)
task.POST("/copy/cancel", controllers.CancelCopyTask)
ms := admin.Group("/message")
ms.GET("/get", message.PostInstance.GetHandle)
ms.POST("/send", message.PostInstance.SendHandle)
// guest can
public := api.Group("/public")
public.GET("/settings", controllers.PublicSettings)