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

♻️ Refactored remain modules and make it up and running

Browse Source
This commit is contained in:
LittleSheep
2024-11-02 13:40:37 +08:00
parent 06031620b7
commit 2d05be679d
23 changed files with 82 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/internal/services/accounts.go
View File

@ -1,31 +0,0 @@
package services
import (
"context"
"git.solsynth.dev/hypernet/nexus/pkg/nex"
authm "git.solsynth.dev/hypernet/passport/pkg/authkit/models"
"time"
"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
"github.com/samber/lo"
"git.solsynth.dev/hydrogen/dealer/pkg/proto"
)
func NotifyAccountMessagerBatch(users []authm.Account, notification *proto.NotifyRequest) error {
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
defer cancel()
pc, err := gap.Nx.GetClientGrpcConn(nex.ServiceTypeAuth)
if err != nil {
return err
}
_, err = proto.NewNotifierClient(pc).NotifyUserBatch(ctx, &proto.NotifyUserBatchRequest{
UserId: lo.Map(users, func(item authm.Account, idx int) uint64 {
return uint64(item.ID)
}),
Notify: notification,
})
return err
}

12
pkg/internal/services/calls.go
View File

@ -6,12 +6,12 @@ import (
"fmt"
"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
"git.solsynth.dev/hypernet/nexus/pkg/nex"
"git.solsynth.dev/hypernet/nexus/pkg/nex/cruda"
"git.solsynth.dev/hypernet/passport/pkg/authkit"
authm "git.solsynth.dev/hypernet/passport/pkg/authkit/models"
"git.solsynth.dev/hypernet/pusher/pkg/pushkit"
"time"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
jsoniter "github.com/json-iterator/go"
@ -30,7 +30,6 @@ func ListCall(channel models.Channel, take, offset int) ([]models.Call, error) {
Limit(take).
Offset(offset).
Preload("Founder").
Preload("Founder.Account").
Preload("Channel").
Order("created_at DESC").
Find(&calls).Error; err != nil {
@ -44,11 +43,10 @@ func GetCall(channel models.Channel, id uint) (models.Call, error) {
var call models.Call
if err := database.C.
Where(models.Call{
BaseModel: hyper.BaseModel{ID: id},
BaseModel: cruda.BaseModel{ID: id},
ChannelID: channel.ID,
}).
Preload("Founder").
Preload("Founder.Account").
Preload("Channel").
Order("created_at DESC").
First(&call).Error; err != nil {
@ -125,6 +123,12 @@ func NewCall(channel models.Channel, founder models.ChannelMember) (models.Call,
}
channel, _ = GetChannel(channel.ID)
if channel.RealmID == nil {
realm, err := authkit.GetRealm(gap.Nx, *channel.RealmID)
if err == nil {
channel.Realm = &realm
}
}
err = authkit.NotifyUserBatch(
gap.Nx,

9
pkg/internal/services/channels.go
View File

@ -10,7 +10,6 @@ import (
"github.com/eko/gocache/lib/v4/store"
"regexp"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
"github.com/samber/lo"
@ -46,7 +45,7 @@ func CacheChannelIdentityCache(channel models.Channel, member models.ChannelMemb
)
}
func GetChannelIdentity(alias string, user uint, realm ...models.Realm) (models.Channel, models.ChannelMember, error) {
func GetChannelIdentity(alias string, user uint, realm ...authm.Realm) (models.Channel, models.ChannelMember, error) {
cacheManager := cache.New[any](localCache.S)
marshal := marshaler.New(cacheManager)
contx := context.Background()
@ -93,9 +92,7 @@ func GetChannelAliasAvailability(alias string) error {
func GetChannel(id uint) (models.Channel, error) {
var channel models.Channel
tx := database.C.Where(models.Channel{
BaseModel: hyper.BaseModel{ID: id},
}).Preload("Account").Preload("Realm")
tx := database.C.Where("id = ?", id).Preload("Account").Preload("Realm")
tx = PreloadDirectChannelMembers(tx)
if err := tx.First(&channel).Error; err != nil {
return channel, err
@ -165,7 +162,7 @@ func PreloadDirectChannelMembers(tx *gorm.DB) *gorm.DB {
),
models.ChannelTypeDirect,
)
}).Preload("Members.Account")
})
}
func ListChannel(user *authm.Account, realmId ...uint) ([]models.Channel, error) {

8
pkg/internal/services/encoder.go
View File

@ -1,8 +0,0 @@
package services
import jsoniter "github.com/json-iterator/go"
func EncodeJSONBody(in any) []byte {
out, _ := jsoniter.Marshal(in)
return out
}

17
pkg/internal/services/events.go
View File

@ -4,11 +4,11 @@ import (
"fmt"
"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
"git.solsynth.dev/hypernet/nexus/pkg/nex"
"git.solsynth.dev/hypernet/nexus/pkg/nex/cruda"
"git.solsynth.dev/hypernet/passport/pkg/authkit"
"git.solsynth.dev/hypernet/pusher/pkg/pushkit"
"strings"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
jsoniter "github.com/json-iterator/go"
@ -39,7 +39,6 @@ func ListEvent(channel models.Channel, take int, offset int) ([]models.Event, er
}).Limit(take).Offset(offset).
Order("created_at DESC").
Preload("Sender").
Preload("Sender.Account").
Find(&events).Error; err != nil {
return events, err
} else {
@ -50,12 +49,8 @@ func ListEvent(channel models.Channel, take int, offset int) ([]models.Event, er
func GetEvent(channel models.Channel, id uint) (models.Event, error) {
var event models.Event
if err := database.C.
Where(models.Event{
BaseModel: hyper.BaseModel{ID: id},
ChannelID: channel.ID,
}).
Where("id = ? AND channel_id = ?", id, channel.ID).
Preload("Sender").
Preload("Sender.Account").
First(&event).Error; err != nil {
return event, err
} else {
@ -66,7 +61,7 @@ func GetEvent(channel models.Channel, id uint) (models.Event, error) {
func GetEventWithSender(channel models.Channel, member models.ChannelMember, id uint) (models.Event, error) {
var event models.Event
if err := database.C.Where(models.Event{
BaseModel: hyper.BaseModel{ID: id},
BaseModel: cruda.BaseModel{ID: id},
ChannelID: channel.ID,
SenderID: member.ID,
}).First(&event).Error; err != nil {
@ -98,6 +93,12 @@ func NewEvent(event models.Event) (models.Event, error) {
if strings.HasPrefix(event.Type, "messages") {
event.Channel, _ = GetChannel(event.ChannelID)
if event.Channel.RealmID == nil {
realm, err := authkit.GetRealm(gap.Nx, *event.Channel.RealmID)
if err == nil {
event.Channel.Realm = &realm
}
}
NotifyMessageEvent(members, event)
}

51
pkg/internal/services/mailer.go
View File

@ -1,51 +0,0 @@
package services
import (
"crypto/tls"
"fmt"
"net/smtp"
"net/textproto"
"github.com/jordan-wright/email"
"github.com/spf13/viper"
)
func SendMail(target string, subject string, content string) error {
mail := &email.Email{
To: []string{target},
From: viper.GetString("mailer.name"),
Subject: subject,
Text: []byte(content),
Headers: textproto.MIMEHeader{},
}
return mail.SendWithTLS(
fmt.Sprintf("%s:%d", viper.GetString("mailer.smtp_host"), viper.GetInt("mailer.smtp_port")),
smtp.PlainAuth(
"",
viper.GetString("mailer.username"),
viper.GetString("mailer.password"),
viper.GetString("mailer.smtp_host"),
),
&tls.Config{ServerName: viper.GetString("mailer.smtp_host")},
)
}
func SendMailHTML(target string, subject string, content string) error {
mail := &email.Email{
To: []string{target},
From: viper.GetString("mailer.name"),
Subject: subject,
HTML: []byte(content),
Headers: textproto.MIMEHeader{},
}
return mail.SendWithTLS(
fmt.Sprintf("%s:%d", viper.GetString("mailer.smtp_host"), viper.GetInt("mailer.smtp_port")),
smtp.PlainAuth(
"",
viper.GetString("mailer.username"),
viper.GetString("mailer.password"),
viper.GetString("mailer.smtp_host"),
),
&tls.Config{ServerName: viper.GetString("mailer.smtp_host")},
)
}

79
pkg/internal/services/realms.go
View File

@ -1,79 +0,0 @@
package services
import (
"context"
"git.solsynth.dev/hypernet/nexus/pkg/nex"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hydrogen/dealer/pkg/proto"
"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
"github.com/samber/lo"
"github.com/spf13/viper"
)
func GetRealmWithExtID(id uint) (models.Realm, error) {
var realm models.Realm
pc, err := gap.Nx.GetClientGrpcConn(nex.ServiceTypeAuth)
if err != nil {
return realm, err
}
response, err := proto.NewRealmClient(pc).GetRealm(context.Background(), &proto.LookupRealmRequest{
Id: lo.ToPtr(uint64(id)),
})
if err != nil {
return realm, err
}
prefix := viper.GetString("database.prefix")
rm, err := hyper.LinkRealm(database.C, prefix+"realms", response)
return models.Realm{BaseRealm: rm}, err
}
func GetRealmWithAlias(alias string) (models.Realm, error) {
var realm models.Realm
pc, err := gap.Nx.GetClientGrpcConn(nex.ServiceTypeAuth)
if err != nil {
return realm, err
}
response, err := proto.NewRealmClient(pc).GetRealm(context.Background(), &proto.LookupRealmRequest{
Alias: &alias,
})
if err != nil {
return realm, err
}
prefix := viper.GetString("database.prefix")
rm, err := hyper.LinkRealm(database.C, prefix+"realms", response)
return models.Realm{BaseRealm: rm}, err
}
func GetRealmMember(realmId uint, userId uint) (*proto.RealmMemberInfo, error) {
pc, err := gap.Nx.GetClientGrpcConn(nex.ServiceTypeAuth)
if err != nil {
return nil, err
}
response, err := proto.NewRealmClient(pc).GetRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
RealmId: lo.ToPtr(uint64(realmId)),
UserId: lo.ToPtr(uint64(userId)),
})
if err != nil {
return nil, err
} else {
return response, nil
}
}
func ListRealmMember(realmId uint) ([]*proto.RealmMemberInfo, error) {
pc, err := gap.Nx.GetClientGrpcConn(nex.ServiceTypeAuth)
if err != nil {
return nil, err
}
response, err := proto.NewRealmClient(pc).ListRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
RealmId: lo.ToPtr(uint64(realmId)),
})
if err != nil {
return nil, err
} else {
return response.Data, nil
}
}

9
pkg/internal/services/status.go
View File

@ -3,12 +3,12 @@ package services
import (
"context"
"fmt"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hydrogen/dealer/pkg/proto"
localCache "git.solsynth.dev/hypernet/messaging/pkg/internal/cache"
"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
"git.solsynth.dev/hypernet/nexus/pkg/nex"
"git.solsynth.dev/hypernet/nexus/pkg/proto"
"github.com/eko/gocache/lib/v4/cache"
"github.com/eko/gocache/lib/v4/marshaler"
"github.com/eko/gocache/lib/v4/store"
@ -50,7 +50,6 @@ func SetTypingStatus(channelId uint, userId uint) error {
var channel models.Channel
if err := database.C.
Preload("Members").
Preload("Members.Account").
Where("id = ?", channelId).
First(&channel).Error; err != nil {
return fmt.Errorf("channel not found: %v", err)
@ -77,10 +76,10 @@ func SetTypingStatus(channelId uint, userId uint) error {
)
}
sc := proto.NewStreamControllerClient(gap.Nx.GetNexusGrpcConn())
sc := proto.NewStreamServiceClient(gap.Nx.GetNexusGrpcConn())
_, err := sc.PushStreamBatch(context.Background(), &proto.PushStreamBatchRequest{
UserId: broadcastTarget,
Body: hyper.NetworkPackage{
Body: nex.WebSocketPackage{
Action: "status.typing",
Payload: data,
}.Marshal(),

6
pkg/internal/services/websocket.go
View File

@ -7,8 +7,8 @@ import (
"github.com/samber/lo"
"git.solsynth.dev/hydrogen/dealer/pkg/proto"
"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
"git.solsynth.dev/hypernet/nexus/pkg/proto"
)
func PushCommand(userId uint, task nex.WebSocketPackage) {
@ -16,7 +16,7 @@ func PushCommand(userId uint, task nex.WebSocketPackage) {
defer cancel()
pc := gap.Nx.GetNexusGrpcConn()
_, _ = proto.NewStreamControllerClient(pc).PushStream(ctx, &proto.PushStreamRequest{
_, _ = proto.NewStreamServiceClient(pc).PushStream(ctx, &proto.PushStreamRequest{
UserId: lo.ToPtr(uint64(userId)),
Body: task.Marshal(),
})
@ -27,7 +27,7 @@ func PushCommandBatch(userId []uint64, task nex.WebSocketPackage) {
defer cancel()
pc := gap.Nx.GetNexusGrpcConn()
_, _ = proto.NewStreamControllerClient(pc).PushStreamBatch(ctx, &proto.PushStreamBatchRequest{
_, _ = proto.NewStreamServiceClient(pc).PushStreamBatch(ctx, &proto.PushStreamBatchRequest{
UserId: userId,
Body: task.Marshal(),
})