From b848b89536a7a4d84261a4b4d0ad373a78dab9d6 Mon Sep 17 00:00:00 2001 From: Alexander Zavorotynskiy Date: Tue, 21 Jun 2022 11:11:33 +0200 Subject: [PATCH] feat(backend): removed not necessary message type --- backend/pkg/messages/batch.go | 15 ++------------ backend/pkg/messages/facade.go | 36 --------------------------------- backend/pkg/messages/trigger.go | 35 -------------------------------- 3 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 backend/pkg/messages/trigger.go diff --git a/backend/pkg/messages/batch.go b/backend/pkg/messages/batch.go index fe283d25d..2d531c429 100644 --- a/backend/pkg/messages/batch.go +++ b/backend/pkg/messages/batch.go @@ -1,11 +1,8 @@ package messages import ( - "fmt" - "io" - "strings" - "github.com/pkg/errors" + "io" ) func ReadBatchReader(reader io.Reader, messageHandler func(Message)) error { @@ -16,15 +13,7 @@ func ReadBatchReader(reader io.Reader, messageHandler func(Message)) error { if err == io.EOF { return nil } else if err != nil { - if strings.HasPrefix(err.Error(), "Unknown message code:") { - code := strings.TrimPrefix(err.Error(), "Unknown message code: ") - msg, err = DecodeExtraMessage(code, reader) - if err != nil { - return fmt.Errorf("can't decode msg: %s", err) - } - } else { - return errors.Wrapf(err, "Batch Message decoding error on message with index %v", index) - } + return errors.Wrapf(err, "Batch Message decoding error on message with index %v", index) } msg = transformDeprecated(msg) diff --git a/backend/pkg/messages/facade.go b/backend/pkg/messages/facade.go index 5c024f2f6..ebc9e7983 100644 --- a/backend/pkg/messages/facade.go +++ b/backend/pkg/messages/facade.go @@ -1,41 +1,5 @@ package messages -import ( - "bytes" - //"io" -) - func Encode(msg Message) []byte { return msg.Encode() } - -// -// func EncodeList(msgs []Message) []byte { - -// } -// - -// func Decode(b []byte) (Message, error) { -// return ReadMessage(bytes.NewReader(b)) -// } - -// func DecodeEach(b []byte, callback func(Message)) error { -// var err error -// reader := bytes.NewReader(b) -// for { -// msg, err := ReadMessage(reader) -// if err != nil { -// break -// } -// callback(msg) -// } -// if err == io.EOF { -// return nil -// } -// return err -// } - -func GetMessageTypeID(b []byte) (uint64, error) { - reader := bytes.NewReader(b) - return ReadUint(reader) -} diff --git a/backend/pkg/messages/trigger.go b/backend/pkg/messages/trigger.go deleted file mode 100644 index 0fe33340e..000000000 --- a/backend/pkg/messages/trigger.go +++ /dev/null @@ -1,35 +0,0 @@ -package messages - -import ( - "fmt" - "io" -) - -type SessionFinished struct { - message - Timestamp uint64 -} - -func (msg *SessionFinished) Encode() []byte { - buf := make([]byte, 11) - buf[0] = 127 - p := 1 - p = WriteUint(msg.Timestamp, buf, p) - return buf[:p] -} - -func (msg *SessionFinished) TypeID() int { - return 127 -} - -func DecodeExtraMessage(code string, reader io.Reader) (Message, error) { - var err error - if code != "127" { - return nil, fmt.Errorf("unknown message code: %s", code) - } - trigger := &SessionFinished{} - if trigger.Timestamp, err = ReadUint(reader); err != nil { - return nil, fmt.Errorf("can't read message timestamp: %s", err) - } - return trigger, nil -}