move types out of decoders package

This commit is contained in:
2025-10-17 15:27:33 -05:00
parent 7dd6d45a08
commit 7b1dc4bfd6
54 changed files with 558 additions and 490 deletions
+48 -46
View File
@@ -4,13 +4,15 @@ import (
"fmt"
"reflect"
"testing"
"github.com/jwetzell/psn-go/internal/chunks"
)
func TestGoodDataPacketChunkDecoding(t *testing.T) {
testCases := []struct {
description string
bytes []byte
expected DataPacketChunk
expected chunks.DataPacketChunk
}{
{
description: "DataPacketChunk",
@@ -20,25 +22,25 @@ func TestGoodDataPacketChunkDecoding(t *testing.T) {
0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 3, 0, 4, 0, 0, 0, 128, 63, 4, 0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64,
0, 0, 64, 64, 5, 0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 6, 0, 8, 0, 210, 2, 150, 73, 0, 0, 0, 0,
},
expected: DataPacketChunk{
Chunk: Chunk{
expected: chunks.DataPacketChunk{
Chunk: chunks.Chunk{
ChunkData: []byte{
0, 0, 12, 0, 210, 2, 150, 73, 0, 0, 0, 0, 2, 3, 1, 123, 1, 0, 104, 128, 1, 0, 100, 128, 0, 0, 12, 0, 0, 0,
128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 1, 0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 2, 0, 12, 0, 0, 0,
128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 3, 0, 4, 0, 0, 0, 128, 63, 4, 0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0,
64, 64, 5, 0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 6, 0, 8, 0, 210, 2, 150, 73, 0, 0, 0, 0,
},
Header: ChunkHeader{
Header: chunks.ChunkHeader{
DataLen: 124, Id: 26453, HasSubchunks: true,
},
},
Data: DataPacketChunkData{
PacketHeader: &PacketHeaderChunk{
Chunk: Chunk{
Data: chunks.DataPacketChunkData{
PacketHeader: &chunks.PacketHeaderChunk{
Chunk: chunks.Chunk{
ChunkData: []byte{210, 2, 150, 73, 0, 0, 0, 0, 2, 3, 1, 123},
Header: ChunkHeader{DataLen: 12, Id: 0, HasSubchunks: false},
Header: chunks.ChunkHeader{DataLen: 12, Id: 0, HasSubchunks: false},
},
Data: PacketHeaderChunkData{
Data: chunks.PacketHeaderChunkData{
PacketTimestamp: 1234567890,
VersionHigh: 2,
VersionLow: 3,
@@ -46,99 +48,99 @@ func TestGoodDataPacketChunkDecoding(t *testing.T) {
FramePacketCount: 123,
},
},
TrackerList: &DataTrackerListChunk{
Chunk: Chunk{
TrackerList: &chunks.DataTrackerListChunk{
Chunk: chunks.Chunk{
ChunkData: []byte{
1, 0, 100, 128, 0, 0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 1, 0, 12, 0, 0, 0, 128, 63, 0, 0,
0, 64, 0, 0, 64, 64, 2, 0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 3, 0, 4, 0, 0, 0, 128, 63, 4,
0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 5, 0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64,
6, 0, 8, 0, 210, 2, 150, 73, 0, 0, 0, 0,
},
Header: ChunkHeader{DataLen: 104, Id: 1, HasSubchunks: true},
Header: chunks.ChunkHeader{DataLen: 104, Id: 1, HasSubchunks: true},
},
Data: DataTrackerListChunkData{
Trackers: []DataTrackerChunk{
DataTrackerChunk{
Chunk: Chunk{
Data: chunks.DataTrackerListChunkData{
Trackers: []chunks.DataTrackerChunk{
chunks.DataTrackerChunk{
Chunk: chunks.Chunk{
ChunkData: []byte{
0, 0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 1, 0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0,
0, 64, 64, 2, 0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 3, 0, 4, 0, 0, 0, 128, 63, 4, 0,
12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64, 5, 0, 12, 0, 0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64,
64, 6, 0, 8, 0, 210, 2, 150, 73, 0, 0, 0, 0,
},
Header: ChunkHeader{DataLen: 100, Id: 1, HasSubchunks: true},
Header: chunks.ChunkHeader{DataLen: 100, Id: 1, HasSubchunks: true},
},
Data: DataTrackerChunkData{
Pos: &DataTrackerXYZChunk{
Chunk: Chunk{
Data: chunks.DataTrackerChunkData{
Pos: &chunks.DataTrackerXYZChunk{
Chunk: chunks.Chunk{
ChunkData: []byte{0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64},
Header: ChunkHeader{DataLen: 12, Id: 0, HasSubchunks: false},
Header: chunks.ChunkHeader{DataLen: 12, Id: 0, HasSubchunks: false},
},
Data: DataTrackerXYZChunkData{
Data: chunks.DataTrackerXYZChunkData{
X: 1.0,
Y: 2.0,
Z: 3.0,
},
},
Speed: &DataTrackerXYZChunk{
Chunk: Chunk{
Speed: &chunks.DataTrackerXYZChunk{
Chunk: chunks.Chunk{
ChunkData: []byte{0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64},
Header: ChunkHeader{DataLen: 12, Id: 1, HasSubchunks: false},
Header: chunks.ChunkHeader{DataLen: 12, Id: 1, HasSubchunks: false},
},
Data: DataTrackerXYZChunkData{
Data: chunks.DataTrackerXYZChunkData{
X: 1.0,
Y: 2.0,
Z: 3.0,
},
},
Ori: &DataTrackerXYZChunk{
Chunk: Chunk{
Ori: &chunks.DataTrackerXYZChunk{
Chunk: chunks.Chunk{
ChunkData: []byte{0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64},
Header: ChunkHeader{DataLen: 12, Id: 2, HasSubchunks: false},
Header: chunks.ChunkHeader{DataLen: 12, Id: 2, HasSubchunks: false},
},
Data: DataTrackerXYZChunkData{
Data: chunks.DataTrackerXYZChunkData{
X: 1.0,
Y: 2.0,
Z: 3.0,
},
},
Status: &DataTrackerStatusChunk{
Chunk: Chunk{
Status: &chunks.DataTrackerStatusChunk{
Chunk: chunks.Chunk{
ChunkData: []byte{0, 0, 128, 63},
Header: ChunkHeader{DataLen: 4, Id: 3, HasSubchunks: false},
Header: chunks.ChunkHeader{DataLen: 4, Id: 3, HasSubchunks: false},
},
Data: DataTrackerStatusChunkData{
Data: chunks.DataTrackerStatusChunkData{
Validity: 1.0,
},
},
Accel: &DataTrackerXYZChunk{
Chunk: Chunk{
Accel: &chunks.DataTrackerXYZChunk{
Chunk: chunks.Chunk{
ChunkData: []byte{0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64},
Header: ChunkHeader{DataLen: 12, Id: 4, HasSubchunks: false},
Header: chunks.ChunkHeader{DataLen: 12, Id: 4, HasSubchunks: false},
},
Data: DataTrackerXYZChunkData{
Data: chunks.DataTrackerXYZChunkData{
X: 1.0,
Y: 2.0,
Z: 3.0,
},
},
TrgtPos: &DataTrackerXYZChunk{
Chunk: Chunk{
TrgtPos: &chunks.DataTrackerXYZChunk{
Chunk: chunks.Chunk{
ChunkData: []byte{0, 0, 128, 63, 0, 0, 0, 64, 0, 0, 64, 64},
Header: ChunkHeader{DataLen: 12, Id: 5, HasSubchunks: false},
Header: chunks.ChunkHeader{DataLen: 12, Id: 5, HasSubchunks: false},
},
Data: DataTrackerXYZChunkData{
Data: chunks.DataTrackerXYZChunkData{
X: 1.0,
Y: 2.0,
Z: 3.0,
},
},
Timestamp: &DataTrackerTimestampChunk{
Chunk: Chunk{
Timestamp: &chunks.DataTrackerTimestampChunk{
Chunk: chunks.Chunk{
ChunkData: []byte{210, 2, 150, 73, 0, 0, 0, 0},
Header: ChunkHeader{DataLen: 8, Id: 6, HasSubchunks: false},
Header: chunks.ChunkHeader{DataLen: 8, Id: 6, HasSubchunks: false},
},
Data: DataTrackerTimestampChunkData{
Data: chunks.DataTrackerTimestampChunkData{
Timestamp: 1234567890,
},
},