yves/meowlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

refactor #2

Browse Source
This commit is contained in:
ycc
2022-12-18 20:36:44 +01:00
parent 8fa4a359b0
commit 1257cb70e7
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
client/message.go
View File

@@ -7,7 +7,7 @@ import (
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
) )
func ProcessOutputUserMessage(peer *Peer, usermessage *meowlib.UserMessage) (*meowlib.PackedUserMessage, error) { func ProcessOutboundUserMessage(peer *Peer, usermessage *meowlib.UserMessage) (*meowlib.PackedUserMessage, error) {
serializedMessage, err := peer.SerializeUserMessage(usermessage) serializedMessage, err := peer.SerializeUserMessage(usermessage)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -31,30 +31,16 @@ func ProcessOutboundTextMessage(peer *Peer, text string, srv *InternalServer) ([
return nil, err return nil, err
} }
// Prepare cyphered + packed user message // Prepare cyphered + packed user message
packedMsg, err := ProcessOutputUserMessage(peer, usermessage) packedMsg, err := ProcessOutboundUserMessage(peer, usermessage)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Creating Server message for transporting the user message // Creating Server message for transporting the user message
toServerMessageBA, err := srv.BuildMessageSendingMessage(packedMsg) toServerMessage := srv.BuildToServerMessageFromUserMessage(packedMsg)
if err != nil {
return nil, err return ProcessOutboundMessage(toServerMessage, srv)
}
// Encrypting it
encToServerMessage, encToServerMessageSignature, err := srv.AsymEncryptMessage(toServerMessageBA)
if err != nil {
return nil, err
}
// Packing it
protoPackedServerMsg, err := srv.PackServerMessage(encToServerMessage, encToServerMessageSignature)
if err != nil {
return nil, err
}
return protoPackedServerMsg, nil
} }
// TODO refactor protobuf to avid 2 methods
func ProcessOutboundMessage(toServerMessage *meowlib.ToServerMessage, srv *InternalServer) ([]byte, error) { func ProcessOutboundMessage(toServerMessage *meowlib.ToServerMessage, srv *InternalServer) ([]byte, error) {
byteToServerMessage, err := proto.Marshal(toServerMessage) byteToServerMessage, err := proto.Marshal(toServerMessage)
if err != nil { if err != nil {
@@ -73,7 +59,7 @@ func ProcessOutboundMessage(toServerMessage *meowlib.ToServerMessage, srv *Inter
return protoPackedServerMsg, nil return protoPackedServerMsg, nil
} }
func ProcessServerResponse(srv *InternalServer, msg []byte) (*meowlib.FromServerMessage, error) { func ProcessInboundServerResponse(srv *InternalServer, msg []byte) (*meowlib.FromServerMessage, error) {
fsmsg := &meowlib.FromServerMessage{} fsmsg := &meowlib.FromServerMessage{}
payload, signature, err := srv.UnPackServerMessage(msg) payload, signature, err := srv.UnPackServerMessage(msg)
if err != nil { if err != nil {
@@ -89,7 +75,7 @@ func ProcessServerResponse(srv *InternalServer, msg []byte) (*meowlib.FromServer
return fsmsg, nil return fsmsg, nil
} }
func ProcessUserMessage(peer *Peer, message []byte, signature []byte) (*meowlib.UserMessage, error) { func ProcessInboundUserMessage(peer *Peer, message []byte, signature []byte) (*meowlib.UserMessage, error) {
dec, err := peer.AsymDecryptMessage(message, signature) dec, err := peer.AsymDecryptMessage(message, signature)
if err != nil { if err != nil {
return nil, err return nil, err