jwetzell/psn-js
1
0
Fork 0
mirror of https://github.com/jwetzell/psn-js.git synced 2026-08-16 04:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace NodeJS buffer with Uint8Array

Browse Source
This commit is contained in:
Joel Wetzell
2024-10-23 16:38:16 -05:00
parent 90e1bd09a0
commit 4eaedcdfaa
34 changed files with 235 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/decoders/chunk.ts
+5 -4
View File
@@ -1,17 +1,18 @@
import { Chunk } from '../models/chunk';
export default (buffer: Buffer, dataDecoder: Function): Chunk => {
export default (buffer: Uint8Array, dataDecoder: Function): Chunk => {
let offset = 0;
const view = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
const chunk: Chunk = {};
chunk.id = buffer.readUInt16LE(offset);
chunk.id = view.getUint16(offset, true);
offset += 2;
// NOTE(jwetzell): this data is split up as 1 bit for has_subchunks and 15 bits for the data_len
const combinedLengthAndFlag = buffer.readUInt16LE(offset);
const combinedLengthAndFlag = view.getUint16(offset, true);
chunk.has_subchunks = combinedLengthAndFlag > 32768;
chunk.data_len = chunk.has_subchunks ? combinedLengthAndFlag - 32768 : combinedLengthAndFlag;
offset += 2;
chunk.chunk_data = buffer.subarray(offset, offset + chunk.data_len);
chunk.chunk_data = buffer.slice(offset, offset + chunk.data_len);
dataDecoder(chunk);
return chunk;
src/decoders/data/data-packet-chunk.ts
+10 -4
View File
@@ -6,17 +6,22 @@ function decodeDataPacketChunk(dataPacketChunk: DataPacketChunk) {
if (dataPacketChunk.has_subchunks && dataPacketChunk.chunk_data && dataPacketChunk.data_len) {
let offset = 0;
while (offset < dataPacketChunk.data_len) {
const chunkId = dataPacketChunk.chunk_data.readUInt16LE(offset);
const view = new DataView(
dataPacketChunk.chunk_data.buffer,
dataPacketChunk.chunk_data.byteOffset,
dataPacketChunk.chunk_data.byteLength
);
const chunkId = view.getUint16(offset, true);
switch (chunkId) {
case 0x0000:
dataPacketChunk.packet_header = Decoders.PacketHeaderChunk(dataPacketChunk.chunk_data.subarray(offset));
dataPacketChunk.packet_header = Decoders.PacketHeaderChunk(dataPacketChunk.chunk_data.slice(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (dataPacketChunk.packet_header?.data_len) {
offset += dataPacketChunk.packet_header.data_len;
}
break;
case 0x0001:
dataPacketChunk.tracker_list = Decoders.DataTrackerListChunk(dataPacketChunk.chunk_data.subarray(offset));
dataPacketChunk.tracker_list = Decoders.DataTrackerListChunk(dataPacketChunk.chunk_data.slice(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (dataPacketChunk.tracker_list.data_len) {
offset += dataPacketChunk.tracker_list.data_len;
@@ -29,4 +34,5 @@ function decodeDataPacketChunk(dataPacketChunk: DataPacketChunk) {
}
}
export default (buffer: Buffer): DataPacketChunk => Decoders.Chunk(buffer, decodeDataPacketChunk) as DataPacketChunk;
export default (buffer: Uint8Array): DataPacketChunk =>
Decoders.Chunk(buffer, decodeDataPacketChunk) as DataPacketChunk;
src/decoders/data/data-tracker-chunk.ts
+2 -2
View File
@@ -6,7 +6,7 @@ function decodeTrackerChunk(trackerChunk: DataTrackerChunk) {
if (trackerChunk.chunk_data && trackerChunk.data_len) {
let offset = 0;
while (offset < trackerChunk.data_len) {
const trackerFieldChunk = Decoders.DataTrackerFieldChunk(trackerChunk.chunk_data.subarray(offset));
const trackerFieldChunk = Decoders.DataTrackerFieldChunk(trackerChunk.chunk_data.slice(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (trackerFieldChunk.data_len) {
offset += trackerFieldChunk.data_len;
@@ -40,4 +40,4 @@ function decodeTrackerChunk(trackerChunk: DataTrackerChunk) {
}
}
export default (buffer: Buffer): DataTrackerChunk => Decoders.Chunk(buffer, decodeTrackerChunk) as DataTrackerChunk;
export default (buffer: Uint8Array): DataTrackerChunk => Decoders.Chunk(buffer, decodeTrackerChunk) as DataTrackerChunk;
src/decoders/data/data-tracker-field-chunk.ts
+21 -6
View File
@@ -5,9 +5,14 @@ import { DataTrackerFieldChunk } from '../../models/data/data-tracker-field-chun
function readXYZ(trackerFieldChunk: DataTrackerFieldChunk, prefix: string = '') {
if (trackerFieldChunk.chunk_data) {
trackerFieldChunk[`${prefix}x`] = trackerFieldChunk.chunk_data.readFloatLE(0);
trackerFieldChunk[`${prefix}y`] = trackerFieldChunk.chunk_data.readFloatLE(4);
trackerFieldChunk[`${prefix}z`] = trackerFieldChunk.chunk_data.readFloatLE(8);
const view = new DataView(
trackerFieldChunk.chunk_data.buffer,
trackerFieldChunk.chunk_data.byteOffset,
trackerFieldChunk.chunk_data.byteLength
);
trackerFieldChunk[`${prefix}x`] = view.getFloat32(0, true);
trackerFieldChunk[`${prefix}y`] = view.getFloat32(4, true);
trackerFieldChunk[`${prefix}z`] = view.getFloat32(8, true);
}
}
function decodeTrackerFieldChunk(trackerFieldChunk: DataTrackerFieldChunk) {
@@ -24,7 +29,12 @@ function decodeTrackerFieldChunk(trackerFieldChunk: DataTrackerFieldChunk) {
break;
case 0x0003:
if (trackerFieldChunk.chunk_data) {
trackerFieldChunk.validity = trackerFieldChunk.chunk_data.readFloatLE();
const view = new DataView(
trackerFieldChunk.chunk_data.buffer,
trackerFieldChunk.chunk_data.byteOffset,
trackerFieldChunk.chunk_data.byteLength
);
trackerFieldChunk.validity = view.getFloat32(0, true);
}
break;
case 0x0004:
@@ -35,7 +45,12 @@ function decodeTrackerFieldChunk(trackerFieldChunk: DataTrackerFieldChunk) {
break;
case 0x0006:
if (trackerFieldChunk.chunk_data) {
trackerFieldChunk.tracker_timestamp = trackerFieldChunk.chunk_data.readBigUInt64LE();
const view = new DataView(
trackerFieldChunk.chunk_data.buffer,
trackerFieldChunk.chunk_data.byteOffset,
trackerFieldChunk.chunk_data.byteLength
);
trackerFieldChunk.tracker_timestamp = view.getBigUint64(0, true);
}
break;
default:
@@ -44,5 +59,5 @@ function decodeTrackerFieldChunk(trackerFieldChunk: DataTrackerFieldChunk) {
}
}
export default (buffer: Buffer): DataTrackerFieldChunk =>
export default (buffer: Uint8Array): DataTrackerFieldChunk =>
Decoders.Chunk(buffer, decodeTrackerFieldChunk) as DataTrackerFieldChunk;
src/decoders/data/data-tracker-list-chunk.ts
+2 -2
View File
@@ -9,7 +9,7 @@ function decodeDataTrackerListChunk(dataTrackerListChunk: DataTrackerListChunk)
let offset = 0;
if (dataTrackerListChunk.chunk_data) {
while (offset < dataTrackerListChunk.chunk_data.length) {
const trackerChunk = Decoders.DataTrackerChunk(dataTrackerListChunk.chunk_data.subarray(offset));
const trackerChunk = Decoders.DataTrackerChunk(dataTrackerListChunk.chunk_data.slice(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (trackerChunk.data_len) {
offset += trackerChunk.data_len;
@@ -20,5 +20,5 @@ function decodeDataTrackerListChunk(dataTrackerListChunk: DataTrackerListChunk)
}
}
}
export default (buffer: Buffer): DataTrackerListChunk =>
export default (buffer: Uint8Array): DataTrackerListChunk =>
Decoders.Chunk(buffer, decodeDataTrackerListChunk) as DataTrackerListChunk;
src/decoders/info/info-packet-chunk.ts
+11 -5
View File
@@ -6,24 +6,29 @@ function decodeInfoPacketChunk(infoPacketChunk: InfoPacketChunk) {
if (infoPacketChunk.has_subchunks && infoPacketChunk.chunk_data && infoPacketChunk.data_len) {
let offset = 0;
while (offset < infoPacketChunk.data_len) {
const chunkId = infoPacketChunk.chunk_data.readUInt16LE(offset);
const view = new DataView(
infoPacketChunk.chunk_data.buffer,
infoPacketChunk.chunk_data.byteOffset,
infoPacketChunk.chunk_data.byteLength
);
const chunkId = view.getUint16(offset, true);
switch (chunkId) {
case 0x0000:
infoPacketChunk.packet_header = Decoders.PacketHeaderChunk(infoPacketChunk.chunk_data.subarray(offset));
infoPacketChunk.packet_header = Decoders.PacketHeaderChunk(infoPacketChunk.chunk_data.slice(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (infoPacketChunk.packet_header?.data_len) {
offset += infoPacketChunk.packet_header.data_len;
}
break;
case 0x0001:
infoPacketChunk.system_name = Decoders.InfoSystemNameChunk(infoPacketChunk.chunk_data.subarray(offset));
infoPacketChunk.system_name = Decoders.InfoSystemNameChunk(infoPacketChunk.chunk_data.slice(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (infoPacketChunk.system_name?.data_len) {
offset += infoPacketChunk.system_name.data_len;
}
break;
case 0x0002:
infoPacketChunk.tracker_list = Decoders.InfoTrackerListChunk(infoPacketChunk.chunk_data.subarray(offset));
infoPacketChunk.tracker_list = Decoders.InfoTrackerListChunk(infoPacketChunk.chunk_data.slice(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (infoPacketChunk.tracker_list?.data_len) {
offset += infoPacketChunk.tracker_list.data_len;
@@ -36,4 +41,5 @@ function decodeInfoPacketChunk(infoPacketChunk: InfoPacketChunk) {
}
}
export default (buffer: Buffer): InfoPacketChunk => Decoders.Chunk(buffer, decodeInfoPacketChunk) as InfoPacketChunk;
export default (buffer: Uint8Array): InfoPacketChunk =>
Decoders.Chunk(buffer, decodeInfoPacketChunk) as InfoPacketChunk;
src/decoders/info/info-system-name-chunk.ts
+4 -2
View File
@@ -3,9 +3,11 @@ import { InfoSystemNameChunk } from '../../models/info/info-system-name-chunk';
function decodeSystemNameChunk(systemNameChunk: InfoSystemNameChunk) {
if (systemNameChunk.chunk_data !== undefined && systemNameChunk.data_len !== undefined) {
systemNameChunk.system_name = systemNameChunk.chunk_data.subarray(0, systemNameChunk.data_len).toString();
systemNameChunk.system_name = new TextDecoder().decode(
systemNameChunk.chunk_data.slice(0, systemNameChunk.data_len)
);
}
}
export default (buffer: Buffer): InfoSystemNameChunk =>
export default (buffer: Uint8Array): InfoSystemNameChunk =>
Decoders.Chunk(buffer, decodeSystemNameChunk) as InfoSystemNameChunk;
src/decoders/info/info-tracker-chunk.ts
+8 -3
View File
@@ -6,10 +6,15 @@ function decodeInfoTrackerChunk(infoTrackerChunk: InfoTrackerChunk) {
if (infoTrackerChunk.has_subchunks && infoTrackerChunk.chunk_data && infoTrackerChunk.data_len) {
let offset = 0;
while (offset < infoTrackerChunk.data_len) {
const chunkId = infoTrackerChunk.chunk_data.readUInt16LE(offset);
const view = new DataView(
infoTrackerChunk.chunk_data.buffer,
infoTrackerChunk.chunk_data.byteOffset,
infoTrackerChunk.chunk_data.byteLength
);
const chunkId = view.getUint16(offset, true);
switch (chunkId) {
case 0x0000:
infoTrackerChunk.tracker_name = Decoders.InfoTrackerNameChunk(infoTrackerChunk.chunk_data.subarray(offset));
infoTrackerChunk.tracker_name = Decoders.InfoTrackerNameChunk(infoTrackerChunk.chunk_data.slice(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (infoTrackerChunk.tracker_name?.data_len) {
offset += infoTrackerChunk?.tracker_name?.data_len;
@@ -23,4 +28,4 @@ function decodeInfoTrackerChunk(infoTrackerChunk: InfoTrackerChunk) {
}
}
export default (buffer: Buffer): InfoTrackerChunk => Decoders.Chunk(buffer, decodeInfoTrackerChunk);
export default (buffer: Uint8Array): InfoTrackerChunk => Decoders.Chunk(buffer, decodeInfoTrackerChunk);
src/decoders/info/info-tracker-list-chunk.ts
+2 -2
View File
@@ -8,7 +8,7 @@ function decodeInfoTrackerListChunk(infoTrackerListChunk: InfoTrackerListChunk)
let offset = 0;
if (infoTrackerListChunk.data_len) {
while (offset < infoTrackerListChunk.data_len) {
const trackerChunk = Decoders.InfoTrackerChunk(infoTrackerListChunk.chunk_data.subarray(offset));
const trackerChunk = Decoders.InfoTrackerChunk(infoTrackerListChunk.chunk_data.slice(offset));
offset += Constants.CHUNK_HEADER_SIZE;
if (trackerChunk.data_len) {
offset += trackerChunk.data_len;
@@ -20,5 +20,5 @@ function decodeInfoTrackerListChunk(infoTrackerListChunk: InfoTrackerListChunk)
}
}
}
export default (buffer: Buffer): InfoTrackerListChunk =>
export default (buffer: Uint8Array): InfoTrackerListChunk =>
Decoders.Chunk(buffer, decodeInfoTrackerListChunk) as InfoTrackerListChunk;
src/decoders/info/info-tracker-name-chunk.ts
+4 -2
View File
@@ -3,8 +3,10 @@ import { InfoTrackerNameChunk } from '../../models/info/info-tracker-name-chunk'
function decodeTrackerNameChunk(trackerNameChunk: InfoTrackerNameChunk) {
if (trackerNameChunk.chunk_data !== undefined && trackerNameChunk.data_len !== undefined) {
trackerNameChunk.tracker_name = trackerNameChunk.chunk_data.subarray(0, trackerNameChunk.data_len).toString();
trackerNameChunk.tracker_name = new TextDecoder().decode(
trackerNameChunk.chunk_data.slice(0, trackerNameChunk.data_len)
);
}
}
export default (buffer: Buffer): InfoTrackerNameChunk =>
export default (buffer: Uint8Array): InfoTrackerNameChunk =>
Decoders.Chunk(buffer, decodeTrackerNameChunk) as InfoTrackerNameChunk;
src/decoders/packet-header-chunk.ts
+13 -6
View File
@@ -3,12 +3,19 @@ import { PacketHeaderChunk } from '../models/packet-header-chunk';
function decodePacketHeaderChunk(packetHeaderChunk: PacketHeaderChunk) {
if (packetHeaderChunk.chunk_data) {
packetHeaderChunk.packet_timestamp = packetHeaderChunk.chunk_data.readBigUInt64LE(0);
packetHeaderChunk.version_high = packetHeaderChunk.chunk_data.readUInt8(8);
packetHeaderChunk.version_low = packetHeaderChunk.chunk_data.readUInt8(9);
packetHeaderChunk.frame_id = packetHeaderChunk.chunk_data.readUInt8(10);
packetHeaderChunk.frame_packet_count = packetHeaderChunk.chunk_data.readUInt8(11);
const view = new DataView(
packetHeaderChunk.chunk_data.buffer,
packetHeaderChunk.chunk_data.byteOffset,
packetHeaderChunk.chunk_data.byteLength
);
packetHeaderChunk.packet_timestamp = view.getBigUint64(0, true);
packetHeaderChunk.version_high = view.getUint8(8);
packetHeaderChunk.version_low = view.getUint8(9);
packetHeaderChunk.frame_id = view.getUint8(10);
packetHeaderChunk.frame_packet_count = view.getUint8(11);
}
}
export default (buffer: Buffer): PacketHeaderChunk => Decoders.Chunk(buffer, decodePacketHeaderChunk);
export default (buffer: Uint8Array): PacketHeaderChunk => {
return Decoders.Chunk(buffer, decodePacketHeaderChunk);
};
src/decoders/packet.ts
+4 -2
View File
@@ -2,8 +2,10 @@ import { Decoders } from '.';
import { DataPacketChunk } from '../models/data/data-packet-chunk';
import { InfoPacketChunk } from '../models/info/info-packet-chunk';
export default (buffer: Buffer): InfoPacketChunk | DataPacketChunk | undefined => {
const chunkId = buffer.readUInt16LE();
export default (buffer: Uint8Array): InfoPacketChunk | DataPacketChunk | undefined => {
const view = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
const chunkId = view.getUint16(0, true);
switch (chunkId) {
case 0x6756:
return Decoders.InfoPacketChunk(buffer);