HyperNet/Messaging
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ Basic realtime text command

Browse Source
This commit is contained in:
LittleSheep
2024-03-30 17:10:36 +08:00
parent 23989f98b6
commit d5093d7b9c
15 changed files with 304 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/database/migrator.go
View File

@ -10,6 +10,7 @@ func RunMigration(source *gorm.DB) error {
&models.Account{},
&models.Channel{},
&models.ChannelMember{},
&models.Message{},
&models.Attachment{},
); err != nil {
return err

13
pkg/models/channels.go
View File

@ -1,12 +1,23 @@
package models
type ChannelType = uint8
const (
ChannelTypeDirect = ChannelType(iota)
ChannelTypeRealm
)
type Channel struct {
BaseModel
Alias string `json:"alias" gorm:"uniqueIndex"`
Name string `json:"name"`
Description string `json:"description"`
Members []ChannelMember `json:"members"`
Messages []Message `json:"messages"`
Type ChannelType `json:"type"`
AccountID uint `json:"account_id"`
RealmID uint `json:"realm_id"`
}
type ChannelMember struct {
@ -16,4 +27,6 @@ type ChannelMember struct {
AccountID uint `json:"account_id"`
Channel Channel `json:"channel"`
Account Account `json:"account"`
Messages []Message `json:"messages" gorm:"foreignKey:SenderID"`
}

21
pkg/models/messages.go Normal file
View File

@ -0,0 +1,21 @@
package models
import "gorm.io/datatypes"
type MessageType = uint8
const (
MessageTypeText = MessageType(iota)
MessageTypeAudio
MessageTypeFile
)
type Message struct {
BaseModel
Content string `json:"content"`
Metadata datatypes.JSONMap `json:"metadata"`
Type MessageType `json:"type"`
ChannelID uint `json:"channel_id"`
SenderID uint `json:"sender_id"`
}

21
pkg/models/unified.go Normal file
View File

@ -0,0 +1,21 @@
package models
import jsoniter "github.com/json-iterator/go"
type UnifiedCommand struct {
Action string `json:"w"`
Message string `json:"m"`
Payload any `json:"p"`
}
func UnifiedCommandFromError(err error) UnifiedCommand {
return UnifiedCommand{
Action: "error",
Message: err.Error(),
}
}
func (v UnifiedCommand) Marshal() []byte {
data, _ := jsoniter.Marshal(v)
return data
}

8
pkg/models/utils.go Normal file
View File

@ -0,0 +1,8 @@
package models
import jsoniter "github.com/json-iterator/go"
func FitStruct(src any, out any) {
raw, _ := jsoniter.Marshal(src)
_ = jsoniter.Unmarshal(raw, out)
}

4
pkg/server/channel_members_api.go
View File

@ -44,7 +44,7 @@ func inviteChannel(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
if err := services.InviteChannelMember(account, channel); err != nil {
if err := services.AddChannelMember(account, channel); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
} else {
return c.SendStatus(fiber.StatusOK)
@ -78,7 +78,7 @@ func kickChannel(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
if err := services.KickChannelMember(account, channel); err != nil {
if err := services.RemoveChannelMember(account, channel); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
} else {
return c.SendStatus(fiber.StatusOK)

9
pkg/server/channels_api.go
View File

@ -53,11 +53,9 @@ func listAvailableChannel(c *fiber.Ctx) error {
func createChannel(c *fiber.Ctx) error {
user := c.Locals("principal").(models.Account)
if user.PowerLevel < 10 {
return fiber.NewError(fiber.StatusForbidden, "require power level 10 to create channels")
}
var data struct {
Alias string `json:"alias" validate:"required,min=4,max=32"`
Name string `json:"name" validate:"required"`
Description string `json:"description"`
}
@ -66,7 +64,7 @@ func createChannel(c *fiber.Ctx) error {
return err
}
channel, err := services.NewChannel(user, data.Name, data.Description)
channel, err := services.NewChannel(user, data.Alias, data.Name, data.Description)
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}
@ -79,6 +77,7 @@ func editChannel(c *fiber.Ctx) error {
id, _ := c.ParamsInt("channelId", 0)
var data struct {
Alias string `json:"alias" validate:"required,min=4,max=32"`
Name string `json:"name" validate:"required"`
Description string `json:"description"`
}
@ -95,7 +94,7 @@ func editChannel(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
channel, err := services.EditChannel(channel, data.Name, data.Description)
channel, err := services.EditChannel(channel, data.Alias, data.Name, data.Description)
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}

3
pkg/server/startup.go
View File

@ -2,6 +2,7 @@ package server
import (
"git.solsynth.dev/hydrogen/messaging/pkg"
"github.com/gofiber/contrib/websocket"
"github.com/gofiber/fiber/v2/middleware/favicon"
"net/http"
"strings"
@ -86,6 +87,8 @@ func NewServer() {
channels.Put("/:channelId", authMiddleware, editChannel)
channels.Delete("/:channelId", authMiddleware, deleteChannel)
}
api.Get("/unified", authMiddleware, websocket.New(unifiedGateway))
}
A.Use(favicon.New(favicon.Config{

49
pkg/server/unified_ws.go Normal file
View File

@ -0,0 +1,49 @@
package server
import (
"git.solsynth.dev/hydrogen/messaging/pkg/models"
"git.solsynth.dev/hydrogen/messaging/pkg/services"
"github.com/gofiber/contrib/websocket"
jsoniter "github.com/json-iterator/go"
)
func unifiedGateway(c *websocket.Conn) {
user := c.Locals("principal").(models.Account)
// Push connection
connectionIdx := len(services.WsConn)
services.WsConn[user.ID] = append(services.WsConn[user.ID], c)
// Event loop
var task models.UnifiedCommand
var messageType int
var packet []byte
var err error
for {
if messageType, packet, err = c.ReadMessage(); err != nil {
break
} else if err := jsoniter.Unmarshal(packet, &task); err != nil {
_ = c.WriteMessage(messageType, models.UnifiedCommand{
Action: "error",
Message: "unable to unmarshal your command, requires json request",
}.Marshal())
continue
}
message := services.DealCommand(task, user)
if message != nil {
if err = c.WriteMessage(messageType, message.Marshal()); err != nil {
break
}
}
}
// Pop connection
services.WsConn[user.ID] = append(
services.WsConn[user.ID][:connectionIdx],
services.WsConn[user.ID][connectionIdx+1:]...,
)
}

7
pkg/services/auth.go
View File

@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"reflect"
"time"
"git.solsynth.dev/hydrogen/identity/pkg/grpc/proto"
@ -37,6 +38,7 @@ func LinkAccount(userinfo *proto.Userinfo) (models.Account, error) {
return account, err
}
prev := account
account.Name = userinfo.Name
account.Nick = userinfo.Nick
account.Avatar = userinfo.Avatar
@ -44,7 +46,10 @@ func LinkAccount(userinfo *proto.Userinfo) (models.Account, error) {
account.Description = userinfo.GetDescription()
account.EmailAddress = userinfo.Email
err := database.C.Save(&account).Error
var err error
if !reflect.DeepEqual(account, prev) {
err = database.C.Save(&account).Error
}
return account, err
}

28
pkg/services/channels.go
View File

@ -1,11 +1,29 @@
package services
import (
"fmt"
"git.solsynth.dev/hydrogen/messaging/pkg/database"
"git.solsynth.dev/hydrogen/messaging/pkg/models"
"github.com/samber/lo"
)
func GetAvailableChannel(id uint, user models.Account) (models.Channel, models.ChannelMember, error) {
var member models.ChannelMember
var channel models.Channel
if err := database.C.Where("id = ?", id).First(&channel).Error; err != nil {
return channel, member, err
}
if err := database.C.Where(models.ChannelMember{
AccountID: user.ID,
ChannelID: channel.ID,
}).First(&member).Error; err != nil {
return channel, member, fmt.Errorf("channel principal not found: %v", err.Error())
}
return channel, member, nil
}
func ListChannel() ([]models.Channel, error) {
var channels []models.Channel
if err := database.C.Find(&channels).Error; err != nil {
@ -44,8 +62,9 @@ func ListChannelIsAvailable(user models.Account) ([]models.Channel, error) {
return channels, nil
}
func NewChannel(user models.Account, name, description string) (models.Channel, error) {
func NewChannel(user models.Account, alias, name, description string) (models.Channel, error) {
channel := models.Channel{
Alias: alias,
Name: name,
Description: description,
AccountID: user.ID,
@ -72,7 +91,7 @@ func ListChannelMember(channelId uint) ([]models.ChannelMember, error) {
return members, nil
}
func InviteChannelMember(user models.Account, target models.Channel) error {
func AddChannelMember(user models.Account, target models.Channel) error {
member := models.ChannelMember{
ChannelID: target.ID,
AccountID: user.ID,
@ -83,7 +102,7 @@ func InviteChannelMember(user models.Account, target models.Channel) error {
return err
}
func KickChannelMember(user models.Account, target models.Channel) error {
func RemoveChannelMember(user models.Account, target models.Channel) error {
var member models.ChannelMember
if err := database.C.Where(&models.ChannelMember{
@ -96,7 +115,8 @@ func KickChannelMember(user models.Account, target models.Channel) error {
return database.C.Delete(&member).Error
}
func EditChannel(channel models.Channel, name, description string) (models.Channel, error) {
func EditChannel(channel models.Channel, alias, name, description string) (models.Channel, error) {
channel.Alias = alias
channel.Name = name
channel.Description = description

43
pkg/services/connections.go Normal file
View File

@ -0,0 +1,43 @@
package services
import (
"git.solsynth.dev/hydrogen/messaging/pkg/models"
"github.com/gofiber/contrib/websocket"
"github.com/samber/lo"
)
var WsConn = make(map[uint][]*websocket.Conn)
func CheckOnline(user models.Account) bool {
return len(WsConn[user.ID]) > 0
}
func PushCommand(userId uint, task models.UnifiedCommand) {
for _, conn := range WsConn[userId] {
_ = conn.WriteMessage(1, task.Marshal())
}
}
func DealCommand(task models.UnifiedCommand, user models.Account) *models.UnifiedCommand {
switch task.Action {
case "messages.send.text":
var req struct {
ChannelID uint `json:"channel_id"`
Content string `json:"content"`
}
models.FitStruct(task.Payload, &req)
if channel, member, err := GetAvailableChannel(req.ChannelID, user); err != nil {
return lo.ToPtr(models.UnifiedCommandFromError(err))
} else if _, err = NewTextMessage(req.Content, member, channel); err != nil {
return lo.ToPtr(models.UnifiedCommandFromError(err))
} else {
return nil
}
default:
return &models.UnifiedCommand{
Action: "error",
Message: "command not found",
}
}
}

32
pkg/services/messages.go Normal file
View File

@ -0,0 +1,32 @@
package services
import (
"git.solsynth.dev/hydrogen/messaging/pkg/database"
"git.solsynth.dev/hydrogen/messaging/pkg/models"
)
func NewTextMessage(content string, sender models.ChannelMember, channel models.Channel) (models.Message, error) {
message := models.Message{
Content: content,
Metadata: nil,
ChannelID: channel.ID,
SenderID: sender.ID,
Type: models.MessageTypeText,
}
var members []models.ChannelMember
if err := database.C.Save(&message).Error; err != nil {
return message, err
} else if err = database.C.Where(models.ChannelMember{
ChannelID: channel.ID,
}).Find(&members).Error; err == nil {
for _, member := range members {
PushCommand(member.ID, models.UnifiedCommand{
Action: "messages.new",
Payload: message,
})
}
}
return message, nil
}