organize models and new modules

This commit is contained in:
2023-09-16 14:27:05 -05:00
parent 489d32ae78
commit 64a3709cac
29 changed files with 240 additions and 120 deletions
+5 -11
View File
@@ -1,12 +1,6 @@
import { Decoders } from '..';
import { Constants } from '../../constants';
import chunk, { Chunk } from '../chunk';
import packetHeaderChunk, { PacketHeaderChunk } from '../packet-header-chunk';
import dataTrackerListChunk, { DataTrackerListChunk } from './data-tracker-list-chunk';
export interface DataPacketChunk extends Chunk {
packet_header: PacketHeaderChunk;
tracker_list: DataTrackerListChunk;
}
import { DataPacketChunk } from '../../models/data/data-packet-chunk';
function decodeDataPacketChunk(dataPacketChunk: DataPacketChunk) {
if (dataPacketChunk.has_subchunks && dataPacketChunk.chunk_data && dataPacketChunk.data_len) {
@@ -15,14 +9,14 @@ function decodeDataPacketChunk(dataPacketChunk: DataPacketChunk) {
const chunkId = dataPacketChunk.chunk_data.readUInt16LE(offset);
switch (chunkId) {
case 0x0000:
dataPacketChunk.packet_header = packetHeaderChunk(dataPacketChunk.chunk_data.subarray(offset));
dataPacketChunk.packet_header = Decoders.PacketHeaderChunk(dataPacketChunk.chunk_data.subarray(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (dataPacketChunk.packet_header?.data_len) {
offset += dataPacketChunk.packet_header.data_len;
}
break;
case 0x0001:
dataPacketChunk.tracker_list = dataTrackerListChunk(dataPacketChunk.chunk_data.subarray(offset));
dataPacketChunk.tracker_list = Decoders.DataTrackerListChunk(dataPacketChunk.chunk_data.subarray(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (dataPacketChunk.tracker_list.data_len) {
offset += dataPacketChunk.tracker_list.data_len;
@@ -35,4 +29,4 @@ function decodeDataPacketChunk(dataPacketChunk: DataPacketChunk) {
}
}
export default (buffer: Buffer): DataPacketChunk => chunk(buffer, decodeDataPacketChunk) as DataPacketChunk;
export default (buffer: Buffer): DataPacketChunk => Decoders.Chunk(buffer, decodeDataPacketChunk) as DataPacketChunk;
+4 -14
View File
@@ -1,22 +1,12 @@
import { Decoders } from '..';
import { Constants } from '../../constants';
import chunk, { Chunk } from '../chunk';
import dataTrackerFieldChunk, { DataTrackerFieldChunk } from './data-tracker-field-chunk';
export interface DataTrackerChunk extends Chunk {
pos: DataTrackerFieldChunk;
speed: DataTrackerFieldChunk;
ori: DataTrackerFieldChunk;
status: DataTrackerFieldChunk;
accel: DataTrackerFieldChunk;
trgtpos: DataTrackerFieldChunk;
timestamp: DataTrackerFieldChunk;
}
import { DataTrackerChunk } from '../../models/data/data-tracker-chunk';
function decodeTrackerChunk(trackerChunk: DataTrackerChunk) {
if (trackerChunk.chunk_data && trackerChunk.data_len) {
let offset = 0;
while (offset < trackerChunk.data_len) {
const trackerFieldChunk = dataTrackerFieldChunk(trackerChunk.chunk_data.subarray(offset));
const trackerFieldChunk = Decoders.DataTrackerFieldChunk(trackerChunk.chunk_data.subarray(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (trackerFieldChunk.data_len) {
offset += trackerFieldChunk.data_len;
@@ -50,4 +40,4 @@ function decodeTrackerChunk(trackerChunk: DataTrackerChunk) {
}
}
export default (buffer: Buffer): DataTrackerChunk => chunk(buffer, decodeTrackerChunk) as DataTrackerChunk;
export default (buffer: Buffer): DataTrackerChunk => Decoders.Chunk(buffer, decodeTrackerChunk) as DataTrackerChunk;
@@ -1,9 +1,7 @@
/* eslint-disable no-case-declarations */
import chunk, { Chunk } from '../chunk';
export interface DataTrackerFieldChunk extends Chunk {
[key: string]: number | bigint | number[] | Buffer | undefined | boolean;
}
import { Decoders } from '..';
import { DataTrackerFieldChunk } from '../../models/data/data-tracker-field-chunk';
function readXYZ(trackerFieldChunk: DataTrackerFieldChunk, prefix: string = '') {
if (trackerFieldChunk.chunk_data) {
@@ -47,4 +45,4 @@ function decodeTrackerFieldChunk(trackerFieldChunk: DataTrackerFieldChunk) {
}
export default (buffer: Buffer): DataTrackerFieldChunk =>
chunk(buffer, decodeTrackerFieldChunk) as DataTrackerFieldChunk;
Decoders.Chunk(buffer, decodeTrackerFieldChunk) as DataTrackerFieldChunk;
+4 -10
View File
@@ -1,12 +1,6 @@
import { Decoders } from '..';
import { Constants } from '../../constants';
import chunk, { Chunk } from '../chunk';
import dataTrackerChunk, { DataTrackerChunk } from './data-tracker-chunk';
export interface DataTrackerListChunk extends Chunk {
trackers: {
[key: number]: DataTrackerChunk;
};
}
import { DataTrackerListChunk } from '../../models/data/data-tracker-list-chunk';
function decodeDataTrackerListChunk(dataTrackerListChunk: DataTrackerListChunk) {
dataTrackerListChunk.trackers = {};
@@ -15,7 +9,7 @@ function decodeDataTrackerListChunk(dataTrackerListChunk: DataTrackerListChunk)
let offset = 0;
if (dataTrackerListChunk.chunk_data) {
while (offset < dataTrackerListChunk.chunk_data.length) {
const trackerChunk = dataTrackerChunk(dataTrackerListChunk.chunk_data.subarray(offset));
const trackerChunk = Decoders.DataTrackerChunk(dataTrackerListChunk.chunk_data.subarray(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (trackerChunk.data_len) {
offset += trackerChunk.data_len;
@@ -27,4 +21,4 @@ function decodeDataTrackerListChunk(dataTrackerListChunk: DataTrackerListChunk)
}
}
export default (buffer: Buffer): DataTrackerListChunk =>
chunk(buffer, decodeDataTrackerListChunk) as DataTrackerListChunk;
Decoders.Chunk(buffer, decodeDataTrackerListChunk) as DataTrackerListChunk;