LumeWeb
/
libs5-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: add kind to interface

This commit is contained in:
Derrick Hammer 2024-01-09 12:49:16 -05:00
parent 1458cbe1d9
commit 799be312e1
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
protocol/base/base.go
View File

@ -14,6 +14,7 @@ type IncomingMessage interface {
IncomingMessage() IncomingMessage IncomingMessage() IncomingMessage
Self() IncomingMessage Self() IncomingMessage
SetSelf(self IncomingMessage) SetSelf(self IncomingMessage)
Kind() int
msgpack.CustomDecoder msgpack.CustomDecoder
} }

3
protocol/hash_query.go
View File

@ -126,6 +126,7 @@ func (h *HashQuery) HandleMessage(node interfaces.Node, peer net.Peer, verifyId
var peers *hashset.Set var peers *hashset.Set
hashString, err := h.hash.ToString() hashString, err := h.hash.ToString()
node.Logger().Debug("HashQuery", zap.Any("hashString", hashString))
if err != nil { if err != nil {
return err return err
} }
@ -147,7 +148,7 @@ func (h *HashQuery) HandleMessage(node interfaces.Node, peer net.Peer, verifyId
for _, val := range node.Services().P2P().Peers().Values() { for _, val := range node.Services().P2P().Peers().Values() {
peerVal := val.(net.Peer) peerVal := val.(net.Peer)
if !peerVal.Id().Equals(peer.Id()) { if !peerVal.Id().Equals(peer.Id()) {
err := peerVal.SendMessage(h.IncomingMessageImpl.Original()) err := peerVal.SendMessage(h.IncomingMessage().Original())
if err != nil { if err != nil {
node.Logger().Error("Failed to send message", zap.Error(err)) node.Logger().Error("Failed to send message", zap.Error(err))
} }

2
protocol/message.go
View File

@ -15,7 +15,7 @@ var (
_ base.IncomingMessage = (*base.IncomingMessageImpl)(nil) _ base.IncomingMessage = (*base.IncomingMessageImpl)(nil)
) )
func init() { func Init() {
messageTypes = sync.Map{} messageTypes = sync.Map{}
// Register factory functions instead of instances // Register factory functions instead of instances

2
protocol/signed/signed.go
View File

@ -10,7 +10,7 @@ var (
messageTypes sync.Map messageTypes sync.Map
) )
func init() { func Init() {
messageTypes = sync.Map{} messageTypes = sync.Map{}
RegisterMessageType(int(types.ProtocolMethodHandshakeDone), func() base.SignedIncomingMessage { RegisterMessageType(int(types.ProtocolMethodHandshakeDone), func() base.SignedIncomingMessage {

4
protocol/signed/signed_message.go
View File

@ -9,6 +9,7 @@ import (
"git.lumeweb.com/LumeWeb/libs5-go/protocol/base" "git.lumeweb.com/LumeWeb/libs5-go/protocol/base"
"git.lumeweb.com/LumeWeb/libs5-go/types" "git.lumeweb.com/LumeWeb/libs5-go/types"
"github.com/vmihailenco/msgpack/v5" "github.com/vmihailenco/msgpack/v5"
"go.uber.org/zap"
"io" "io"
) )
@ -85,7 +86,8 @@ func (s *SignedMessage) HandleMessage(node interfaces.Node, peer net.Peer, verif
return err return err
} }
if msgHandler, valid := GetMessageType(types.ProtocolMethod(payload.kind)); valid { if msgHandler, valid := GetMessageType(payload.kind); valid {
node.Logger().Debug("SignedMessage", zap.Any("type", types.ProtocolMethodMap[types.ProtocolMethod(payload.kind)]))
msgHandler.SetIncomingMessage(s) msgHandler.SetIncomingMessage(s)
msgHandler.SetSelf(msgHandler) msgHandler.SetSelf(msgHandler)
err := msgpack.Unmarshal(payload.message, &msgHandler) err := msgpack.Unmarshal(payload.message, &msgHandler)