align structure more with underlying chunk layout

src/models/data/data-packet-chunk.ts

@@ -2,7 +2,12 @@ import { Chunk } from '../chunk';
 import { PacketHeaderChunk } from '../packet-header-chunk';
 import { DataTrackerListChunk } from './data-tracker-list-chunk';
 
-export interface DataPacketChunk extends Chunk {
-  packet_header: PacketHeaderChunk;
-  tracker_list: DataTrackerListChunk;
+export interface DataPacketChunkData {
+  packetHeader?: PacketHeaderChunk;
+  trackerList?: DataTrackerListChunk;
+}
+
+export interface DataPacketChunk {
+  chunk: Chunk;
+  data: DataPacketChunkData;
 }

src/models/data/data-tracker-chunk.ts

@@ -1,12 +1,19 @@
 import { Chunk } from '../chunk';
-import { DataTrackerFieldChunk } from './data-tracker-field-chunk';
+import { DataTrackerStatusChunk } from './data-tracker-status-chunk';
+import { DataTrackerTimestampChunk } from './data-tracker-timestamp-chunk';
+import { DataTrackerXYZChunk } from './data-tracker-xyz-chunk';
 
-export interface DataTrackerChunk extends Chunk {
-  pos?: DataTrackerFieldChunk;
-  speed?: DataTrackerFieldChunk;
-  ori?: DataTrackerFieldChunk;
-  status?: DataTrackerFieldChunk;
-  accel?: DataTrackerFieldChunk;
-  trgtpos?: DataTrackerFieldChunk;
-  timestamp?: DataTrackerFieldChunk;
+export interface DataTrackerChunkData {
+  pos?: DataTrackerXYZChunk;
+  speed?: DataTrackerXYZChunk;
+  ori?: DataTrackerXYZChunk;
+  status?: DataTrackerStatusChunk;
+  accel?: DataTrackerXYZChunk;
+  trgtpos?: DataTrackerXYZChunk;
+  timestamp?: DataTrackerTimestampChunk;
+}
+
+export interface DataTrackerChunk {
+  chunk: Chunk;
+  data: DataTrackerChunkData;
 }

src/models/data/data-tracker-field-chunk.ts

@@ -1,5 +0,0 @@
-import { Chunk } from '../chunk';
-
-export interface DataTrackerFieldChunk extends Chunk {
-  [key: string]: number | bigint | number[] | Uint8Array | undefined | boolean;
-}

src/models/data/data-tracker-list-chunk.ts

@@ -1,8 +1,11 @@
 import { Chunk } from '../chunk';
 import { DataTrackerChunk } from './data-tracker-chunk';
 
-export interface DataTrackerListChunk extends Chunk {
-  trackers: {
-    [key: number]: DataTrackerChunk;
-  };
+export interface DataTrackerListChunkData {
+  trackers: DataTrackerChunk[];
+}
+
+export interface DataTrackerListChunk {
+  chunk: Chunk;
+  data: DataTrackerListChunkData;
 }

src/models/data/data-tracker-status-chunk.ts

@@ -0,0 +1,10 @@
+import { Chunk } from '../chunk';
+
+export interface DataTrackerStatusChunkData {
+  validity: number;
+}
+
+export interface DataTrackerStatusChunk {
+  chunk: Chunk;
+  data: DataTrackerStatusChunkData;
+}

src/models/data/data-tracker-timestamp-chunk.ts

@@ -0,0 +1,10 @@
+import { Chunk } from '../chunk';
+
+export interface DataTrackerTimestampChunkData {
+  timestamp: bigint;
+}
+
+export interface DataTrackerTimestampChunk {
+  chunk: Chunk;
+  data: DataTrackerTimestampChunkData;
+}

src/models/data/data-tracker-xyz-chunk.ts

@@ -0,0 +1,12 @@
+import { Chunk } from '../chunk';
+
+export interface DataTrackerXYZChunkData {
+  x: number;
+  y: number;
+  z: number;
+}
+
+export interface DataTrackerXYZChunk {
+  chunk: Chunk;
+  data: DataTrackerXYZChunkData;
+}