jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove message index from mob file (#1213)

Browse source 
* feat(backend): removed message index from mob file messages

* feat(backend): remove duplicated messages (by message index)

* feat(backend): added MAX_INDEX at the begining of session to indicate a new version of mob file

* feat(backend): added comments to code
This commit is contained in:
Alexander 2023-04-26 12:33:51 +02:00 • committed by GitHub
parent 564d562269
commit 44d550ca3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
backend/pkg/messages/session-iterator.go
View file

@ -9,13 +9,20 @@ import (
)
type msgInfo struct {
index uint64
start int64
end int64
index uint64
start int64
end int64
body Message
msgType uint64
}
func (m *msgInfo) Print() string {
return fmt.Sprintf("index: %d, start: %d, end: %d, type: %d, body: %s", m.index, m.start, m.end, m.msgType, m.body)
}
func SplitMessages(data []byte) ([]*msgInfo, error) {
messages := make([]*msgInfo, 0)
indexes := make(map[uint64]bool)
reader := NewBytesReader(data)
for {
// Get message start
@ -29,7 +36,7 @@ func SplitMessages(data []byte) ([]*msgInfo, error) {
if err != nil {
if err != io.EOF {
log.Println(reader.Pointer(), msgStart)
return nil, fmt.Errorf("read message index err: %s", err)
return messages, fmt.Errorf("read message index err: %s", err)
}
return messages, nil
}
@ -37,20 +44,28 @@ func SplitMessages(data []byte) ([]*msgInfo, error) {
// Read message type
msgType, err := reader.ReadUint()
if err != nil {
return nil, fmt.Errorf("read message type err: %s", err)
return messages, fmt.Errorf("read message type err: %s", err)
}
// Read message body
_, err = ReadMessage(msgType, reader)
body, err := ReadMessage(msgType, reader)
if err != nil {
return nil, fmt.Errorf("read message body err: %s", err)
return messages, fmt.Errorf("read message body err: %s", err)
}
if _, ok := indexes[msgIndex]; ok {
log.Printf("duplicate message index: %d", msgIndex)
continue
}
indexes[msgIndex] = true
// Add new message info to messages slice
messages = append(messages, &msgInfo{
index: msgIndex,
start: msgStart,
end: reader.Pointer(),
index: msgIndex,
start: msgStart,
end: reader.Pointer(),
body: body,
msgType: msgType,
})
}
}
@ -64,8 +79,11 @@ func SortMessages(messages []*msgInfo) []*msgInfo {
func MergeMessages(data []byte, messages []*msgInfo) []byte {
sortedSession := bytes.NewBuffer(make([]byte, 0, len(data)))
// Add maximum possible index value to the start of the session to inform player about new version of mob file
sortedSession.Write([]byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff})
for _, info := range messages {
sortedSession.Write(data[info.start:info.end])
// Write message without index (that's why we use +8)
sortedSession.Write(data[info.start+8 : info.end])
}
return sortedSession.Bytes()
}